From d8165f109a439ca6c509306512e238690a6185a4 Mon Sep 17 00:00:00 2001 From: Casey Date: Wed, 27 Oct 2021 11:39:41 -0400 Subject: [PATCH] Merge pull request #11673 from PastelPrinceDan/salt removes 'empty ore box' verb because i'm done with crashes --- code/modules/mining/ore_box.dm | 55 +++++++++++++++++----------------- 1 file changed, 27 insertions(+), 28 deletions(-) diff --git a/code/modules/mining/ore_box.dm b/code/modules/mining/ore_box.dm index 7ab96cda10..ff7d36e6dd 100644 --- a/code/modules/mining/ore_box.dm +++ b/code/modules/mining/ore_box.dm @@ -63,34 +63,33 @@ for(var/ore in stored_ore) . += "- [stored_ore[ore]] [ore]" -/obj/structure/ore_box/verb/empty_box() - set name = "Empty Ore Box" - set category = "Object" - set src in view(1) - - if(!ishuman(usr) && !isrobot(usr)) //Only living, intelligent creatures with gripping aparatti can empty ore boxes. - to_chat(usr, "You are physically incapable of emptying the ore box.") - return - - if(usr.stat || usr.restrained()) - return - - if(!Adjacent(usr)) //You can only empty the box if you can physically reach it - to_chat(usr, "You cannot reach the ore box.") - return - - add_fingerprint(usr) - - if(contents.len < 1) - to_chat(usr, "The ore box is empty.") - return - - for (var/obj/item/weapon/ore/O in contents) - contents -= O - O.loc = src.loc - to_chat(usr, "You empty the ore box.") - - return +// /obj/structure/ore_box/verb/empty_box() +// set name = "Empty Ore Box" +// set category = "Object" +// set src in view(1) +// +// if(!ishuman(usr) && !isrobot(usr)) //Only living, intelligent creatures with gripping aparatti can empty ore boxes. +// to_chat(usr, "You are physically incapable of emptying the ore box.") +// return +// if(usr.stat || usr.restrained()) +// return +// +// if(!Adjacent(usr)) //You can only empty the box if you can physically reach it +// to_chat(usr, "You cannot reach the ore box.") +// return +// +// add_fingerprint(usr) +// +// if(contents.len < 1) +// to_chat(usr, "The ore box is empty.") +// return +// +// for (var/obj/item/weapon/ore/O in contents) +// contents -= O +// O.loc = src.loc +// to_chat(usr, "You empty the ore box.") +// +// return /obj/structure/ore_box/ex_act(severity) if(severity == 1.0 || (severity < 3.0 && prob(50)))