From f0444ef8d816ac6c53377125138a837640b3bece Mon Sep 17 00:00:00 2001 From: ShadowLarkens Date: Mon, 5 May 2025 19:28:57 -0700 Subject: [PATCH] Fix a handful of bugs introduced in VOREStation/VOREStation#17515 (#17669) Co-authored-by: Cameron Lennox --- code/modules/mob/living/living.dm | 12 ++++++++++++ code/modules/mob/mob.dm | 12 ++++++++++++ code/modules/tgui/modules/appearance_changer.dm | 8 ++++---- 3 files changed, 28 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index a5b73e42ef0..b168a19faeb 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -1258,6 +1258,18 @@ if(!item) return FALSE //Grab processing has a chance of returning null + // Help intent + Adjacent = pass item to other + if(a_intent == I_HELP && Adjacent(target) && isitem(item) && ishuman(target)) + var/obj/item/I = item + var/mob/living/carbon/human/H = target + if(H.in_throw_mode && H.a_intent == I_HELP && unEquip(I)) + H.put_in_hands(I) // If this fails it will just end up on the floor, but that's fitting for things like dionaea. + visible_message(span_filter_notice(span_bold("[src]") + " hands \the [H] \a [I]."), span_notice("You give \the [target] \a [I].")) + else + to_chat(src, span_notice("You offer \the [I] to \the [target].")) + do_give(H) + return TRUE + drop_from_inventory(item) if(!item || QDELETED(item)) diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index ae695cef256..633c024fb6b 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -1139,6 +1139,18 @@ if(throw_icon && !issilicon(src)) // Silicon use this for something else. Do not overwrite their HUD icon throw_icon.icon_state = "act_throw_on" +/mob/verb/spacebar_throw_on() + set name = ".throwon" + set hidden = TRUE + set instant = TRUE + throw_mode_on() + +/mob/verb/spacebar_throw_off() + set name = ".throwoff" + set hidden = TRUE + set instant = TRUE + throw_mode_off() + /mob/proc/isSynthetic() return 0 diff --git a/code/modules/tgui/modules/appearance_changer.dm b/code/modules/tgui/modules/appearance_changer.dm index 5bef679607b..b1b1eaffd2c 100644 --- a/code/modules/tgui/modules/appearance_changer.dm +++ b/code/modules/tgui/modules/appearance_changer.dm @@ -767,11 +767,11 @@ data["digitigrade"] = owner.digitigrade data["blood_reagent"] = owner.dna.blood_reagents data["blood_color"] = owner.dna.blood_color - //data["species_sound"] = owner.species.species_sounds //TODO: RAISE UP FROM CHOMP + data["species_sound"] = owner.species.species_sounds //TODO: RAISE UP FROM CHOMP // Are these needed? It seems to be only used if above is unset?? - //data["species_sounds_gendered"] = owner.species.gender_specific_species_sounds - //data["species_sounds_female"] = owner.species.species_sounds_female - //data["species_sounds_male"] = owner.species.species_sounds_male + data["species_sounds_gendered"] = owner.species.gender_specific_species_sounds + data["species_sounds_female"] = owner.species.species_sounds_female + data["species_sounds_male"] = owner.species.species_sounds_male // flavor if(!owner.flavor_texts.len) owner.flavor_texts["general"] = ""