cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

why didnt shock protection work

Browse Source
This commit is contained in:
BlackMajor
2022-04-21 23:36:09 +12:00
parent 25fcc0b510
commit 6de234b6de
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/modules/mob/living/simple_mob/defense.dm
View File

@@ -178,7 +178,8 @@
// Electricity // Electricity
/mob/living/simple_mob/electrocute_act(var/shock_damage, var/obj/source, var/siemens_coeff = 1.0, var/def_zone = null) /mob/living/simple_mob/electrocute_act(var/shock_damage, var/obj/source, var/siemens_coeff = 1.0, var/def_zone = null)
shock_damage *= siemens_coeff var/zap = min((1-get_shock_protection()), siemens_coeff) //CHOMPEdit - for some reason simple mobs just never properly checked for shock resist? Whatever, take whichever is lower.
shock_damage *= zap
if(shock_damage < 1) if(shock_damage < 1)
return 0 return 0

1
modular_chomp/code/modules/mob/living/carbon/human/species/station/protean/protean_blob.dm
View File

@@ -48,6 +48,7 @@
can_buckle = 1 can_buckle = 1
has_hands = 1 has_hands = 1
shock_resist = 1
/datum/say_list/protean_blob /datum/say_list/protean_blob
speak = list("Blrb?","Sqrsh.","Glrsh!") speak = list("Blrb?","Sqrsh.","Glrsh!")

9
modular_chomp/code/modules/mob/living/carbon/human/species/station/protean/protean_species.dm
View File

@@ -94,7 +94,10 @@
/mob/living/carbon/human/proc/shapeshifter_select_wings, /mob/living/carbon/human/proc/shapeshifter_select_wings,
/mob/living/carbon/human/proc/shapeshifter_select_tail, /mob/living/carbon/human/proc/shapeshifter_select_tail,
/mob/living/carbon/human/proc/shapeshifter_select_ears, /mob/living/carbon/human/proc/shapeshifter_select_ears,
) //removed fetish verbs, since non-customs can pick neutral traits now /mob/living/proc/flying_toggle,
/mob/living/proc/flying_vore_toggle,
/mob/living/proc/start_wings_hovering,
) //removed fetish verbs, since non-customs can pick neutral traits now. Also added flight, cause shapeshifter can grow wings.
var/global/list/abilities = list() var/global/list/abilities = list()
@@ -126,9 +129,9 @@
H.synth_color = TRUE H.synth_color = TRUE
/datum/species/protean/equip_survival_gear(var/mob/living/carbon/human/H) /datum/species/protean/equip_survival_gear(var/mob/living/carbon/human/H)
..() //CHOMP Edit this calls the parent function which should spawn the survival box. ..()
var/obj/item/stack/material/steel/metal_stack = new() var/obj/item/stack/material/steel/metal_stack = new()
metal_stack.set_amount(5) //CHOMP Edit metal_stack.set_amount(5)
var/obj/item/clothing/accessory/permit/nanotech/permit = new() var/obj/item/clothing/accessory/permit/nanotech/permit = new()
permit.set_name(H.real_name) permit.set_name(H.real_name)