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

Cleans up .rej spam and the empty file from #2792 (#2818)

Browse Source 
* Cleans up .rej spam and the empty file from #2792

* Update tgstation.dme
This commit is contained in:
Poojawa
2017-09-17 11:56:55 -05:00
committed by GitHub
parent 9e0f4c402b
commit dd4f68dfee
19 changed files with 0 additions and 393 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/malfunction/Malf_Modules.dm.rej
-11
View File
@@ -1,11 +0,0 @@
diff a/code/game/gamemodes/malfunction/Malf_Modules.dm b/code/game/gamemodes/malfunction/Malf_Modules.dm (rejected hunks)
@@ -309,8 +309,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list(
owner_AI.nuking = TRUE
owner_AI.doomsday_device = DOOM
owner_AI.doomsday_device.start()
- for(var/pinpointer in GLOB.pinpointer_list)
- var/obj/item/weapon/pinpointer/P = pinpointer
+ for(var/obj/item/weapon/pinpointer/nuke/P in GLOB.pinpointer_list)
P.switch_mode_to(TRACK_MALF_AI) //Pinpointers start tracking the AI wherever it goes
qdel(src)