From e4b59a50595256eab5619372b2bfaf95b8a094f0 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Mon, 19 Dec 2022 12:37:21 +0100 Subject: [PATCH] [MIRROR] Increases tram collision damage [MDB IGNORE] (#18109) * un-modularise it * removes modular tram change * Increases tram collision damage (#71754) * Increases tram collision damage * don't need this either Co-authored-by: lessthanthree <83487515+lessthnthree@users.noreply.github.com> Co-authored-by: Funce --- code/modules/industrial_lift/industrial_lift.dm | 2 +- .../code/modules/industrial_lift/industrial_lift.dm | 12 ------------ .../code/modules/industrial_lift/tram_lift_master.dm | 12 ------------ tgstation.dme | 2 -- 4 files changed, 1 insertion(+), 27 deletions(-) delete mode 100644 modular_skyrat/master_files/code/modules/industrial_lift/industrial_lift.dm delete mode 100644 modular_skyrat/master_files/code/modules/industrial_lift/tram_lift_master.dm diff --git a/code/modules/industrial_lift/industrial_lift.dm b/code/modules/industrial_lift/industrial_lift.dm index 17a1a4dc2de..70d59cdad18 100644 --- a/code/modules/industrial_lift/industrial_lift.dm +++ b/code/modules/industrial_lift/industrial_lift.dm @@ -389,7 +389,7 @@ GLOBAL_LIST_EMPTY(lifts) continue to_chat(collided, span_userdanger("[src] collides into you!")) playsound(src, 'sound/effects/splat.ogg', 50, TRUE) - var/damage = rand(5, 10) * collision_lethality + var/damage = rand(9, 28) * collision_lethality collided.apply_damage(2 * damage, BRUTE, BODY_ZONE_HEAD) collided.apply_damage(2 * damage, BRUTE, BODY_ZONE_CHEST) collided.apply_damage(0.5 * damage, BRUTE, BODY_ZONE_L_LEG) diff --git a/modular_skyrat/master_files/code/modules/industrial_lift/industrial_lift.dm b/modular_skyrat/master_files/code/modules/industrial_lift/industrial_lift.dm deleted file mode 100644 index 99fc3380c0e..00000000000 --- a/modular_skyrat/master_files/code/modules/industrial_lift/industrial_lift.dm +++ /dev/null @@ -1,12 +0,0 @@ -/** - * Damage calculation for getting hit by the tram. 120 to 240 damage to the player at a lethality of 4. A chance of death, but it's going to hurt. - * var/damage = rand(5, 10) * collision_lethality - * collided.apply_damage(2 * damage, BRUTE, BODY_ZONE_HEAD) - * collided.apply_damage(2 * damage, BRUTE, BODY_ZONE_CHEST) - * collided.apply_damage(0.5 * damage, BRUTE, BODY_ZONE_L_LEG) - * collided.apply_damage(0.5 * damage, BRUTE, BODY_ZONE_R_LEG) - * collided.apply_damage(0.5 * damage, BRUTE, BODY_ZONE_L_ARM) - * collided.apply_damage(0.5 * damage, BRUTE, BODY_ZONE_R_ARM) - */ -/obj/structure/industrial_lift - collision_lethality = 4 diff --git a/modular_skyrat/master_files/code/modules/industrial_lift/tram_lift_master.dm b/modular_skyrat/master_files/code/modules/industrial_lift/tram_lift_master.dm deleted file mode 100644 index 2f84f880aec..00000000000 --- a/modular_skyrat/master_files/code/modules/industrial_lift/tram_lift_master.dm +++ /dev/null @@ -1,12 +0,0 @@ -/** - * Damage calculation for getting hit by the tram. 120 to 240 damage to the player at a lethality of 4. A chance of death, but it's going to hurt. - * var/damage = rand(5, 10) * collision_lethality - * collided.apply_damage(2 * damage, BRUTE, BODY_ZONE_HEAD) - * collided.apply_damage(2 * damage, BRUTE, BODY_ZONE_CHEST) - * collided.apply_damage(0.5 * damage, BRUTE, BODY_ZONE_L_LEG) - * collided.apply_damage(0.5 * damage, BRUTE, BODY_ZONE_R_LEG) - * collided.apply_damage(0.5 * damage, BRUTE, BODY_ZONE_L_ARM) - * collided.apply_damage(0.5 * damage, BRUTE, BODY_ZONE_R_ARM) - */ -/datum/lift_master/tram - collision_lethality = 4 diff --git a/tgstation.dme b/tgstation.dme index 7f78b402d7d..65d28324375 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -5107,8 +5107,6 @@ #include "modular_skyrat\master_files\code\modules\events\disease_outbreak.dm" #include "modular_skyrat\master_files\code\modules\events\spacevine.dm" #include "modular_skyrat\master_files\code\modules\experisci\experiment\handlers\experiment_handler.dm" -#include "modular_skyrat\master_files\code\modules\industrial_lift\industrial_lift.dm" -#include "modular_skyrat\master_files\code\modules\industrial_lift\tram_lift_master.dm" #include "modular_skyrat\master_files\code\modules\jobs\departments\departments.dm" #include "modular_skyrat\master_files\code\modules\jobs\job_types\cyborg.dm" #include "modular_skyrat\master_files\code\modules\language\language.dm"