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

2
code/modules/samples/container.dm
View File

@@ -29,7 +29,7 @@
for(var/obj/item/research_sample/S in T)
S.loc = src
update_icon()
to_chat(user, "<span class='notice'>You scoop \the [S] into \the [src].</span>")
to_chat(user, span_notice("You scoop \the [S] into \the [src]."))
//Splice research sample containers into the list of valid items for these belts *without* overriding the lists entirely
/obj/item/storage/belt/explorer/New()

48
code/modules/samples/samples.dm
View File

@@ -86,32 +86,32 @@
if(burn_user)
switch(damage_type)
if("BRUTE")
H.visible_message("<span class='danger'>\The [src] creaks as it ravages [H]'s hands!</span>")
H.visible_message(span_danger("\The [src] creaks as it ravages [H]'s hands!"))
H.apply_damage(rand(min_damage,max_damage), BRUTE, "r_hand", used_weapon="Anomalous Material")
H.apply_damage(rand(min_damage,max_damage), BRUTE, "l_hand", used_weapon="Anomalous Material")
if("BURN")
H.visible_message("<span class='danger'>\The [src] flashes as it scorches [H]'s hands!</span>")
H.visible_message(span_danger("\The [src] flashes as it scorches [H]'s hands!"))
H.apply_damage(rand(min_damage,max_damage), BURN, "r_hand", used_weapon="Anomalous Material")
H.apply_damage(rand(min_damage,max_damage), BURN, "l_hand", used_weapon="Anomalous Material")
if("TOX")
H.visible_message("<span class='danger'>\The [src] seethes and hisses like burning acid!</span>")
H.visible_message(span_danger("\The [src] seethes and hisses like burning acid!"))
if(!H.isSynthetic())
to_chat(user,"<span class='danger'>A wave of nausea washes over you!</span>")
to_chat(user,span_danger("A wave of nausea washes over you!"))
H.adjustToxLoss(rand(min_damage,max_damage)+rand(min_damage,max_damage))
if("OXY")
H.visible_message("<span class='danger'>\The [src] seems to draw something into itself!</span>")
H.visible_message(span_danger("\The [src] seems to draw something into itself!"))
if(!H.isSynthetic())
to_chat(user,"<span class='danger'>You feel dizzy and short of breath!</span>")
to_chat(user,span_danger("You feel dizzy and short of breath!"))
H.adjustOxyLoss(rand(min_damage,max_damage)+rand(min_damage,max_damage))
if("EMP")
H.visible_message("<span class='danger'>\The [src] ripples and distorts, emitting some kind of pulse!</span>")
H.visible_message(span_danger("\The [src] ripples and distorts, emitting some kind of pulse!"))
empulse(H,0,1,1,1)
if("PAIN")
H.visible_message("<span class='danger'>\The [src] flashes with coruscating energy!</span>")
to_chat(user,"<span class='danger'>Blinding pain assails your senses!</span>")
H.visible_message(span_danger("\The [src] flashes with coruscating energy!"))
to_chat(user,span_danger("Blinding pain assails your senses!"))
H.adjustHalLoss(rand(min_damage,max_damage)*5)
else
H.visible_message("<span class='notice'>\The [src] flickers with kaleidoscopic light. You should report this to someone immediately.</span>")
H.visible_message(span_notice("\The [src] flickers with kaleidoscopic light. You should report this to someone immediately."))
H.drop_from_inventory(src, get_turf(H))
return
@@ -143,37 +143,37 @@
if(burn_user)
switch(damage_type)
if("BRUTE")
H.visible_message("<span class='danger'>\The [src] creaks as it ravages [H]'s hands!</span>")
H.visible_message(span_danger("\The [src] creaks as it ravages [H]'s hands!"))
H.apply_damage(rand(min_damage,max_damage), BRUTE, "r_hand", used_weapon="Anomalous Material")
H.apply_damage(rand(min_damage,max_damage), BRUTE, "l_hand", used_weapon="Anomalous Material")
if("BURN")
H.visible_message("<span class='danger'>\The [src] flashes as it scorches [H]'s hands!</span>")
H.visible_message(span_danger("\The [src] flashes as it scorches [H]'s hands!"))
H.apply_damage(rand(min_damage,max_damage), BURN, "r_hand", used_weapon="Anomalous Material")
H.apply_damage(rand(min_damage,max_damage), BURN, "l_hand", used_weapon="Anomalous Material")
if("TOX")
H.visible_message("<span class='danger'>\The [src] seethes and hisses like burning acid!</span>")
H.visible_message(span_danger("\The [src] seethes and hisses like burning acid!"))
if(!H.isSynthetic())
to_chat(user,"<span class='danger'>A wave of nausea washes over you!</span>")
to_chat(user,span_danger("A wave of nausea washes over you!"))
H.adjustToxLoss(rand(min_damage,max_damage)+rand(min_damage,max_damage))
if("OXY")
H.visible_message("<span class='danger'>\The [src] seems to draw something into itself!</span>")
H.visible_message(span_danger("\The [src] seems to draw something into itself!"))
if(!H.isSynthetic())
to_chat(user,"<span class='danger'>You feel dizzy and short of breath!</span>")
to_chat(user,span_danger("You feel dizzy and short of breath!"))
H.adjustOxyLoss(rand(min_damage,max_damage)+rand(min_damage,max_damage))
if("EMP")
H.visible_message("<span class='danger'>\The [src] ripples and distorts, emitting some kind of pulse!</span>")
H.visible_message(span_danger("\The [src] ripples and distorts, emitting some kind of pulse!"))
empulse(H,0,1,1,1)
if("PAIN")
H.visible_message("<span class='danger'>\The [src] flashes with coruscating energy!</span>")
to_chat(user,"<span class='danger'>Blinding pain assails your senses!</span>")
H.visible_message(span_danger("\The [src] flashes with coruscating energy!"))
to_chat(user,span_danger("Blinding pain assails your senses!"))
H.adjustHalLoss(rand(min_damage,max_damage)*5)
else
H.visible_message("<span class='notice'>\The [src] flickers with kaleidoscopic light. You should report this to someone immediately.</span>")
H.visible_message(span_notice("\The [src] flickers with kaleidoscopic light. You should report this to someone immediately."))
H.drop_from_inventory(src, get_turf(H))
return
else if(do_after(user,3 SECONDS)) //short delay, so you can abort/cancel if you misclick
H.visible_message("<span class='notice'>[H] crushes \the [src], stabilizing its anomalous properties and rendering it into a pile of assorted minerals.</span>")
H.visible_message(span_notice("[H] crushes \the [src], stabilizing its anomalous properties and rendering it into a pile of assorted minerals."))
var/i = rand(min_ore,max_ore)
while(i>1)
var/ore = pick(resource_list)
@@ -195,12 +195,12 @@
var/obj/item/storage/sample_container/SC = P
src.loc = SC
SC.update_icon()
to_chat(user, "<span class='notice'>You store \the [src] in \the [SC].</span>")
to_chat(user, span_notice("You store \the [src] in \the [SC]."))
if(istype(P, /obj/item/cataloguer))
to_chat(user, "<span class='notice'>You start to scan \the [src] with \the [P]...</span>")
to_chat(user, span_notice("You start to scan \the [src] with \the [P]..."))
if(do_after(user, 2 SECONDS))
to_chat(user, "<span class='notice'>\The [src] seems to have [origin_tech[1]] properties?</span>")
to_chat(user, span_notice("\The [src] seems to have [origin_tech[1]] properties?"))
/obj/item/research_sample/common
tech_level = 2 //2~3