mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-12 19:22:56 +00:00
[MIRROR] refactors most spans (#9139)
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com> Co-authored-by: Kashargul <KashL@t-online.de>
This commit is contained in:
@@ -27,11 +27,11 @@
|
||||
|
||||
if(inflamed == 1)
|
||||
if(prob(5))
|
||||
to_chat(owner, "<span class='warning'>You feel a stinging pain in your abdomen!</span>")
|
||||
to_chat(owner, span_warning("You feel a stinging pain in your abdomen!"))
|
||||
owner.custom_emote(VISIBLE_MESSAGE, "winces slightly.")
|
||||
if(inflamed > 1)
|
||||
if(prob(3))
|
||||
to_chat(owner, "<span class='warning'>You feel a stabbing pain in your abdomen!</span>")
|
||||
to_chat(owner, span_warning("You feel a stabbing pain in your abdomen!"))
|
||||
owner.custom_emote(VISIBLE_MESSAGE, "winces painfully.")
|
||||
owner.adjustToxLoss(1)
|
||||
if(inflamed > 2)
|
||||
@@ -39,7 +39,7 @@
|
||||
owner.vomit()
|
||||
if(inflamed > 3)
|
||||
if(prob(1))
|
||||
to_chat(owner, "<span class='danger'>Your abdomen is a world of pain!</span>")
|
||||
to_chat(owner, span_danger("Your abdomen is a world of pain!"))
|
||||
owner.Weaken(10)
|
||||
|
||||
var/obj/item/organ/external/groin = owner.get_organ(BP_GROIN)
|
||||
@@ -52,4 +52,4 @@
|
||||
if(inflamed)
|
||||
icon_state = "[initial(icon_state)]inflamed"
|
||||
name = "inflamed appendix"
|
||||
..()
|
||||
..()
|
||||
|
||||
@@ -65,7 +65,7 @@
|
||||
return
|
||||
|
||||
if(robotic && owner.get_restraining_bolt())
|
||||
to_chat(owner, "<span class='warning'>\The [src] doesn't respond.</span>")
|
||||
to_chat(owner, span_warning("\The [src] doesn't respond."))
|
||||
return
|
||||
|
||||
var/item_to_equip = integrated_object
|
||||
@@ -153,11 +153,11 @@
|
||||
if(buckled)
|
||||
var/obj/Ob = buckled
|
||||
if(Ob.buckle_lying)
|
||||
to_chat(M, "<span class='notice'>You cannot use your augments when restrained.</span>")
|
||||
to_chat(M, span_notice("You cannot use your augments when restrained."))
|
||||
return 0
|
||||
|
||||
if((slot == slot_l_hand && l_hand) || (slot == slot_r_hand && r_hand))
|
||||
to_chat(M,"<span class='warning'>Your hand is full. Drop something first.</span>")
|
||||
to_chat(M,span_warning("Your hand is full. Drop something first."))
|
||||
return 0
|
||||
|
||||
var/del_if_failure = destroy_on_drop
|
||||
|
||||
@@ -31,7 +31,7 @@
|
||||
organ_tag = O_AUG_L_FOREARM
|
||||
parent_organ = BP_L_ARM
|
||||
target_slot = slot_l_hand
|
||||
to_chat(user, "<span class='notice'>You swap \the [src]'s servos to install neatly into \the lower [parent_organ] mount.</span>")
|
||||
to_chat(user, span_notice("You swap \the [src]'s servos to install neatly into \the lower [parent_organ] mount."))
|
||||
return
|
||||
|
||||
. = ..()
|
||||
@@ -76,7 +76,7 @@
|
||||
organ_tag = O_AUG_L_HAND
|
||||
parent_organ = BP_L_HAND
|
||||
target_slot = slot_l_hand
|
||||
to_chat(user, "<span class='notice'>You swap \the [src]'s servos to install neatly into \the upper [parent_organ] mount.</span>")
|
||||
to_chat(user, span_notice("You swap \the [src]'s servos to install neatly into \the upper [parent_organ] mount."))
|
||||
return
|
||||
|
||||
. = ..()
|
||||
@@ -120,7 +120,7 @@
|
||||
organ_tag = O_AUG_L_UPPERARM
|
||||
parent_organ = BP_L_ARM
|
||||
target_slot = slot_l_hand
|
||||
to_chat(user, "<span class='notice'>You swap \the [src]'s servos to install neatly into \the upper [parent_organ] mount.</span>")
|
||||
to_chat(user, span_notice("You swap \the [src]'s servos to install neatly into \the upper [parent_organ] mount."))
|
||||
return
|
||||
|
||||
. = ..()
|
||||
|
||||
@@ -53,28 +53,28 @@
|
||||
drop_from_inventory(glasses)
|
||||
aug.integrated_object.forceMove(aug)
|
||||
if(!glasses)
|
||||
to_chat(src, "<span class='alien'>Your [aug.integrated_object] retract into your skull.</span>")
|
||||
to_chat(src, span_alien("Your [aug.integrated_object] retract into your skull."))
|
||||
else if(!istype(glasses, /obj/item/clothing/glasses/hud/security/jensenshades))
|
||||
to_chat(src, "<span class='notice'>\The [glasses] block your shades from deploying.</span>")
|
||||
to_chat(src, span_notice("\The [glasses] block your shades from deploying."))
|
||||
else if(istype(glasses, /obj/item/clothing/glasses/hud/security/jensenshades))
|
||||
var/obj/item/G = glasses
|
||||
if(G.canremove)
|
||||
to_chat(src, "<span class='notice'>\The [G] are not your integrated shades.</span>")
|
||||
to_chat(src, span_notice("\The [G] are not your integrated shades."))
|
||||
else
|
||||
drop_from_inventory(G)
|
||||
to_chat(src, "<span class='notice'>\The [G] retract into your skull.</span>")
|
||||
to_chat(src, span_notice("\The [G] retract into your skull."))
|
||||
qdel(G)
|
||||
|
||||
else
|
||||
if(aug && aug.integrated_object)
|
||||
to_chat(src, "<span class='alien'>Your [aug.integrated_object] deploy.</span>")
|
||||
to_chat(src, span_alien("Your [aug.integrated_object] deploy."))
|
||||
equip_to_slot(aug.integrated_object, slot_glasses, 0, 1)
|
||||
if(!glasses || glasses != aug.integrated_object)
|
||||
aug.integrated_object.forceMove(aug)
|
||||
else
|
||||
var/obj/item/clothing/glasses/hud/security/jensenshades/J = new(get_turf(src))
|
||||
equip_to_slot(J, slot_glasses, 1, 1)
|
||||
to_chat(src, "<span class='notice'>Your [aug.integrated_object] deploy.</span>")
|
||||
to_chat(src, span_notice("Your [aug.integrated_object] deploy."))
|
||||
|
||||
/obj/item/organ/internal/augment/bioaugment/sprint_enhance
|
||||
name = "locomotive optimization implant"
|
||||
@@ -101,4 +101,3 @@
|
||||
if(istype(owner, /mob/living/carbon/human))
|
||||
var/mob/living/carbon/human/H = owner
|
||||
H.add_modifier(/datum/modifier/sprinting, 1 MINUTES)
|
||||
|
||||
|
||||
@@ -122,7 +122,7 @@ GLOBAL_LIST_BOILERPLATE(all_brain_organs, /obj/item/organ/internal/brain)
|
||||
|
||||
brainmob.languages = H.languages
|
||||
|
||||
to_chat(brainmob, "<span class='notice'>You feel slightly disoriented. That's normal when you're just \a [initial(src.name)].</span>")
|
||||
to_chat(brainmob, span_notice("You feel slightly disoriented. That's normal when you're just \a [initial(src.name)]."))
|
||||
callHook("debrain", list(brainmob))
|
||||
|
||||
/obj/item/organ/internal/brain/examine(mob/user) // -- TLE
|
||||
@@ -305,9 +305,9 @@ GLOBAL_LIST_BOILERPLATE(all_brain_organs, /obj/item/organ/internal/brain)
|
||||
/decl/chemical_reaction/instant/promethean_brain_revival/on_reaction(var/datum/reagents/holder)
|
||||
var/obj/item/organ/internal/brain/slime/brain = holder.my_atom
|
||||
if(brain.reviveBody())
|
||||
brain.visible_message("<span class='notice'>[brain] bubbles, surrounding itself with a rapidly expanding mass of slime!</span>")
|
||||
brain.visible_message(span_notice("[brain] bubbles, surrounding itself with a rapidly expanding mass of slime!"))
|
||||
else
|
||||
brain.visible_message("<span class='warning'>[brain] shifts strangely, but falls still.</span>")
|
||||
brain.visible_message(span_warning("[brain] shifts strangely, but falls still."))
|
||||
|
||||
/obj/item/organ/internal/brain/golem
|
||||
name = "chem"
|
||||
|
||||
@@ -76,7 +76,7 @@
|
||||
var/oldbroken = is_broken()
|
||||
..()
|
||||
if(is_broken() && !oldbroken && owner && !owner.stat)
|
||||
to_chat(owner, "<span class='danger'>You go blind!</span>")
|
||||
to_chat(owner, span_danger("You go blind!"))
|
||||
|
||||
/obj/item/organ/internal/eyes/process() //Eye damage replaces the old eye_stat var.
|
||||
..()
|
||||
|
||||
Reference in New Issue
Block a user