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

[MIRROR] Increases tram collision damage [MDB IGNORE] (#18109)

Browse Source 
* 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 <funce.973@gmail.com>
This commit is contained in:
SkyratBot
2022-12-20 00:37:21 +13:00
committed by GitHub
co-authored by lessthanthree Funce
parent 14f01ab5ef
commit e4b59a5059
4 changed files with 1 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/industrial_lift/industrial_lift.dm
+1 -1
View File
@@ -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)
modular_skyrat/master_files/code/modules/industrial_lift/industrial_lift.dm
-12
View File
@@ -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
modular_skyrat/master_files/code/modules/industrial_lift/tram_lift_master.dm
-12
View File
@@ -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
tgstation.dme
-2
View File
@@ -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"