cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-22 12:29:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Ports the radiation subsystem and cleans up damage flags. (#15715)

Browse Source
This commit is contained in:
Matt Atlas
2023-02-07 13:22:47 +01:00
committed by GitHub
parent 5527fc0810
commit 31c73ead85
198 changed files with 981 additions and 649 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/vehicles/bike.dm
+3 -3
View File
@@ -231,7 +231,7 @@
msg_admin_attack("[src] crashed into [key_name(H)] at (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[H.x];Y=[H.y];Z=[H.z]'>JMP</a>)" )
src.visible_message(SPAN_DANGER("\The [src] smashes into \the [H]!"))
playsound(src, /singleton/sound_category/swing_hit_sound, 50, 1)
H.apply_damage(20, BRUTE)
H.apply_damage(20, DAMAGE_BRUTE)
H.throw_at(get_edge_target_turf(loc, loc.dir), 5, 1)
H.apply_effect(4, WEAKEN)
M.setMoveCooldown(10)
@@ -242,7 +242,7 @@
src.visible_message(SPAN_DANGER("\The [src] smashes into \the [L]!"))
playsound(src, /singleton/sound_category/swing_hit_sound, 50, 1)
L.throw_at(get_edge_target_turf(loc, loc.dir), 5, 1)
L.apply_damage(20, BRUTE)
L.apply_damage(20, DAMAGE_BRUTE)
M.setMoveCooldown(10)
return TRUE
@@ -294,7 +294,7 @@
M.attack_log += text("\[[time_stamp()]\] <span class='warning'>rammed[M.name] ([M.ckey]) rammed [H.name] ([H.ckey]) with the [src].</span>")
msg_admin_attack("[src] crashed into [key_name(H)] at (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[H.x];Y=[H.y];Z=[H.z]'>JMP</a>)" )
src.visible_message(SPAN_DANGER("\The [src] runs over \the [H]!"))
H.apply_damage(30, BRUTE)
H.apply_damage(30, DAMAGE_BRUTE)
H.apply_effect(4, WEAKEN)
return TRUE
code/modules/vehicles/cargo_train.dm
+1 -1
View File
@@ -211,7 +211,7 @@
H.apply_effects(5, 5)
for(var/i = 0, i < rand(1,5), i++)
var/def_zone = pick(parts)
H.apply_damage(rand(5,10), BRUTE, def_zone)
H.apply_damage(rand(5,10), DAMAGE_BRUTE, def_zone)
/obj/vehicle/train/cargo/trolley/RunOver(var/mob/living/carbon/human/H)
..()
code/modules/vehicles/train.dm
+1 -1
View File
@@ -63,7 +63,7 @@
visible_message(SPAN_WARNING("[src] knocks over [M]!"))
var/def_zone = ran_zone()
M.apply_effects(5, 5) //knock people down if you hit them
M.apply_damage(22 / move_delay, BRUTE, def_zone,) // and do damage according to how fast the train is going
M.apply_damage(22 / move_delay, DAMAGE_BRUTE, def_zone,) // and do damage according to how fast the train is going
if(isliving(load))
var/mob/living/D = load
to_chat(D, SPAN_WARNING("You hit [M]!"))