cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge resolution.

Browse Source
This commit is contained in:
Zuhayr
2015-05-10 18:33:06 +09:30
parent 79e3acc95e 928b0a8be5
commit bc50ba5166
777 changed files with 22019 additions and 21336 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/mining/machine_stacking.dm
View File

@@ -18,7 +18,7 @@
if (machine)
machine.console = src
else
del(src)
qdel(src)
/obj/machinery/mineral/stacking_unit_console/attack_hand(mob/user)
add_fingerprint(user)
@@ -85,7 +85,7 @@
var/obj/item/stack/S = new stacktype(src)
stack_storage[S.name] = 0
stack_paths[S.name] = stacktype
del(S)
qdel(S)
stack_storage["glass"] = 0
stack_paths["glass"] = /obj/item/stack/sheet/glass