cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-24 13:47:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'server/master'

Browse Source
This commit is contained in:
Hawk_v3
2019-07-07 19:37:13 +01:00
parent 124afe1cbc dcd43f2650
commit daf005399d
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/satchel_ore_boxdm.dm
+10 -5
View File
@@ -12,8 +12,11 @@
/obj/structure/ore_box/attackby(obj/item/weapon/W as obj, mob/user as mob)
if (istype(W, /obj/item/weapon/ore))
user.remove_from_mob(W)
src.contents += W
if (W.name != "strange rock")
user.remove_from_mob(W)
src.contents += W
else
to_chat(user,"<span class='notice'>The [W] bounces out of the [src]!</span>")
else if (istype(W, /obj/item/weapon/storage))
var/obj/item/weapon/storage/S = W
@@ -21,8 +24,11 @@
return
S.hide_from(usr)
for(var/obj/item/weapon/ore/O in S.contents)
S.remove_from_storage(O, src) //This will move the item to this item's contents
to_chat(user,"<span class='notice'>You empty the satchel into the box.</span>")
if (O.name != "strange rock")
S.remove_from_storage(O, src) //This will move the item to this item's contents
else
to_chat(user,"<span class='notice'>The [O] bounces out of the [src]!</span>")
to_chat(user,"<span class='notice'>You empty the satchel into the [src].</span>")
update_ore_count()
@@ -33,7 +39,6 @@
stored_ore = list()
for(var/obj/item/weapon/ore/O in contents)
if(stored_ore[O.name])
stored_ore[O.name]++
else