cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-01-05 23:12:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into dev-freeze

Browse Source 
Conflicts:
	code/modules/mining/abandonedcrates.dm
	code/modules/mob/living/silicon/ai/ai.dm
This commit is contained in:
PsiOmegaDelta
2015-09-11 08:38:28 +02:00
parent c7ae067701 c0546f01c4
commit f81ac77884
16 changed files with 31 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/power/apc.dm
View File

@@ -1146,7 +1146,7 @@ obj/machinery/power/apc/proc/autoset(var/val, var/on)
switch(severity)
if(1.0)
//set_broken() //now Del() do what we need
//set_broken() //now qdel() do what we need
if (cell)
cell.ex_act(1.0) // more lags woohoo
qdel(src)