cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] refactors most spans (#9139)

Browse Source 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
This commit is contained in:
CHOMPStation2
2024-10-04 06:00:17 -07:00
committed by GitHub
parent 43ee646816
commit ab154b48b2
1511 changed files with 12497 additions and 12357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
code/ZAS/Airflow.dm
View File

@@ -9,13 +9,13 @@ Contains helper procs for airflow, handled in /connection_group.
if(last_airflow_stun > world.time - vsc.airflow_stun_cooldown) return 0
if(!(status_flags & CANSTUN) && !(status_flags & CANWEAKEN))
to_chat(src, "<span class='notice'>You stay upright as the air rushes past you.</span>")
to_chat(src, span_notice("You stay upright as the air rushes past you."))
return 0
if(buckled)
to_chat(src, "<span class='notice'>Air suddenly rushes past you!</span>")
to_chat(src, span_notice("Air suddenly rushes past you!"))
return 0
if(!lying)
to_chat(src, "<span class='warning'>The sudden rush of air knocks you over!</span>")
to_chat(src, span_warning("The sudden rush of air knocks you over!"))
Weaken(5)
last_airflow_stun = world.time
@@ -24,7 +24,7 @@ Contains helper procs for airflow, handled in /connection_group.
/mob/living/carbon/human/airflow_stun()
if(shoes && (shoes.item_flags & NOSLIP))
to_chat(src, "<span class='notice'>Air suddenly rushes past you!</span>")
to_chat(src, span_notice("Air suddenly rushes past you!"))
return 0
..()
@@ -96,7 +96,7 @@ Contains helper procs for airflow, handled in /connection_group.
/mob/airflow_hit(atom/A)
for(var/mob/M in hearers(src))
M.show_message("<span class='danger'>\The [src] slams into \a [A]!</span>",1,"<span class='danger'>You hear a loud slam!</span>",2)
M.show_message(span_danger("\The [src] slams into \a [A]!"),1,span_danger("You hear a loud slam!"),2)
playsound(src, "smash.ogg", 25, 1, -1)
var/weak_amt = istype(A,/obj/item) ? A:w_class : rand(1,5) //Heheheh
Weaken(weak_amt)
@@ -104,7 +104,7 @@ Contains helper procs for airflow, handled in /connection_group.
/obj/airflow_hit(atom/A)
for(var/mob/M in hearers(src))
M.show_message("<span class='danger'>\The [src] slams into \a [A]!</span>",1,"<span class='danger'>You hear a loud slam!</span>",2)
M.show_message(span_danger("\The [src] slams into \a [A]!"),1,span_danger("You hear a loud slam!"),2)
playsound(src, "smash.ogg", 25, 1, -1)
. = ..()
@@ -114,7 +114,7 @@ Contains helper procs for airflow, handled in /connection_group.
/mob/living/carbon/human/airflow_hit(atom/A)
// for(var/mob/M in hearers(src))
// M.show_message("<span class='danger'>[src] slams into [A]!</span>",1,"<span class='danger'>You hear a loud slam!</span>",2)
// M.show_message(span_danger("[src] slams into [A]!"),1,span_danger("You hear a loud slam!"),2)
playsound(src, "punch", 25, 1, -1)
if (prob(33))
loc:add_blood(src)

10
code/ZAS/Phoron.dm
View File

@@ -102,8 +102,8 @@ var/image/contamination_overlay = image('icons/effects/contamination.dmi')
if(vsc.plc.SKIN_BURNS && (species.breath_type != "phoron"))
if(!pl_head_protected() || !pl_suit_protected())
burn_skin(0.75)
if(prob(20))
to_chat(src, "<span class='danger'>Your skin burns!</span>")
if(prob(20))
to_chat(src, span_danger("Your skin burns!"))
updatehealth()
//Burn eyes if exposed.
@@ -134,18 +134,18 @@ var/image/contamination_overlay = image('icons/effects/contamination.dmi')
if(vsc.plc.GENETIC_CORRUPTION && (species.breath_type != "phoron"))
if(rand(1,10000) < vsc.plc.GENETIC_CORRUPTION)
randmutb(src)
to_chat(src, "<span class='danger'>High levels of toxins cause you to spontaneously mutate!</span>")
to_chat(src, span_danger("High levels of toxins cause you to spontaneously mutate!"))
domutcheck(src,null)
/mob/living/carbon/human/proc/burn_eyes()
var/obj/item/organ/internal/eyes/E = internal_organs_by_name[O_EYES]
if(E)
if(prob(20))
to_chat(src, "<span class='danger'>Your eyes burn!</span>")
to_chat(src, span_danger("Your eyes burn!"))
E.damage += 2.5
eye_blurry = min(eye_blurry+1.5,50)
if (prob(max(0,E.damage - 15) + 1) &&!eye_blind)
to_chat(src, "<span class='danger'>You are blinded!</span>")
to_chat(src, span_danger("You are blinded!"))
Blind(20)
/mob/living/carbon/human/proc/pl_head_protected()

4
code/ZAS/Variable Settings.dm
View File

@@ -168,7 +168,7 @@ var/global/vs_control/vsc = new
vars[ch] = vw
if(how == "Toggle")
newvar = (newvar?"ON":"OFF")
to_world("<span class='notice'><b>[key_name(user)] changed the setting [display_description] to [newvar].</b></span>")
to_world(span_notice("<b>[key_name(user)] changed the setting [display_description] to [newvar].</b>"))
if(ch in plc.settings)
ChangeSettingsDialog(user,plc.settings)
else
@@ -321,7 +321,7 @@ var/global/vs_control/vsc = new
plc.N2O_HALLUCINATION = initial(plc.N2O_HALLUCINATION)
to_world("<span class='notice'><b>[key_name(user)] changed the global phoron/ZAS settings to \"[def]\"</b></span>")
to_world(span_notice("<b>[key_name(user)] changed the global phoron/ZAS settings to \"[def]\"</b>"))
/pl_control/var/list/settings = list()