Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

minor inv fixes #6142

Merged
merged 1 commit into from
Nov 15, 2023
Merged

minor inv fixes #6142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions code/modules/mob/inventory/inventory.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,8 @@

if(!(flags & INV_OP_FORCE) && HAS_TRAIT(I, TRAIT_ITEM_NODROP))
if(!(flags & INV_OP_SUPPRESS_WARNING))
to_chat(user, SPAN_WARNING("[I] is stuck to your hand!"))
var/datum/inventory_slot_meta/slot_meta = resolve_inventory_slot_meta(slot)
to_chat(user, SPAN_WARNING("[I] is stubbornly stuck [slot_meta.display_preposition] your [slot_meta.display_name]!"))
return FALSE

var/blocked_by
Expand Down Expand Up @@ -390,7 +391,7 @@
affected = list(affected)
for(var/obj/item/I as anything in affected)
if(!inventory_slot_bodypart_check(I, I.worn_slot, null, INV_OP_SILENT))
drop_item_to_ground(I)
drop_item_to_ground(I, INV_OP_SILENT)

/**
* checks for slot conflict
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/inventory/items.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@
if(!worn_slot)
return
if(!equip_check_beltlink(M, worn_slot, null, INV_OP_SILENT))
M.drop_item_to_ground(src)
M.drop_item_to_ground(src, INV_OP_SILENT)
return

/**
Expand Down
2 changes: 0 additions & 2 deletions code/modules/mob/inventory/slot_meta.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,8 +342,6 @@ GLOBAL_LIST_EMPTY(inventory_slot_type_cache)
render_key = "head"
id = SLOT_ID_HEAD
sort_order = 10000
display_name = "back"
display_preposition = "on"
display_name = "head"
display_preposition = "on"
hud_position = ui_head
Expand Down
Loading