diff --git a/code/datums/supplypacks/misc_vr.dm b/code/datums/supplypacks/misc_vr.dm
index 005658d414..04b27c7fbf 100644
--- a/code/datums/supplypacks/misc_vr.dm
+++ b/code/datums/supplypacks/misc_vr.dm
@@ -118,6 +118,7 @@
/obj/item/device/walkpod = 3
)
cost = 150
+ containertype = /obj/structure/closet/crate
containername = "portable music players crate"
/datum/supply_pack/misc/juke_remotes
@@ -126,5 +127,6 @@
/obj/item/device/juke_remote = 2
)
cost = 300
+ containertype = /obj/structure/closet/crate
containername = "cordless jukebox speakers crate"
\ No newline at end of file
diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm
index c4d2071c8a..c462d3be88 100644
--- a/code/game/objects/effects/landmarks.dm
+++ b/code/game/objects/effects/landmarks.dm
@@ -108,6 +108,16 @@
return 1
+/obj/effect/landmark/forbidden_level
+ delete_me = 1
+/obj/effect/landmark/forbidden_level/Initialize()
+ . = ..()
+ if(using_map)
+ using_map.secret_levels |= z
+ else
+ log_error("[type] mapped in but no using_map")
+
+
/obj/effect/landmark/virtual_reality
name = "virtual_reality"
icon = 'icons/mob/screen1.dmi'
@@ -120,15 +130,6 @@
invisibility = 101
return 1
-/obj/effect/landmark/forbidden_level
- delete_me = 1
-/obj/effect/landmark/forbidden_level/Initialize()
- . = ..()
- if(using_map)
- using_map.secret_levels |= z
- else
- log_error("[type] mapped in but no using_map")
-
//Costume spawner landmarks
/obj/effect/landmark/costume/New() //costume spawner, selects a random subclass and disappears
diff --git a/code/game/objects/items/weapons/storage/secure.dm b/code/game/objects/items/weapons/storage/secure.dm
index 7519525dd2..436b1da8c6 100644
--- a/code/game/objects/items/weapons/storage/secure.dm
+++ b/code/game/objects/items/weapons/storage/secure.dm
@@ -28,80 +28,84 @@
max_storage_space = ITEMSIZE_SMALL * 7
use_sound = 'sound/items/storage/briefcase.ogg'
- examine(mob/user)
- . = ..()
- if(Adjacent(user))
- . += "The service panel is [src.open ? "open" : "closed"]."
+/obj/item/weapon/storage/secure/examine(mob/user)
+ . = ..()
+ if(Adjacent(user))
+ . += "The service panel is [src.open ? "open" : "closed"]."
- attackby(obj/item/weapon/W as obj, mob/user as mob)
- if(locked)
- if (istype(W, /obj/item/weapon/melee/energy/blade) && emag_act(INFINITY, user, "You slice through the lock of \the [src]"))
- var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread()
- spark_system.set_up(5, 0, src.loc)
- spark_system.start()
- playsound(src, 'sound/weapons/blade1.ogg', 50, 1)
- playsound(src, "sparks", 50, 1)
- return
-
- if (W.is_screwdriver())
- if (do_after(user, 20 * W.toolspeed))
- src.open =! src.open
- playsound(src, W.usesound, 50, 1)
- user.show_message(text("You [] the service panel.", (src.open ? "open" : "close")))
- return
- if (istype(W, /obj/item/device/multitool) && (src.open == 1)&& (!src.l_hacking))
- user.show_message("Now attempting to reset internal memory, please hold.", 1)
- src.l_hacking = 1
- if (do_after(usr, 100))
- if (prob(40))
- src.l_setshort = 1
- src.l_set = 0
- user.show_message("Internal memory reset. Please give it a few seconds to reinitialize.", 1)
- sleep(80)
- src.l_setshort = 0
- src.l_hacking = 0
- else
- user.show_message("Unable to reset internal memory.", 1)
- src.l_hacking = 0
- else src.l_hacking = 0
- return
- //At this point you have exhausted all the special things to do when locked
- // ... but it's still locked.
+/obj/item/weapon/storage/secure/attackby(obj/item/weapon/W as obj, mob/user as mob)
+ if(locked)
+ if (istype(W, /obj/item/weapon/melee/energy/blade) && emag_act(INFINITY, user, "You slice through the lock of \the [src]"))
+ var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread()
+ spark_system.set_up(5, 0, src.loc)
+ spark_system.start()
+ playsound(src, 'sound/weapons/blade1.ogg', 50, 1)
+ playsound(src, "sparks", 50, 1)
return
- // -> storage/attackby() what with handle insertion, etc
- ..()
-
-
- MouseDrop(over_object, src_location, over_location)
- if (locked)
- src.add_fingerprint(usr)
+ if (W.is_screwdriver())
+ if (do_after(user, 20 * W.toolspeed))
+ src.open =! src.open
+ playsound(src, W.usesound, 50, 1)
+ user.show_message(text("You [] the service panel.", (src.open ? "open" : "close")))
return
- ..()
-
-
- attack_self(mob/user as mob)
- 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))
- 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) - if (!src.locked) - message = "*****" - dat += text("