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

Merge branch 'master' into upstream-merge-30117

Browse Source
This commit is contained in:
LetterJay
2017-09-11 18:10:15 -05:00
committed by GitHub
parent 933d9f5f69 6cc0ea6af0
commit 16c7706618
419 changed files with 17710 additions and 9871 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/malfunction/Malf_Modules.dm
+1 -1
View File
@@ -671,7 +671,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list(
var/obj/machinery/transformer/conveyor = new(T)
conveyor.masterAI = owner
playsound(T, 'sound/effects/phasein.ogg', 100, 1)
owner_AI.can_shunt = TRUE
owner_AI.can_shunt = FALSE
to_chat(owner, "<span class='warning'>You are no longer able to shunt your core to APCs.</span>")
adjust_uses(-1)