mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-16 05:02:42 +00:00
Merge pull request #10909 from MarinaGryphon/bracketfixes
Fixes a few issues with brackets being escaped when they shouldn't be.
This commit is contained in:
committed by
Chompstation Bot
parent
c194014d3f
commit
bcc80d1bbb
@@ -270,7 +270,7 @@ var/global/mob/living/carbon/human/dummy/mannequin/sleevemate_mob
|
|||||||
if(istype(target, /mob/living/carbon/human))
|
if(istype(target, /mob/living/carbon/human))
|
||||||
var/mob/living/carbon/human/H = target
|
var/mob/living/carbon/human/H = target
|
||||||
if(H.resleeve_lock && stored_mind.loaded_from_ckey != H.resleeve_lock)
|
if(H.resleeve_lock && stored_mind.loaded_from_ckey != H.resleeve_lock)
|
||||||
to_chat(usr,"<span class='warning'>\[H] is protected from impersonation!</span>")
|
to_chat(usr,"<span class='warning'>\The [H] is protected from impersonation!</span>")
|
||||||
return
|
return
|
||||||
|
|
||||||
usr.visible_message("<span class='warning'>[usr] begins uploading someone's mind into [target]!</span>","<span class='notice'>You begin uploading a mind into [target]!</span>")
|
usr.visible_message("<span class='warning'>[usr] begins uploading someone's mind into [target]!</span>","<span class='notice'>You begin uploading a mind into [target]!</span>")
|
||||||
|
|||||||
@@ -247,7 +247,7 @@
|
|||||||
to_chat(user, "<span class='notice'>You ready \the [src]! Click and drag the target around to shoot.</span>")
|
to_chat(user, "<span class='notice'>You ready \the [src]! Click and drag the target around to shoot.</span>")
|
||||||
else//Otherwise just make a new one
|
else//Otherwise just make a new one
|
||||||
auto_target = new/obj/screen/auto_target(get_turf(A), src)
|
auto_target = new/obj/screen/auto_target(get_turf(A), src)
|
||||||
visible_message("<span class='danger'>\[user] readies the [src]!</span>")
|
visible_message("<span class='danger'>\The [user] readies the [src]!</span>")
|
||||||
playsound(src, 'sound/weapons/TargetOn.ogg', 50, 1)
|
playsound(src, 'sound/weapons/TargetOn.ogg', 50, 1)
|
||||||
to_chat(user, "<span class='notice'>You ready \the [src]! Click and drag the target around to shoot.</span>")
|
to_chat(user, "<span class='notice'>You ready \the [src]! Click and drag the target around to shoot.</span>")
|
||||||
return
|
return
|
||||||
|
|||||||
@@ -93,7 +93,7 @@
|
|||||||
|
|
||||||
/obj/machinery/shield/hitby(AM as mob|obj)
|
/obj/machinery/shield/hitby(AM as mob|obj)
|
||||||
//Let everyone know we've been hit!
|
//Let everyone know we've been hit!
|
||||||
visible_message("<span class='notice'><B>\[src] was hit by [AM].</B></span>")
|
visible_message("<span class='danger'>\The [src] was hit by [AM].</span>")
|
||||||
|
|
||||||
//Super realistic, resource-intensive, real-time damage calculations.
|
//Super realistic, resource-intensive, real-time damage calculations.
|
||||||
var/tforce = 0
|
var/tforce = 0
|
||||||
|
|||||||
Reference in New Issue
Block a user