cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-25 14:08:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Correct powernet electrocution damage [NO GBP] (#22714)

Browse Source 
* human define and powernet calc

* Update tgstation.dme
This commit is contained in:
lessthanthree
2023-07-30 20:43:30 -04:00
committed by nevimer
parent 98756ff128
commit ab84cd073a
4 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/~skyrat_defines/mobs.dm
+2
View File
@@ -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
code/modules/mob/living/carbon/human/human_defines.dm
+2 -2
View File
@@ -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"
modular_skyrat/master_files/code/modules/power/powernet.dm
+6
View File
@@ -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
tgstation.dme
+1
View File
@@ -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"