diff --git a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm
index f0bd320de98..c9a73c8cf38 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm
@@ -53,10 +53,13 @@
else
user.drop_item()
else if(W.GetID())
+ if(user.loc == src)
+ to_chat(user, "You can't reach the lock from inside.")
+ return
var/obj/item/weapon/card/id/I = W.GetID()
if(broken)
- user << "It appears to be broken."
+ to_chat(user, "It appears to be broken.")
return
if(!I || !I.registered_name) return
if(allowed(user) || !registered_name || (istype(I) && (registered_name == I.registered_name)))
@@ -69,14 +72,14 @@
registered_name = I.registered_name
desc = "Owned by [I.registered_name]."
else
- user << "Access Denied"
+ to_chat(user, "Access Denied")
else if(istype(W, /obj/item/weapon/melee/energy/blade))
if(emag_act(INFINITY, user, "The locker has been sliced open by [user] with \an [W]!", "You hear metal being sliced and sparks flying."))
W:spark_system.queue()
playsound(loc, 'sound/weapons/blade1.ogg', 50, 1)
playsound(loc, "sparks", 50, 1)
else
- user << "Access Denied"
+ to_chat(user, "Access Denied")
return
/obj/structure/closet/secure_closet/personal/emag_act(var/remaining_charges, var/mob/user, var/visual_feedback, var/audible_feedback)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
index b4284df6b81..dad52f452bc 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
@@ -50,13 +50,13 @@
/obj/structure/closet/secure_closet/proc/togglelock(mob/user as mob)
if(opened)
- user << "Close the locker first."
+ to_chat(user, "Close the locker first.")
return
if(broken)
- user << "The locker appears to be broken."
+ to_chat(user, "The locker appears to be broken.")
return
if(user.loc == src)
- user << "You can't reach the lock from inside."
+ to_chat(user, "You can't reach the lock from inside.")
return
if(allowed(user))
locked = !locked
@@ -65,7 +65,7 @@
O << "The locker has been [locked ? null : "un"]locked by [user]."
update_icon()
else
- user << "Access Denied"
+ to_chat(user, "Access Denied")
/obj/structure/closet/secure_closet/proc/CanChainsaw(var/obj/item/weapon/material/twohanded/chainsaw/ChainSawVar)
return (ChainSawVar.powered && !opened && !broken)
@@ -77,7 +77,7 @@
if(large)
MouseDrop_T(G.affecting, user) //act like they were dragged onto the closet
else
- user << "The locker is too small to stuff [G.affecting] into!"
+ to_chat(user, "The locker is too small to stuff [G.affecting] into!")
if(iswelder(W))
var/obj/item/weapon/weldingtool/WT = W
if(WT.isOn())
@@ -90,7 +90,7 @@
if (!do_after(user, 2 SECONDS, act_target = src, extra_checks = CALLBACK(src, .proc/is_open)))
return
if(!WT.remove_fuel(0,user))
- user << "You need more welding fuel to complete this task."
+ to_chat(user, "You need more welding fuel to complete this task.")
return
else
new /obj/item/stack/material/steel(loc)
@@ -110,33 +110,33 @@
user.drop_item()
else if(isscrewdriver(W) && canbemoved)
if(screwed)
- user << "You start to unscrew the locker from the floor..."
+ to_chat(user, "You start to unscrew the locker from the floor...")
playsound(loc, 'sound/items/Screwdriver.ogg', 50, 1)
if (do_after(user, 10 SECONDS, act_target = src))
- user << "You unscrew the locker!"
+ to_chat(user, "You unscrew the locker!")
playsound(loc, 'sound/items/Screwdriver.ogg', 50, 1)
screwed = 0
else if(!screwed && wrenched)
- user << "You start to screw the locker to the floor..."
+ to_chat(user, "You start to screw the locker to the floor...")
playsound(src, 'sound/items/Welder.ogg', 80, 1)
if (do_after(user, 15, act_target = src))
- user << "You screw the locker!"
+ to_chat(user, "You screw the locker!")
playsound(loc, 'sound/items/Screwdriver.ogg', 50, 1)
screwed = 1
else if(iswrench(W) && canbemoved)
if(wrenched && !screwed)
- user << "You start to unfasten the bolts holding the locker in place..."
+ to_chat(user, "You start to unfasten the bolts holding the locker in place...")
playsound(loc, 'sound/items/Ratchet.ogg', 50, 1)
if (do_after(user, 15 SECONDS, act_target = src))
- user << "You unfasten the locker's bolts!"
+ to_chat(user, "You unfasten the locker's bolts!")
playsound(loc, 'sound/items/Ratchet.ogg', 50, 1)
wrenched = 0
anchored = 0
else if(!wrenched)
- user << "You start to fasten the bolts holding the locker in place..."
+ to_chat(user, "You start to fasten the bolts holding the locker in place...")
playsound(loc, 'sound/items/Ratchet.ogg', 50, 1)
if (do_after(user, 15, act_target = src))
- user << "You fasten the locker's bolts!"
+ to_chat(user, "You fasten the locker's bolts!")
playsound(loc, 'sound/items/Ratchet.ogg', 50, 1)
wrenched = 1
anchored = 1
@@ -175,7 +175,7 @@
if (!do_after(user, 2 SECONDS, act_target = src, extra_checks = CALLBACK(src, .proc/is_closed)))
return
if(!WT.remove_fuel(0,user))
- user << "You need more welding fuel to complete this task."
+ to_chat(user, "You need more welding fuel to complete this task.")
return
welded = !welded
update_icon()
diff --git a/html/changelogs/Sindorman-lock.yml b/html/changelogs/Sindorman-lock.yml
new file mode 100644
index 00000000000..7c01f2b27f9
--- /dev/null
+++ b/html/changelogs/Sindorman-lock.yml
@@ -0,0 +1,12 @@
+author: PoZe
+
+# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made. See valid prefix list above.
+# INDENT WITH TWO SPACES. NOT TABS. SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+ - bugfix: "Personal closets can no longer be locked/unlocked from the inside."