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

Update on_move.dm

Browse Source
This commit is contained in:
deathride58
2017-11-17 23:39:06 -05:00
committed by GitHub
parent 98ce27d0ad
commit 49c72a8a91
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/shuttle/on_move.dm
-8
View File
@@ -26,16 +26,8 @@ All ShuttleMove procs go here
if(M.pulledby) if(M.pulledby)
M.pulledby.stop_pulling() M.pulledby.stop_pulling()
M.stop_pulling() M.stop_pulling()
<<<<<<< HEAD
M.visible_message("<span class='warning'>[src] slams into [M]!</span>")
if(M.key || M.get_ghost(TRUE))
SSblackbox.add_details("shuttle_gib", "[type]")
else
SSblackbox.add_details("shuttle_gib_unintelligent", "[type]")
=======
M.visible_message("<span class='warning'>[shuttle] slams into [M]!</span>") M.visible_message("<span class='warning'>[shuttle] slams into [M]!</span>")
SSblackbox.record_feedback("tally", "shuttle_gib", 1, M.type) SSblackbox.record_feedback("tally", "shuttle_gib", 1, M.type)
>>>>>>> 8b19b49... JSON feedback (#32188)
M.gib() M.gib()
else //non-living mobs shouldn't be affected by shuttles, which is why this is an else else //non-living mobs shouldn't be affected by shuttles, which is why this is an else