diff --git a/code/modules/mob/living/carbon/resist.dm b/code/modules/mob/living/carbon/resist.dm index dbadb447cf2..f91bc6e624d 100644 --- a/code/modules/mob/living/carbon/resist.dm +++ b/code/modules/mob/living/carbon/resist.dm @@ -10,14 +10,14 @@ Weaken(3) spin(32,2) visible_message( - "[src] rolls on the floor, trying to put themselves out!", - "You stop, drop, and roll!" + SPAN_DANGER("[src] rolls on the floor, trying to put themselves out!"), + SPAN_NOTICE("You stop, drop, and roll!") ) sleep(3 SECONDS) if(fire_stacks <= 0) visible_message( - "[src] has successfully extinguished themselves!", - "You extinguish yourself." + SPAN_DANGER("[src] has successfully extinguished themselves!"), + SPAN_NOTICE("You extinguish yourself.") ) return @@ -36,26 +36,26 @@ /mob/living/carbon/human/proc/escape_jacket() visible_message( - "\The [src] attempts to escape [wear_suit]!", - "You attempt to escape [wear_suit]. (This will take around 6 minutes and you need to stand still)" + SPAN_DANGER("\The [src] attempts to escape [wear_suit]!"), + SPAN_WARNING("You attempt to escape [wear_suit]. (This will take around 6 minutes and you need to stand still)") ) if (!do_after(src, 1.5 MINUTES, act_target = src)) return visible_message( - "\The [src] is shifting in their [wear_suit]!", - "You start to loosen the [wear_suit]." + SPAN_WARNING("\The [src] is shifting in their [wear_suit]!"), + SPAN_WARNING("You start to loosen the [wear_suit].") ) if (!do_after(src, 1.5 MINUTES, act_target = src)) return visible_message( - "\The [src] is moving in their [wear_suit]!", - "You slip one of your arms out of the [wear_suit]." + SPAN_DANGER("\The [src] is moving in their [wear_suit]!"), + SPAN_WARNING("You slip one of your arms out of the [wear_suit].") ) if (!do_after(src, 1.5 MINUTES, act_target = src)) return visible_message( - "\The [src] is moving around in their [wear_suit] - it looks like they are about to break out!", - "You start to pull loose the straps on the straightjacket[wear_suit]." + SPAN_DANGER("\The [src] is moving around in their [wear_suit] - it looks like they are about to break out!"), + SPAN_WARNING("You start to pull loose the straps on the straightjacket[wear_suit].") ) if (do_after(src, 1.5 MINUTES, act_target = src)) var/obj/ex_suit = wear_suit @@ -98,13 +98,13 @@ violent_removal = 1 breakouttime = rand(450,600) visible_message( - "\The [src] attempts to break out of \the [HC]!", - "You attempt to break out of \the [HC]. (This will take around 1 minute and you need to stand still)" + SPAN_DANGER("\The [src] attempts to break out of \the [HC]!"), + SPAN_WARNING("You attempt to break out of \the [HC]. (This will take around 1 minute and you need to stand still)") ) else visible_message( - "\The [src] attempts to slip out of \the [HC]!", - "You attempt to slip out of \the [HC]. (This will take around [displaytime] minutes and you need to stand still)" + SPAN_DANGER("\The [src] attempts to slip out of \the [HC]!"), + SPAN_WARNING("You attempt to slip out of \the [HC]. (This will take around [displaytime] minutes and you need to stand still)") ) if(do_after(src, breakouttime)) @@ -125,13 +125,13 @@ E.dislocate(1) dislocate_message = ", but dislocate your [E] in the process" visible_message( - "\The [src] manages to remove \the [handcuffed][buckle_message_other]!", - "You successfully remove \the [handcuffed][buckle_message_user][dislocate_message]." + SPAN_DANGER("\The [src] manages to remove \the [handcuffed][buckle_message_other]!"), + SPAN_NOTICE("You successfully remove \the [handcuffed][buckle_message_user][dislocate_message].") ) else visible_message( - "\The [src] manages to slip out of \the [handcuffed][buckle_message_other]!", - "You successfully slip out of \the [handcuffed][buckle_message_user]." + SPAN_NOTICE("\The [src] manages to slip out of \the [handcuffed][buckle_message_other]!"), + SPAN_NOTICE("You successfully slip out of \the [handcuffed][buckle_message_user].") ) drop_from_inventory(handcuffed) @@ -157,16 +157,16 @@ displaytime = breakouttime / 600 //Minutes 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)" + SPAN_DANGER("[usr] attempts to remove \the [HC]!"), + SPAN_WARNING("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_to) return visible_message( - "[src] manages to remove \the [legcuffed]!", - "You successfully remove \the [legcuffed]." + SPAN_DANGER("[src] manages to remove \the [legcuffed]!"), + SPAN_NOTICE("You successfully remove \the [legcuffed].") ) drop_from_inventory(legcuffed) @@ -187,17 +187,17 @@ /mob/living/carbon/proc/break_handcuffs() 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)" + SPAN_DANGER("[src] is trying to break \the [handcuffed]!"), + SPAN_WARNING("You attempt to break your [handcuffed.name]. (This will take around 10 seconds and you need to stand still)") ) - if(do_after(src, 50)) + if(do_after(src, 10 SECONDS)) if(!handcuffed) return visible_message( - "[src] manages to break \the [handcuffed]!", - "You successfully break your [handcuffed.name]." + SPAN_DANGER("[src] manages to break \the [handcuffed]!"), + SPAN_WARNING("You successfully break your [handcuffed.name].") ) if((isunathi(src)) || (HULK in mutations)) @@ -211,16 +211,16 @@ update_inv_handcuffed() /mob/living/carbon/proc/break_legcuffs() - to_chat(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!") + to_chat(src, SPAN_WARNING("You attempt to break your legcuffs. (This will take around 5 seconds and you need to stand still)")) + visible_message(SPAN_DANGER("[src] is trying to break the legcuffs!")) if(do_after(src, 50)) if(!legcuffed || buckled_to) return visible_message( - "[src] manages to break the legcuffs!", - "You successfully break your legcuffs." + SPAN_DANGER("[src] manages to break the legcuffs!"), + SPAN_WARNING("You successfully break your legcuffs.") ) say(pick("RAAAAAAAARGH!", "HNNNNNNNNNGGGGGGH!", "GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", "AAAAAAARRRGH!" )) diff --git a/html/changelogs/RageBreakTime.yml b/html/changelogs/RageBreakTime.yml new file mode 100644 index 00000000000..4e8f0d69503 --- /dev/null +++ b/html/changelogs/RageBreakTime.yml @@ -0,0 +1,6 @@ +author: TheGreyWolf + +delete-after: True + +changes: + - tweak: "Unathi now take 10 seconds to break out of handcuffs instead of 5."