diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index daa28126555..f6ce0f316b7 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -371,6 +371,8 @@ var/list/global/slot_flags_enumeration = list( if( w_class > 2 && !(slot_flags & SLOT_POCKET) ) return 0 if(slot_s_store) + if(isvaurca(H) && src.w_class <= ITEMSIZE_SMALL) + return TRUE if(!H.wear_suit && (slot_wear_suit in mob_equip)) if(!disable_warning) to_chat(H, "You need a suit before you can attach this [name].") diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index 0897462f0fc..14ebc33f7a8 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -106,6 +106,11 @@ msg += "[T.He] [T.is] carrying \icon[s_store] [s_store.gender==PLURAL?"some":"a"] [(s_store.blood_color != "#030303") ? "blood" : "oil"]-stained [s_store.name] on [T.his] [wear_suit.name]!\n" else msg += "[T.He] [T.is] carrying \icon[s_store] \a [s_store] on [T.his] [wear_suit.name].\n" + else if(s_store && !skipsuitstorage) + if(s_store.blood_DNA) + msg += "[T.He] [T.is] carrying \icon[s_store] [s_store.gender==PLURAL?"some":"a"] [(s_store.blood_color != "#030303") ? "blood" : "oil"]-stained [s_store.name] on [T.his] chest!\n" + else + msg += "[T.He] [T.is] carrying \icon[s_store] \a [s_store] on [T.his] chest.\n" //back if(back) diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm index cae3eeb0aa1..f57b855cf44 100644 --- a/code/modules/mob/living/carbon/human/inventory.dm +++ b/code/modules/mob/living/carbon/human/inventory.dm @@ -91,7 +91,8 @@ This saves us from having to call add_fingerprint() any time something is put in if (wear_suit.flags_inv & HIDEJUMPSUIT) update_uniform = 1 if(s_store) - drop_from_inventory(s_store) + if(!(isvaurca(src) && s_store.w_class <= ITEMSIZE_SMALL)) + drop_from_inventory(s_store) wear_suit = null update_inv_wear_suit() if (update_uniform) diff --git a/html/changelogs/geeves-vaurca_suit_slot.yml b/html/changelogs/geeves-vaurca_suit_slot.yml new file mode 100644 index 00000000000..ac1dba2fa98 --- /dev/null +++ b/html/changelogs/geeves-vaurca_suit_slot.yml @@ -0,0 +1,6 @@ +author: Geeves + +delete-after: True + +changes: + - rscadd: "Allows Vaurca to carry small items in their suit slot, using their smol vestigial arms." \ No newline at end of file