diff --git a/code/__DEFINES/~skyrat_defines/mobs.dm b/code/__DEFINES/~skyrat_defines/mobs.dm index 469f332bbfc..5110341c9ac 100644 --- a/code/__DEFINES/~skyrat_defines/mobs.dm +++ b/code/__DEFINES/~skyrat_defines/mobs.dm @@ -2,6 +2,8 @@ #define PULL_OVERSIZED_SLOWDOWN 2 +#define HUMAN_HEALTH_MODIFIER 1.35 + /// Used for Nanite Slurry vomit. The mob will vomit a nanite puddle. #define VOMIT_NANITE 3 diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm index 1fbb7fdd9d2..56ee7dad220 100644 --- a/code/modules/mob/living/carbon/human/human_defines.dm +++ b/code/modules/mob/living/carbon/human/human_defines.dm @@ -14,8 +14,8 @@ can_be_shoved_into = TRUE initial_language_holder = /datum/language_holder/empty // We get stuff from our species - maxHealth = 135 //SKYRAT EDIT ADDITION - health = 135 //SKYRAT EDIT ADDITION + maxHealth = 100 * HUMAN_HEALTH_MODIFIER //SKYRAT EDIT ADDITION + health = 100 * HUMAN_HEALTH_MODIFIER //SKYRAT EDIT ADDITION //Hair colour and style var/hair_color = "#000000" diff --git a/modular_skyrat/master_files/code/modules/power/powernet.dm b/modular_skyrat/master_files/code/modules/power/powernet.dm new file mode 100644 index 00000000000..189a4aa0449 --- /dev/null +++ b/modular_skyrat/master_files/code/modules/power/powernet.dm @@ -0,0 +1,6 @@ +/datum/powernet/get_electrocute_damage() + if(avail >= 1000) + var/damage = clamp(20 + round(avail/25000), 20, 195) + rand(-5,5) + return damage * HUMAN_HEALTH_MODIFIER + else + return 0 diff --git a/tgstation.dme b/tgstation.dme index a5ac792f026..2b785a92def 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -5778,6 +5778,7 @@ #include "modular_skyrat\master_files\code\modules\pai\pai.dm" #include "modular_skyrat\master_files\code\modules\paperwork\stamps.dm" #include "modular_skyrat\master_files\code\modules\power\cable.dm" +#include "modular_skyrat\master_files\code\modules\power\powernet.dm" #include "modular_skyrat\master_files\code\modules\power\lighting\light_mapping_helpers.dm" #include "modular_skyrat\master_files\code\modules\power\singularity\containment_field.dm" #include "modular_skyrat\master_files\code\modules\projectiles\boxes_magazines\external\shotgun.dm"