[MIRROR] Fix promie shock mechanic & enables additional footsteps (#12802)

Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2026-06-04 09:11:57 -04:00
committed by GitHub
co-authored by Cameron Lennox
parent a620b171cc
commit e7e7d5342b
45 changed files with 299 additions and 343 deletions
@@ -387,7 +387,7 @@
if (!def_zone)
def_zone = pick(BP_L_HAND, BP_R_HAND)
if(species.siemens_coefficient == -1)
if(species.siemens_coefficient <= 0 && (species.flags & SHOCK_ABSORB))
if(GLOB.stored_shock_by_ref["\ref[src]"])
GLOB.stored_shock_by_ref["\ref[src]"] += shock_damage
else
@@ -316,7 +316,7 @@
var/limb_path = organ_data["path"]
var/obj/item/organ/O = new limb_path(src)
organ_data["descriptor"] = O.name
to_chat(src, span_notice("You feel a slithering sensation as your [O.name] reform."))
to_chat(src, span_notice("You feel a slithering sensation as your [O.name] reforms."))
var/agony_to_apply = round(0.66 * O.max_damage) // 66% of the limb's health is converted into pain.
src.apply_damage(agony_to_apply, HALLOSS)
@@ -99,7 +99,6 @@
var/death_volume = 50 // Self-explanatory, define this separately on your species if the sound files are louder.
// var/species_sounds_herm // If you want a custom sound played for other genders, just add them like so
var/footstep = FOOTSTEP_MOB_HUMAN
var/list/special_step_sounds = null
// Combat/health/chem/etc. vars.
@@ -403,8 +402,6 @@
update_sort_hint()
/datum/species/proc/get_footsep_sounds()
return footstep
/datum/species/proc/update_sort_hint()
if(spawn_flags & SPECIES_IS_RESTRICTED)
@@ -2,5 +2,12 @@ GLOBAL_LIST_EMPTY(stored_shock_by_ref)
/mob/living/proc/apply_stored_shock_to(mob/living/target)
if(GLOB.stored_shock_by_ref["\ref[src]"])
target.electrocute_act(GLOB.stored_shock_by_ref["\ref[src]"]*0.9, src)
if(GLOB.stored_shock_by_ref["\ref[src]"] > 200)
GLOB.stored_shock_by_ref["\ref[src]"] = 200
target.stun_effect_act(agony_amount = GLOB.stored_shock_by_ref["\ref[src]"]*0.40, electric = TRUE)
GLOB.stored_shock_by_ref["\ref[src]"] = 0
/* //TODO: Clean up spark system and make it so colors can be set on sparks.
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
s.set_up(5, 1, target)
s.start()
*/
@@ -23,7 +23,7 @@
mob_size = MOB_MEDIUM
push_flags = ~HEAVY
swap_flags = ~HEAVY
flags = NO_DNA | NO_SLEEVE | NO_SLIP | NO_MINOR_CUT | NO_HALLUCINATION | NO_INFECT | NO_DEFIB
flags = NO_DNA | NO_SLEEVE | NO_SLIP | NO_MINOR_CUT | NO_HALLUCINATION | NO_INFECT | NO_DEFIB | SHOCK_ABSORB
appearance_flags = HAS_SKIN_COLOR | HAS_EYE_COLOR | HAS_HAIR_COLOR | RADIATION_GLOWS | HAS_UNDERWEAR
spawn_flags = SPECIES_CAN_JOIN
health_hud_intensity = 2
@@ -74,7 +74,7 @@
body_temperature = T20C // Room temperature
rarity_value = 5
siemens_coefficient = 0.8
siemens_coefficient = 0
water_resistance = 0
water_damage_mod = 0
@@ -136,8 +136,6 @@
/datum/decl/emote/visible/vibrate
)
footstep = FOOTSTEP_MOB_SLIME
/datum/species/shapeshifter/promethean/equip_survival_gear(mob/living/carbon/human/H)
var/boxtype = pick(list(/obj/item/storage/toolbox/lunchbox,
/obj/item/storage/toolbox/lunchbox/heart,
@@ -196,8 +196,6 @@
/datum/decl/emote/human/stopsway
)
footstep = FOOTSTEP_MOB_CLAW
inherent_verbs = list(/mob/living/carbon/human/proc/tie_hair)
wikilink="https://wiki.chompstation13.net/index.php?title=Unathi" //CHOMPSedit: link to our wiki
@@ -1233,8 +1231,6 @@
/datum/decl/emote/audible/teshtrill
)
footstep = FOOTSTEP_MOB_TESHARI
/datum/species/teshari/equip_survival_gear(mob/living/carbon/human/H)
..()
//if(!(H.client?.prefs?.shoe_hater)) //CHOMPStation Edit. Disables shoe_hater. Un-indents below line by 1.