cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +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

3
code/modules/mining/abandonedcrates.dm
View File

@@ -16,6 +16,7 @@
for(var/i in 1 to codelen)
code += pick(digits)
digits -= code[code.len]
generate_loot()
@@ -166,7 +167,7 @@
user << "<span class='danger'>The crate's anti-tamper system activates!</span>"
var/turf/T = get_turf(src.loc)
explosion(T, 0, 0, 1, 2)
del(src)
qdel(src)
/obj/structure/closet/crate/secure/loot/emag_act(var/remaining_charges, var/mob/user)
if (locked)