From bcebd2b7c4c326aad913b9a1ff35adb6b495d13b Mon Sep 17 00:00:00 2001 From: Ren Erthilo Date: Sat, 21 Apr 2012 20:04:31 +0100 Subject: [PATCH] TG: - Brought 2.0.8 and uterus up to date with the new type paths. - Added an atmostech belt that spawns with the same tools as the engineer full belt, just the wire is replaced by an analyzer. - Atmos techs now spawn with this belt - Added a detective-styled personal closet, that contains a satchel, which contains a wallet, which contains one or two spacecash items and a coin. - Slightly redesigned two of the dorm rooms so they have this new cabinet - closet with the stuff mentioned above. - Slightly changed the spawn order of items in engineering closets so that hazard vests spawn above toolboxes. Hopefully this will spare a few fiddly clicks for engineers. - Detective locker now spawns with the locked sprite - Engineering now has the L2 radioactive suit lockers that contain rad suits instead of that crate. Revision: r3039 Author: baloh.matevz Date: Feb 5, 2012 --- code/defines/obj/closet.dm | 8 ++++++++ code/game/objects/closets/secure/personal.dm | 11 ++++++++++- code/game/objects/storage/belt.dm | 1 + 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/code/defines/obj/closet.dm b/code/defines/obj/closet.dm index 652a89cac76..6a6bbd7ccca 100644 --- a/code/defines/obj/closet.dm +++ b/code/defines/obj/closet.dm @@ -464,6 +464,14 @@ /obj/structure/closet/secure_closet/personal/patient name = "Patient's closet" +/obj/structure/closet/secure_closet/personal/cabinet + icon_state = "cabinetdetective_locked" + icon_closed = "cabinetdetective" + icon_locked = "cabinetdetective_locked" + icon_opened = "cabinetdetective_open" + icon_broken = "cabinetdetective_broken" + icon_off = "cabinetdetective_broken" + /obj/structure/closet/secure_closet/kitchen name = "Kitchen Cabinet" req_access = list(access_kitchen) diff --git a/code/game/objects/closets/secure/personal.dm b/code/game/objects/closets/secure/personal.dm index 6fa801c0a50..2b0b8ad3b97 100644 --- a/code/game/objects/closets/secure/personal.dm +++ b/code/game/objects/closets/secure/personal.dm @@ -21,6 +21,15 @@ new /obj/item/clothing/shoes/white( src ) return + +/obj/structure/closet/secure_closet/personal/cabinet/New() + ..() + spawn(4) + contents = list() + new /obj/item/weapon/storage/backpack/satchel( src ) + new /obj/item/device/radio/headset( src ) + return + /obj/structure/closet/secure_closet/personal/attackby(obj/item/weapon/W as obj, mob/user as mob) if (src.opened) if (istype(W, /obj/item/weapon/grab)) @@ -66,4 +75,4 @@ O.show_message(text("\blue The locker has been sliced open by [] with an energy blade!", user), 1, text("\red You hear metal being sliced and sparks flying."), 2) else user << "\red Access Denied" - return \ No newline at end of file + return diff --git a/code/game/objects/storage/belt.dm b/code/game/objects/storage/belt.dm index 57c2e45314d..270d8d49951 100644 --- a/code/game/objects/storage/belt.dm +++ b/code/game/objects/storage/belt.dm @@ -77,6 +77,7 @@ new /obj/item/weapon/wirecutters(src) new /obj/item/weapon/cable_coil(src,30,pick("red","yellow")) + /obj/item/weapon/storage/belt/utility/atmostech/New() ..() new /obj/item/weapon/screwdriver(src)