cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-26 21:48:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cargo train fixes

Browse Source
This commit is contained in:
ZomgPonies
2014-06-16 05:14:30 -04:00
parent 0ebf9920d3
commit bd75c061f0
2 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/vehicles/cargo_train.dm
+1 -1
View File
@@ -274,4 +274,4 @@
move_delay = max(0, (-car_limit * active_engines) + train_length - active_engines) //limits base overweight so you cant overspeed trains
move_delay *= (1 / max(1, active_engines)) * 2 //overweight penalty (scaled by the number of engines)
move_delay += config.run_speed //base reference speed
move_delay *= 0.75 //makes cargo trains 25% faster than running when not overweight
move_delay *= 1.05
code/modules/vehicles/train.dm
+14 -15
View File
@@ -42,21 +42,18 @@
if(!A.anchored)
var/turf/T = get_step(A, dir)
if(isturf(T))
if(!emagged) //if not emagged, bump people away, else just run over them
A.Move(T)
else if(!ismob(A)) //always bump objects even if emagged
A.Move(T)
if(istype(A, /mob/living))
var/mob/living/M = A
var/mob/living/D
if(istype(load, /mob/living/carbon/human))
D = load
D << "\red You hit [M]!"
visible_message("\red [src] knocks over [M]!")
M.apply_effects(5, 5) //knock people down if you hit them
if(emagged) //and do damage if it's emagged
M.apply_damages(5 * train_length / move_delay) // according to how fast the train is going and how heavy it is
msg_admin_attack("[D.name] ([D.ckey]) hit [M.name] ([M.ckey]) with [src]. (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[src.x];Y=[src.y];Z=[src.z]'>JMP</a>)")
A.Move(T) //bump things away when hit
if(emagged)
if(istype(A, /mob/living))
var/mob/living/M = A
visible_message("\red [src] knocks over [M]!")
M.apply_effects(5, 5) //knock people down if you hit them
M.apply_damages(5 * train_length / move_delay) // and do damage according to how fast the train is going and how heavy it is
if(istype(load, /mob/living/carbon/human))
var/mob/living/D = load
D << "\red You hit [M]!"
msg_admin_attack("[D.name] ([D.ckey]) hit [M.name] ([M.ckey]) with [src]. (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[src.x];Y=[src.y];Z=[src.z]'>JMP</a>)")
//-------------------------------------------
@@ -128,8 +125,10 @@
if(!istype(T) || !Adjacent(T))
return 0
/* --- commented out until we get directional sprites ---
if(dir != T.dir) //cars need to be inline to latch
return 0
*/
var/T_dir = get_dir(src, T)