cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-26 13:39:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev' into TheSummoning

Browse Source 
Conflicts:
	code/game/machinery/cryopod.dm
	code/game/objects/items/weapons/clown_items.dm
This commit is contained in:
PsiOmega
2015-04-24 17:13:37 +02:00
parent e7d85f8edc d1741a3ade
commit 1fea589ad7
105 changed files with 6547 additions and 4590 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/apc.dm
+2
View File
@@ -1195,10 +1195,12 @@ obj/machinery/power/apc/proc/autoset(var/val, var/on)
equipment = 0
environ = 0
update()
update_icon()
spawn(600)
update_channels()
update()
update_icon()
..()
/obj/machinery/power/apc/ex_act(severity)