shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2730 from Citadel-Station-13/upstream-merge-30608

Browse Source 
[MIRROR] adds logging to graivpult precision throwing
This commit is contained in:
LetterJay
2017-09-12 19:09:44 -05:00
committed by GitHub
parent 91b7ba491e e5c4a1040f
commit e24de430f5
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/mecha/equipment/tools/other_tools.dm
+6 -3
View File
@@ -94,10 +94,13 @@
send_byjax(chassis.occupant,"exosuit.browser","\ref[src]",src.get_equip_info())
else if(target!=locked)
if(locked in view(chassis))
var/turf/targ = get_turf(target)
var/turf/orig = get_turf(locked)
locked.throw_at(target, 14, 1.5)
locked = null
send_byjax(chassis.occupant,"exosuit.browser","\ref[src]",src.get_equip_info())
return 1
log_game("[key_name(chassis.occupant)] used a Gravitational Catapult to throw [locked]([COORD(orig)]) at [target]([COORD(targ)]).")
return TRUE
else
locked = null
occupant_message("Lock on [locked] disengaged.")
@@ -116,8 +119,8 @@
step_away(A,target)
sleep(2)
var/turf/T = get_turf(target)
log_game("[chassis.occupant.ckey]([chassis.occupant]) used a Gravitational Catapult in ([T.x],[T.y],[T.z])")
return 1
log_game("[key_name(chassis.occupant)] used a Gravitational Catapult repulse wave on ([COORD(T)])")
return TRUE
/obj/item/mecha_parts/mecha_equipment/gravcatapult/get_equip_info()