mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-08-23 21:27:01 +01:00
[MIRROR] Fix a handful of bugs introduced in VOREStation/VOREStation#17515 (#10838)
Co-authored-by: ShadowLarkens <shadowlarkens@gmail.com> Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
co-authored by
ShadowLarkens
Kashargul
parent
a1c0552df7
commit
a855d6b9ff
@@ -1256,6 +1256,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))
|
||||
|
||||
@@ -1138,6 +1138,19 @@
|
||||
in_throw_mode = 1
|
||||
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
|
||||
|
||||
|
||||
@@ -767,13 +767,11 @@
|
||||
data["digitigrade"] = owner.digitigrade
|
||||
data["blood_reagent"] = owner.dna.blood_reagents
|
||||
data["blood_color"] = owner.dna.blood_color
|
||||
// CHOMPEnable Start
|
||||
data["species_sound"] = owner.species.species_sounds //TODO: RAISE UP FROM CHOMP
|
||||
// CHOMPEnable End
|
||||
// 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"] = ""
|
||||
|
||||
Reference in New Issue
Block a user