From f02798d87dcaf21e99e87e92b7479c7575f586f9 Mon Sep 17 00:00:00 2001 From: ExcessiveUseOfCobblestone Date: Tue, 27 Sep 2016 16:51:53 -0400 Subject: [PATCH] IMMENSE BUFF TO SECURE BRIEFCASES/WALLSAFE (#20668) SAY GOODBYE EMAG USERS! THE AGE OF THE MULTITOOL IS UPON US! In Short: Removes Emag Function [aka Requiring a multitool], and has a lower chance to successfully hack [from 40% to 33%] It doesn't make sense that something that has no place for an ID can be swiped with an overglorified ID. Git gud and use the multitool. Now when someone puts secure items in the secure safe, people won't laugh at them [i mean they probably still will, but it's ok]. --- .../objects/items/weapons/storage/secure.dm | 31 +++++++------------ 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/code/game/objects/items/weapons/storage/secure.dm b/code/game/objects/items/weapons/storage/secure.dm index 14af6140cad..cfb927e1d15 100644 --- a/code/game/objects/items/weapons/storage/secure.dm +++ b/code/game/objects/items/weapons/storage/secure.dm @@ -21,7 +21,6 @@ var/l_set = 0 var/l_setshort = 0 var/l_hacking = 0 - var/emagged = 0 var/open = 0 w_class = 3 max_w_class = 2 @@ -42,7 +41,7 @@ user.show_message("Now attempting to reset internal memory, please hold.", 1) src.l_hacking = 1 if (do_after(usr, 100/W.toolspeed, target = src)) - if (prob(40)) + if (prob(33)) src.l_setshort = 1 src.l_set = 0 user.show_message("Internal memory reset. Please give it a few seconds to reinitialize.", 1) @@ -62,17 +61,13 @@ // -> storage/attackby() what with handle insertion, etc return ..() -/obj/item/weapon/storage/secure/emag_act(mob/user) - if(locked) - if(!emagged) - emagged = 1 - src.add_overlay(image('icons/obj/storage.dmi', icon_sparking)) - sleep(6) - src.overlays = null - add_overlay(image('icons/obj/storage.dmi', icon_locking)) - locked = 0 - user << "You short out the lock on [src]." - +/obj/item/weapon/storage/secure/attackby(obj/item/weapon/W, mob/user, params) + if(istype(W, /obj/item/weapon/card/emag)) + if(locked) + user << "You take a second to realize there's no ID slot for you to emag this with." + else + user << "You take a second to realize the case is already open, making you look really silly. Hopefully no one saw." + /obj/item/weapon/storage/secure/MouseDrop(over_object, src_location, over_location) if (locked) src.add_fingerprint(usr) @@ -84,10 +79,8 @@ user.set_machine(src) var/dat = text("[]
\n\nLock Status: []",src, (src.locked ? "LOCKED" : "UNLOCKED")) var/message = "Code" - if ((src.l_set == 0) && (!src.emagged) && (!src.l_setshort)) + if ((src.l_set == 0) && (!src.l_setshort)) dat += text("

\n5-DIGIT PASSCODE NOT SET.
ENTER NEW PASSCODE.") - if (src.emagged) - dat += text("

\nLOCKING SYSTEM ERROR - 1701") if (src.l_setshort) dat += text("

\nALERT: MEMORY SYSTEM ERROR - 6040 201") message = text("[]", src.code) @@ -105,7 +98,7 @@ if ((src.l_set == 0) && (length(src.code) == 5) && (!src.l_setshort) && (src.code != "ERROR")) src.l_code = src.code src.l_set = 1 - else if ((src.code == src.l_code) && (src.emagged == 0) && (src.l_set == 1)) + else if ((src.code == src.l_code) && (src.l_set == 1)) src.locked = 0 src.overlays = null add_overlay(image('icons/obj/storage.dmi', icon_opened)) @@ -113,7 +106,7 @@ else src.code = "ERROR" else - if ((href_list["type"] == "R") && (src.emagged == 0) && (!src.l_setshort)) + if ((href_list["type"] == "R") && (!src.l_setshort)) src.locked = 1 src.overlays = null src.code = null @@ -219,4 +212,4 @@ /obj/item/weapon/storage/secure/safe/HoS/New() ..() - //new /obj/item/weapon/storage/lockbox/clusterbang(src) This item is currently broken... and probably shouldnt exist to begin with (even though it's cool) \ No newline at end of file + //new /obj/item/weapon/storage/lockbox/clusterbang(src) This item is currently broken... and probably shouldnt exist to begin with (even though it's cool)