mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-23 21:12:24 +01:00
Text() away (#19850)
Refactored all the builtin text procs to use string interpolation instead. Added a linting for the above. This is based on, and should only be merged after, #19847
This commit is contained in:
@@ -157,7 +157,7 @@
|
||||
if(ishuman(AM))
|
||||
var/mob/living/carbon/human/H = AM
|
||||
M.attack_log += "\[[time_stamp()]\]<font color='orange'> Was rammed by [src]</font>"
|
||||
M.attack_log += text("\[[time_stamp()]\] <span class='warning'>rammed[M.name] ([M.ckey]) rammed [H.name] ([H.ckey]) with the [src].</span>")
|
||||
M.attack_log += "\[[time_stamp()]\] <span class='warning'>rammed[M.name] ([M.ckey]) rammed [H.name] ([H.ckey]) with the [src].</span>"
|
||||
msg_admin_attack("[src] crashed into [key_name(H)] at (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[H.x];Y=[H.y];Z=[H.z]'>JMP</a>)" )
|
||||
src.visible_message(SPAN_DANGER("\The [src] smashes into \the [H]!"))
|
||||
playsound(src, /singleton/sound_category/swing_hit_sound, 50, 1)
|
||||
@@ -258,7 +258,7 @@
|
||||
M = buckled
|
||||
if(M.m_intent == M_RUN)
|
||||
M.attack_log += "\[[time_stamp()]\]<font color='orange'> Was rammed by [src]</font>"
|
||||
M.attack_log += text("\[[time_stamp()]\] <span class='warning'>rammed[M.name] ([M.ckey]) rammed [H.name] ([H.ckey]) with the [src].</span>")
|
||||
M.attack_log += "\[[time_stamp()]\] <span class='warning'>rammed[M.name] ([M.ckey]) rammed [H.name] ([H.ckey]) with the [src].</span>"
|
||||
msg_admin_attack("[src] crashed into [key_name(H)] at (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[H.x];Y=[H.y];Z=[H.z]'>JMP</a>)" )
|
||||
src.visible_message(SPAN_DANGER("\The [src] charges into \the [H]!"))
|
||||
playsound(src, 'sound/weapons/pierce.ogg', 50, 1)
|
||||
@@ -299,7 +299,7 @@
|
||||
if(ishuman(AM))
|
||||
var/mob/living/carbon/human/H = AM
|
||||
M.attack_log += "\[[time_stamp()]\]<font color='orange'> Was rammed by [src]</font>"
|
||||
M.attack_log += text("\[[time_stamp()]\] <span class='warning'>rammed[M.name] ([M.ckey]) rammed [H.name] ([H.ckey]) with the [src].</span>")
|
||||
M.attack_log += "\[[time_stamp()]\] <span class='warning'>rammed[M.name] ([M.ckey]) rammed [H.name] ([H.ckey]) with the [src].</span>"
|
||||
msg_admin_attack("[src] crashed into [key_name(H)] at (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[H.x];Y=[H.y];Z=[H.z]'>JMP</a>)" )
|
||||
src.visible_message(SPAN_DANGER("\The [src] charges into \the [H]!"))
|
||||
playsound(src, 'sound/weapons/pierce.ogg', 50, 1)
|
||||
|
||||
@@ -303,7 +303,7 @@
|
||||
if(ishuman(AM))
|
||||
var/mob/living/carbon/human/H = AM
|
||||
M.attack_log += "\[[time_stamp()]\]<font color='orange'> Was rammed by [src]</font>"
|
||||
M.attack_log += text("\[[time_stamp()]\] <span class='warning'>rammed[M.name] ([M.ckey]) rammed [H.name] ([H.ckey]) with the [src].</span>")
|
||||
M.attack_log += "\[[time_stamp()]\] <span class='warning'>rammed[M.name] ([M.ckey]) rammed [H.name] ([H.ckey]) with the [src].</span>"
|
||||
msg_admin_attack("[src] crashed into [key_name(H)] at (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[H.x];Y=[H.y];Z=[H.z]'>JMP</a>)" )
|
||||
src.visible_message(SPAN_DANGER("\The [src] smashes into \the [H]!"))
|
||||
playsound(src, /singleton/sound_category/swing_hit_sound, 50, 1)
|
||||
@@ -379,7 +379,7 @@
|
||||
M = buckled
|
||||
if(M.m_intent == M_RUN)
|
||||
M.attack_log += "\[[time_stamp()]\]<font color='orange'> Was rammed by [src]</font>"
|
||||
M.attack_log += text("\[[time_stamp()]\] <span class='warning'>rammed[M.name] ([M.ckey]) rammed [H.name] ([H.ckey]) with the [src].</span>")
|
||||
M.attack_log += "\[[time_stamp()]\] <span class='warning'>rammed[M.name] ([M.ckey]) rammed [H.name] ([H.ckey]) with the [src].</span>"
|
||||
msg_admin_attack("[src] crashed into [key_name(H)] at (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[H.x];Y=[H.y];Z=[H.z]'>JMP</a>)" )
|
||||
src.visible_message(SPAN_DANGER("\The [src] runs over \the [H]!"))
|
||||
H.apply_damage(30, DAMAGE_BRUTE)
|
||||
|
||||
@@ -216,7 +216,7 @@
|
||||
|
||||
/obj/vehicle/train/cargo/trolley/RunOver(var/mob/living/carbon/human/H)
|
||||
..()
|
||||
attack_log += text("\[[time_stamp()]\] <span class='warning'>ran over [H.name] ([H.ckey])</span>")
|
||||
attack_log += "\[[time_stamp()]\] <span class='warning'>ran over [H.name] ([H.ckey])</span>"
|
||||
|
||||
/obj/vehicle/train/cargo/engine/RunOver(var/mob/living/carbon/human/H)
|
||||
..()
|
||||
@@ -225,10 +225,10 @@
|
||||
var/mob/living/carbon/human/D = load
|
||||
to_chat(D, SPAN_DANGER("You ran over [H]!"))
|
||||
visible_message(SPAN_DANGER("\The [src] ran over [H]!"))
|
||||
attack_log += text("\[[time_stamp()]\] <span class='warning'>ran over [H.name] ([H.ckey]), driven by [D.name] ([D.ckey])</span>")
|
||||
attack_log += "\[[time_stamp()]\] <span class='warning'>ran over [H.name] ([H.ckey]), driven by [D.name] ([D.ckey])</span>"
|
||||
msg_admin_attack("[D.name] ([D.ckey]) ran over [H.name] ([H.ckey]). (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[src.x];Y=[src.y];Z=[src.z]'>JMP</a>)",ckey=key_name(D),ckey_target=key_name(H))
|
||||
else
|
||||
attack_log += text("\[[time_stamp()]\] <span class='warning'>ran over [H.name] ([H.ckey])</span>")
|
||||
attack_log += "\[[time_stamp()]\] <span class='warning'>ran over [H.name] ([H.ckey])</span>"
|
||||
|
||||
|
||||
//-------------------------------------------
|
||||
|
||||
@@ -419,7 +419,7 @@
|
||||
if(!damage)
|
||||
return
|
||||
visible_message(SPAN_DANGER("[user] [attack_message] the [src]!"))
|
||||
user.attack_log += text("\[[time_stamp()]\] <span class='warning'>attacked [src.name]</span>")
|
||||
user.attack_log += "\[[time_stamp()]\] <span class='warning'>attacked [src.name]</span>"
|
||||
user.do_attack_animation(src)
|
||||
src.health -= damage
|
||||
if(prob(10))
|
||||
|
||||
Reference in New Issue
Block a user