cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-30 12:02:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ore Box Satchel Fix (#10857)

Browse Source
This commit is contained in:
Geeves
2020-12-22 20:42:37 +02:00
committed by GitHub
parent cd3495bf47
commit b132d10708
2 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
code/modules/mining/satchel_ore_boxdm.dm
View File

@@ -16,16 +16,16 @@
/obj/structure/ore_box/attackby(obj/item/W, mob/user)
if(istype(W, /obj/item/ore))
user.drop_from_inventory(W, src)
else if(istype(W, /obj/item/storage/bag/ore))
var/obj/item/storage/bag/ore/satchel = W
if(satchel.linked_beacon)
if(!warp_core)
to_chat(user, SPAN_WARNING("\The [src] doesn't have a warp beacon!"))
return
satchel.linked_box = src
to_chat(user, SPAN_NOTICE("You link \the [satchel] to \the [src]."))
return
else if(istype(W, /obj/item/storage))
if(istype(W, /obj/item/storage/bag/ore))
var/obj/item/storage/bag/ore/satchel = W
if(satchel.linked_beacon)
if(!warp_core)
to_chat(user, SPAN_WARNING("\The [src] doesn't have a warp beacon!"))
return
satchel.linked_box = src
to_chat(user, SPAN_NOTICE("You link \the [satchel] to \the [src]."))
return
var/obj/item/storage/S = W
S.hide_from(user)
for(var/obj/item/ore/O in S.contents)