cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-07-18 19:53:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev' into span_class=notice

Browse Source 
Conflicts:
	code/game/antagonist/station/rogue_ai.dm
	code/game/gamemodes/malfunction/Malf_Modules.dm
	code/game/jobs/job_controller.dm
	code/game/verbs/ooc.dm
This commit is contained in:
GinjaNinja32
2015-05-29 21:55:37 +01:00
parent de4f085057 b6ddafb476
commit d09cd2fe57
58 changed files with 1773 additions and 875 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/wires/wires.dm
+5
View File
@@ -292,6 +292,11 @@ var/const/POWER = 8
return 1
return 0
/datum/wires/proc/MendAll()
for(var/i = 1; i < MAX_FLAG && i < (1 << wire_count); i += i)
if(IsIndexCut(i))
CutWireIndex(i)
//
//Shuffle and Mend
//