Ore satchels no longer have infinite capacity

This commit is contained in:
CitadelStationBot
2017-07-21 18:20:53 -05:00
parent 5db90b28dc
commit c8763c994c
2 changed files with 10 additions and 1 deletions

View File

@@ -88,6 +88,7 @@
max_combined_w_class = 200 //Doesn't matter what this is, so long as it's more or equal to storage_slots * ore.w_class
max_w_class = WEIGHT_CLASS_NORMAL
can_hold = list(/obj/item/weapon/ore)
var/spam_protection = FALSE //If this is TRUE, the holder won't receive any messages when they fail to pick up ore through crossing it
/obj/item/weapon/storage/bag/ore/cyborg
name = "cyborg mining satchel"

View File

@@ -23,6 +23,7 @@
..()
/obj/item/weapon/ore/Crossed(atom/movable/AM)
set waitfor = FALSE
var/show_message = TRUE
for(var/obj/item/weapon/ore/O in loc)
if(O != src)
@@ -48,7 +49,14 @@
break
if(OB)
var/obj/structure/ore_box/box
OB.handle_item_insertion(src, TRUE, AM)
if(!OB.can_be_inserted(src, TRUE, AM))
if(!OB.spam_protection)
to_chat(AM, "<span class='warning'>Your [OB.name] is full and can't hold any more ore!</span>")
OB.spam_protection = TRUE
sleep(1)
OB.spam_protection = FALSE
else
OB.handle_item_insertion(src, TRUE, AM)
// Then, if the user is dragging an ore box, empty the satchel
// into the box.
var/mob/living/L = AM