diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm
index adf9da47e0a..fc60729c4c6 100644
--- a/code/game/objects/structures/crates_lockers/closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets.dm
@@ -316,10 +316,6 @@
return 0 //closed but not welded...
return 1
-/obj/structure/closet/secure_closet/req_breakout()
- if(!opened && locked) return 1
- return ..() //It's a secure closet, but isn't locked.
-
/obj/structure/closet/proc/mob_breakout(var/mob/living/escapee)
var/breakout_time = 2 //2 minutes by default
@@ -329,7 +325,7 @@
//okay, so the closet is either welded or locked... resist!!!
escapee.next_move = world.time + 100
escapee.last_special = world.time + 100
- escapee << "\red You lean on the back of \the [src] and start pushing the door open. (this will take about [breakout_time] minutes)"
+ escapee << "You lean on the back of \the [src] and start pushing the door open. (this will take about [breakout_time] minutes)"
visible_message("The [src] begins to shake violently!")
playsound(src.loc, 'sound/effects/grillehit.ogg', 100, 1)
@@ -357,20 +353,3 @@
var/obj/structure/bigDelivery/BD = loc
BD.unwrap()
open()
-
-/obj/structure/closet/secure_closet/break_open()
- desc += " It appears to be broken."
- icon_state = icon_off
- spawn()
- flick(icon_broken, src)
- sleep(10)
- flick(icon_broken, src)
- sleep(10)
- broken = 1
- locked = 0
- update_icon()
- //Do this to prevent contents from being opened into nullspace (read: bluespace)
- if(istype(loc, /obj/structure/bigDelivery))
- var/obj/structure/bigDelivery/BD = loc
- BD.unwrap()
- open()
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 a3b9f399281..df2985c42ea 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
@@ -132,3 +132,25 @@
overlays += "welded"
else
icon_state = icon_opened
+
+
+/obj/structure/closet/secure_closet/req_breakout()
+ if(!opened && locked) return 1
+ return ..() //It's a secure closet, but isn't locked.
+
+/obj/structure/closet/secure_closet/break_open()
+ desc += " It appears to be broken."
+ icon_state = icon_off
+ spawn()
+ flick(icon_broken, src)
+ sleep(10)
+ flick(icon_broken, src)
+ sleep(10)
+ broken = 1
+ locked = 0
+ update_icon()
+ //Do this to prevent contents from being opened into nullspace (read: bluespace)
+ if(istype(loc, /obj/structure/bigDelivery))
+ var/obj/structure/bigDelivery/BD = loc
+ BD.unwrap()
+ open()
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/resist.dm b/code/modules/mob/living/carbon/resist.dm
index 722fbe3f807..775ef920e8b 100644
--- a/code/modules/mob/living/carbon/resist.dm
+++ b/code/modules/mob/living/carbon/resist.dm
@@ -10,12 +10,16 @@
fire_stacks -= 2 //reduced
Weaken(3)
spin(32,2)
- visible_message("[src] rolls on the floor, trying to put themselves out!", \
- "You stop, drop, and roll!")
+ visible_message(
+ "[src] rolls on the floor, trying to put themselves out!",
+ "You stop, drop, and roll!"
+ )
sleep(30)
if(fire_stacks <= 0)
- visible_message("[src] has successfully extinguished themselves!", \
- "You extinguish yourself.")
+ visible_message(
+ "[src] has successfully extinguished themselves!",
+ "You extinguish yourself."
+ )
ExtinguishMob()
return
@@ -46,14 +50,18 @@
breakouttime = HC.breakouttime
displaytime = breakouttime / 600 //Minutes
- src << "\red You attempt to remove \the [HC]. (This will take around [displaytime] minutes and you need to stand still)"
- visible_message("\red [src] attempts to remove \the [HC]!")
+ visible_message(
+ "[src] attempts to remove \the [HC]!",
+ "You attempt to remove \the [HC]. (This will take around [displaytime] minutes and you need to stand still)"
+ )
if(do_after(src, breakouttime))
if(!handcuffed || buckled)
return
- visible_message("\red [src] manages to remove the handcuffs!")
- src << "\blue You successfully remove \the [handcuffed]."
+ visible_message(
+ "[src] manages to remove \the [handcuffed]!",
+ "You successfully remove \the [handcuffed]."
+ )
drop_from_inventory(handcuffed)
/mob/living/carbon/proc/escape_legcuffs()
@@ -76,15 +84,17 @@
breakouttime = HC.breakouttime
displaytime = breakouttime / 600 //Minutes
- src << "\red You attempt to remove \the [HC]. (This will take around [displaytime] minutes and you need to stand still)"
- visible_message( "\red [usr] attempts to remove \the [HC]!" )
+ visible_message(
+ "[usr] attempts to remove \the [HC]!",
+ "You attempt to remove \the [HC]. (This will take around [displaytime] minutes and you need to stand still)"
+ )
if(do_after(src, breakouttime))
if(!legcuffed || buckled)
return
visible_message(
- "\red [src] manages to remove the legcuffs!",
- "\blue You successfully remove \the [legcuffed]."
+ "[src] manages to remove \the [legcuffed]!",
+ "You successfully remove \the [legcuffed]."
)
drop_from_inventory(legcuffed)
@@ -96,16 +106,18 @@
return 1
/mob/living/carbon/proc/break_handcuffs()
- src << "\red You attempt to break your handcuffs. (This will take around 5 seconds and you need to stand still)"
- visible_message(text("\red [] is trying to break the handcuffs!", src))
+ visible_message(
+ "[src] is trying to break \the [handcuffed]!",
+ "You attempt to break your [handcuffed.name]. (This will take around 5 seconds and you need to stand still)"
+ )
if(do_after(src, 50))
if(!handcuffed || buckled)
return
visible_message(
- "\red [src] manages to break the handcuffs!",
- "\red You successfully break your handcuffs."
+ "[src] manages to break \the [handcuffed]!",
+ "You successfully break your [handcuffed.name]."
)
say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
@@ -117,16 +129,16 @@
update_inv_handcuffed()
/mob/living/carbon/proc/break_legcuffs()
- src << "\red You attempt to break your legcuffs. (This will take around 5 seconds and you need to stand still)"
- visible_message("\red [src] is trying to break the legcuffs!")
+ src << "You attempt to break your legcuffs. (This will take around 5 seconds and you need to stand still)"
+ visible_message("[src] is trying to break the legcuffs!")
if(do_after(src, 50))
if(!legcuffed || buckled)
return
visible_message(
- "\red [src] manages to break the legcuffs!",
- "\red You successfully break your legcuffs."
+ "[src] manages to break the legcuffs!",
+ "You successfully break your legcuffs."
)
say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
@@ -149,8 +161,10 @@
else
next_move = world.time + 100
last_special = world.time + 100
- src << "\red You attempt to unbuckle yourself. (This will take around 2 minutes and you need to stand still)"
- visible_message("\red [usr] attempts to unbuckle themself!")
+ visible_message(
+ "[usr] attempts to unbuckle themself!",
+ "You attempt to unbuckle yourself. (This will take around 2 minutes and you need to stand still)"
+ )
if(do_after(usr, 1200))
if(!buckled)
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 78ca8d1f8b5..cb36ac853e4 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -492,10 +492,10 @@
if(istype(M))
M.drop_from_inventory(H)
- M << "[H] wriggles out of your grip!"
- src << "You wriggle out of [M]'s grip!"
+ M << "[H] wriggles out of your grip!"
+ src << "You wriggle out of [M]'s grip!"
else if(istype(H.loc,/obj/item))
- src << "You struggle free of [H.loc]."
+ src << "You struggle free of [H.loc]."
H.loc = get_turf(H)
if(istype(M))