cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-07-12 15:42:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	code/modules/clothing/spacesuits/void/merc.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/simple_animal/borer/borer_captive.dm
	code/modules/mob/mob_grab_specials.dm
	code/modules/reagents/reagent_containers/food/drinks/bottle.dm
	html/changelogs/.all_changelog.yml
This commit is contained in:
PsiOmegaDelta
2015-09-11 08:54:03 +02:00
parent f57915ae5a 6f05983378
commit a7fa8cde49
29 changed files with 103 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/abandonedcrates.dm
+2 -1
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)