cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +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

32
code/modules/xenobio/items/extracts.dm
View File

@@ -24,9 +24,9 @@
/obj/item/slime_extract/attackby(obj/item/O, mob/user)
if(istype(O, /obj/item/slimepotion/enhancer))
if(enhanced)
to_chat(user, "<span class='warning'>You cannot enhance this extract further!</span>")
to_chat(user, span_warning("You cannot enhance this extract further!"))
return ..()
to_chat(user, "<span class='notice'>You apply the enhancer to the slime extract. It may now be reused one more time.</span>")
to_chat(user, span_notice("You apply the enhancer to the slime extract. It may now be reused one more time."))
playsound(src, 'sound/effects/bubbles.ogg', 50, 1)
uses += 2
enhanced = TRUE
@@ -78,7 +78,7 @@
required = /obj/item/slime_extract/grey
/decl/chemical_reaction/instant/slime/grey_new_slime/on_reaction(var/datum/reagents/holder)
holder.my_atom.visible_message("<span class='warning'>Infused with phoron, the core begins to quiver and grow, and soon a new baby slime emerges from it!</span>")
holder.my_atom.visible_message(span_warning("Infused with phoron, the core begins to quiver and grow, and soon a new baby slime emerges from it!"))
new /mob/living/simple_mob/slime/xenobio(get_turf(holder.my_atom))
..()
@@ -324,7 +324,7 @@
/decl/chemical_reaction/instant/slime/orange_fire/on_reaction(var/datum/reagents/holder)
log_and_message_admins("Orange extract reaction (fire) has been activated in [get_area(holder.my_atom)]. Last fingerprints: [holder.my_atom.fingerprintslast]")
holder.my_atom.visible_message("<span class='danger'>\The [src] begins to vibrate violently!</span>")
holder.my_atom.visible_message(span_danger("\The [src] begins to vibrate violently!"))
playsound(holder.my_atom, 'sound/effects/phasein.ogg', 75, 1)
spawn(5 SECONDS)
if(holder && holder.my_atom)
@@ -361,7 +361,7 @@
/decl/chemical_reaction/instant/slime/yellow_emp/on_reaction(var/datum/reagents/holder)
log_and_message_admins("Yellow extract reaction (emp) has been activated in [get_area(holder.my_atom)]. Last fingerprints: [holder.my_atom.fingerprintslast]")
holder.my_atom.visible_message("<span class='danger'>\The [src] begins to vibrate violently!</span>")
holder.my_atom.visible_message(span_danger("\The [src] begins to vibrate violently!"))
playsound(holder.my_atom, 'sound/effects/phasein.ogg', 75, 1)
spawn(5 SECONDS)
if(holder && holder.my_atom)
@@ -500,10 +500,10 @@
if(istype(L, /mob/living/simple_mob/slime))
var/mob/living/simple_mob/slime/S = L
if(S.cold_resist >= 1) // Immune to cold.
to_chat(S, "<span class='warning'>A chill is felt around you, however it cannot harm you.</span>")
to_chat(S, span_warning("A chill is felt around you, however it cannot harm you."))
continue
if(S.client) // Don't instantly kill player slimes.
to_chat(S, "<span class='danger'>You feel your body crystalize as an intense chill overwhelms you!</span>")
to_chat(S, span_danger("You feel your body crystalize as an intense chill overwhelms you!"))
S.inflict_cold_damage(100)
else
S.inflict_cold_damage(200) // Metal slimes can survive this 'slime nuke'.
@@ -518,9 +518,9 @@
H.bodytemperature = between(50, (H.bodytemperature - ((H.bodytemperature - 50) * cold_factor) ), H.bodytemperature)
if(protection < 0.7)
to_chat(L, "<span class='danger'>A chilling wave of cold overwhelms you!</span>")
to_chat(L, span_danger("A chilling wave of cold overwhelms you!"))
else
to_chat(L, "<span class='warning'>A chilling wave of cold passes by you, as your armor protects you from it.</span>")
to_chat(L, span_warning("A chilling wave of cold passes by you, as your armor protects you from it."))
continue
// Now make it very cold.
@@ -568,12 +568,12 @@
S.add_modifier(/datum/modifier/berserk, 30 SECONDS)
if(S.client) // Player slimes always have free will.
to_chat(S, "<span class='warning'>An intense wave of rage is felt from inside, but you remain in control of yourself.</span>")
to_chat(S, span_warning("An intense wave of rage is felt from inside, but you remain in control of yourself."))
for(var/mob/living/carbon/human/H in view(get_turf(holder.my_atom)))
if(H.species.name == SPECIES_PROMETHEAN)
H.add_modifier(/datum/modifier/berserk, 30 SECONDS)
to_chat(H, "<span class='warning'>An intense wave of rage is felt from inside, but you remain in control of yourself.</span>")
to_chat(H, span_warning("An intense wave of rage is felt from inside, but you remain in control of yourself."))
log_and_message_admins("Red extract reaction (enrage) has been activated in [get_area(holder.my_atom)]. Last fingerprints: [holder.my_atom.fingerprintslast]")
@@ -699,7 +699,7 @@
E.uses = 0
playsound(holder.my_atom, 'sound/effects/phasein.ogg', 75, 1)
holder.my_atom.visible_message("<span class='danger'>\The [holder.my_atom] begins to vibrate violently!</span>")
holder.my_atom.visible_message(span_danger("\The [holder.my_atom] begins to vibrate violently!"))
log_and_message_admins("Oil extract reaction (explosion) has been activated in [get_area(holder.my_atom)]. Last fingerprints: [holder.my_atom.fingerprintslast]")
spawn(5 SECONDS)
@@ -850,8 +850,8 @@
desc = "You feel much stronger than usual."
mob_overlay_state = "pink_sparkles"
on_created_text = "<span class='warning'>Twinkling spores of goo surround you. It makes you feel stronger and more robust.</span>"
on_expired_text = "<span class='notice'>The spores of goo have faded, and you feel your strength returning to what it was before.</span>"
on_created_text = span_warning("Twinkling spores of goo surround you. It makes you feel stronger and more robust.")
on_expired_text = span_notice("The spores of goo have faded, and you feel your strength returning to what it was before.")
stacks = MODIFIER_STACK_EXTEND
max_health_flat = 50
@@ -898,8 +898,8 @@
desc = "You feel much faster than usual."
mob_overlay_state = "green_sparkles"
on_created_text = "<span class='warning'>Twinkling spores of goo surround you. It makes you feel fast and more agile.</span>"
on_expired_text = "<span class='notice'>The spores of goo have faded, and you feel your agility returning to what it was before.</span>"
on_created_text = span_warning("Twinkling spores of goo surround you. It makes you feel fast and more agile.")
on_expired_text = span_notice("The spores of goo have faded, and you feel your agility returning to what it was before.")
stacks = MODIFIER_STACK_EXTEND
evasion = 30

56
code/modules/xenobio/items/extracts_vr.dm
View File

@@ -23,16 +23,16 @@
/obj/item/slime_extract/attackby(obj/item/O, mob/user)
if(istype(O, /obj/item/slimepotion/enhancer))
if(enhanced)
to_chat(user, "<span class='warning'>You cannot enhance this extract further!</span>")
to_chat(user, span_warning("You cannot enhance this extract further!"))
return ..()
to_chat(user, "<span class='notice'>You apply the enhancer to the slime extract. It may now be reused one more time.</span>")
to_chat(user, span_notice("You apply the enhancer to the slime extract. It may now be reused one more time."))
playsound(src, 'sound/effects/bubbles.ogg', 50, 1)
uses += 2
enhanced = TRUE
name = initial(name) // To remove the 'inert' part of the name.
qdel(O)
else if(istype(O, /obj/item/slimepotion/reinvigoration))
to_chat(user, "<span class='notice'>You apply the reinvigorator to the slime extract. It rapidly expands, creating a brand new slime!</span>")
to_chat(user, span_notice("You apply the reinvigorator to the slime extract. It rapidly expands, creating a brand new slime!"))
playsound(src, 'sound/effects/bubbles.ogg', 50, 1)
new slime_type(get_turf(src))
qdel(O)
@@ -85,7 +85,7 @@
required = /obj/item/slime_extract/grey
/decl/chemical_reaction/instant/slime/grey_new_slime/on_reaction(var/datum/reagents/holder)
holder.my_atom.visible_message("<span class='warning'>Infused with phoron, the core begins to quiver and grow, and soon a new baby slime emerges from it!</span>")
holder.my_atom.visible_message(span_warning("Infused with phoron, the core begins to quiver and grow, and soon a new baby slime emerges from it!"))
new /mob/living/simple_mob/slime/xenobio(get_turf(holder.my_atom))
..()
@@ -233,12 +233,12 @@
S.remove_modifiers_of_type(/datum/modifier/berserk)
if(S.client) // Player slimes always have free will.
to_chat(S, "<span class='warning'>An intense wave of relaxing calm is felt from inside, but you remain in control of yourself.</span>")
to_chat(S, span_warning("An intense wave of relaxing calm is felt from inside, but you remain in control of yourself."))
for(var/mob/living/carbon/human/H in view(get_turf(holder.my_atom)))
if(H.species.name == SPECIES_PROMETHEAN)
H.remove_modifiers_of_type(/datum/modifier/berserk)
to_chat(H, "<span class='warning'>An intense wave of relaxing calm is felt from inside, but you remain in control of yourself.</span>")
to_chat(H, span_warning("An intense wave of relaxing calm is felt from inside, but you remain in control of yourself."))
playsound(holder.my_atom, 'sound/effects/phasein.ogg', 75, 1)
..()
@@ -333,7 +333,7 @@
/decl/chemical_reaction/instant/slime/orange_fire/on_reaction(var/datum/reagents/holder)
log_and_message_admins("Orange extract reaction (fire) has been activated in [get_area(holder.my_atom)]. Last fingerprints: [holder.my_atom.fingerprintslast]")
holder.my_atom.visible_message("<span class='danger'>\The [src] begins to vibrate violently!</span>")
holder.my_atom.visible_message(span_danger("\The [src] begins to vibrate violently!"))
playsound(holder.my_atom, 'sound/effects/phasein.ogg', 75, 1)
spawn(5 SECONDS)
if(holder && holder.my_atom)
@@ -392,9 +392,9 @@
H.bodytemperature = between(50, (H.bodytemperature - ((H.bodytemperature + 50) * cold_factor) ), H.bodytemperature)
if(protection < 0.7)
to_chat(L, "<span class='danger'>A scalding wave of heat overwhelms you!</span>")
to_chat(L, span_danger("A scalding wave of heat overwhelms you!"))
else
to_chat(L, "<span class='warning'>A scalding wave of heat passes by you, as your armor protects you from it.</span>")
to_chat(L, span_warning("A scalding wave of heat passes by you, as your armor protects you from it."))
continue
// Now make it very cold.
@@ -454,7 +454,7 @@
/decl/chemical_reaction/instant/slime/yellow_lightning/on_reaction(var/datum/reagents/holder)
log_and_message_admins("Yellow extract reaction (lightning) has been activated in [get_area(holder.my_atom)]. Last fingerprints: [holder.my_atom.fingerprintslast]")
holder.my_atom.visible_message("<span class='danger'>\The [src] begins to vibrate violently!</span>")
holder.my_atom.visible_message(span_danger("\The [src] begins to vibrate violently!"))
playsound(holder.my_atom, 'sound/effects/phasein.ogg', 75, 1)
spawn(5 SECONDS)
if(holder && holder.my_atom)
@@ -483,7 +483,7 @@
/decl/chemical_reaction/instant/slime/yellow_emp/on_reaction(var/datum/reagents/holder)
log_and_message_admins("Yellow extract reaction (emp) has been activated in [get_area(holder.my_atom)]. Last fingerprints: [holder.my_atom.fingerprintslast]")
holder.my_atom.visible_message("<span class='danger'>\The [src] begins to vibrate violently!</span>")
holder.my_atom.visible_message(span_danger("\The [src] begins to vibrate violently!"))
playsound(holder.my_atom, 'sound/effects/phasein.ogg', 75, 1)
spawn(5 SECONDS)
if(holder && holder.my_atom)
@@ -738,10 +738,10 @@
if(istype(L, /mob/living/simple_mob/slime))
var/mob/living/simple_mob/slime/S = L
if(S.cold_resist >= 1) // Immune to cold.
to_chat(S, "<span class='warning'>A chill is felt around you, however it cannot harm you.</span>")
to_chat(S, span_warning("A chill is felt around you, however it cannot harm you."))
continue
if(S.client) // Don't instantly kill player slimes.
to_chat(S, "<span class='danger'>You feel your body crystalize as an intense chill overwhelms you!</span>")
to_chat(S, span_danger("You feel your body crystalize as an intense chill overwhelms you!"))
S.inflict_cold_damage(100)
else
S.inflict_cold_damage(200) // Metal slimes can survive this 'slime nuke'.
@@ -756,9 +756,9 @@
H.bodytemperature = between(50, (H.bodytemperature - ((H.bodytemperature - 50) * cold_factor) ), H.bodytemperature)
if(protection < 0.7)
to_chat(L, "<span class='danger'>A chilling wave of cold overwhelms you!</span>")
to_chat(L, span_danger("A chilling wave of cold overwhelms you!"))
else
to_chat(L, "<span class='warning'>A chilling wave of cold passes by you, as your armor protects you from it.</span>")
to_chat(L, span_warning("A chilling wave of cold passes by you, as your armor protects you from it."))
continue
// Now make it very cold.
@@ -789,8 +789,8 @@
desc = "You feel immune to heat and cold."
mob_overlay_state = "corona"
on_created_text = "<span class='warning'>A shield of goo surround you. It makes you feel protected against temperature.</span>"
on_expired_text = "<span class='notice'>The shield of goo has faded, and you feel vulnerable to temperature again.</span>"
on_created_text = span_warning("A shield of goo surround you. It makes you feel protected against temperature.")
on_expired_text = span_notice("The shield of goo has faded, and you feel vulnerable to temperature again.")
stacks = MODIFIER_STACK_EXTEND
incoming_fire_damage_percent = 0.5
@@ -865,12 +865,12 @@
S.add_modifier(/datum/modifier/berserk, 30 SECONDS)
if(S.client) // Player slimes always have free will.
to_chat(S, "<span class='warning'>An intense wave of rage is felt from inside, but you remain in control of yourself.</span>")
to_chat(S, span_warning("An intense wave of rage is felt from inside, but you remain in control of yourself."))
for(var/mob/living/carbon/human/H in view(get_turf(holder.my_atom)))
if(H.species.name == SPECIES_PROMETHEAN)
H.add_modifier(/datum/modifier/berserk, 30 SECONDS)
to_chat(H, "<span class='warning'>An intense wave of rage is felt from inside, but you remain in control of yourself.</span>")
to_chat(H, span_warning("An intense wave of rage is felt from inside, but you remain in control of yourself."))
log_and_message_admins("Red extract reaction (enrage) has been activated in [get_area(holder.my_atom)]. Last fingerprints: [holder.my_atom.fingerprintslast]")
@@ -920,7 +920,7 @@
/decl/chemical_reaction/instant/slime/green_radpulse/on_reaction(var/datum/reagents/holder)
log_and_message_admins("Green extract reaction (radiation pulse) has been activated in [get_area(holder.my_atom)]. Last fingerprints: [holder.my_atom.fingerprintslast]")
playsound(holder.my_atom, 'sound/effects/phasein.ogg', 75, 1)
holder.my_atom.visible_message("<span class='danger'>\The [holder.my_atom] begins to vibrate violently!</span>")
holder.my_atom.visible_message(span_danger("\The [holder.my_atom] begins to vibrate violently!"))
spawn(5 SECONDS)
SSradiation.flat_radiate(src, 30, 7, TRUE)
..()
@@ -1007,7 +1007,7 @@
/decl/chemical_reaction/instant/slime/pink_heal_pulse/on_reaction(var/datum/reagents/holder)
for(var/mob/living/carbon/C in viewers(get_turf(holder.my_atom), null))
to_chat(C, "<span class='notice'>A wave of energy suddenly invigorates you.</span>")
to_chat(C, span_notice("A wave of energy suddenly invigorates you."))
C.adjustBruteLoss(-25)
C.adjustFireLoss(-25)
C.adjustToxLoss(-25)
@@ -1076,7 +1076,7 @@
E.uses = 0
playsound(holder.my_atom, 'sound/effects/phasein.ogg', 75, 1)
holder.my_atom.visible_message("<span class='danger'>\The [holder.my_atom] begins to vibrate violently!</span>")
holder.my_atom.visible_message(span_danger("\The [holder.my_atom] begins to vibrate violently!"))
log_and_message_admins("Oil extract reaction (explosion) has been activated in [get_area(holder.my_atom)]. Last fingerprints: [holder.my_atom.fingerprintslast]")
spawn(5 SECONDS)
@@ -1379,8 +1379,8 @@
desc = "You feel much stronger than usual."
mob_overlay_state = "pink_sparkles"
on_created_text = "<span class='warning'>Twinkling spores of goo surround you. It makes you feel stronger and more robust.</span>"
on_expired_text = "<span class='notice'>The spores of goo have faded, and you feel your strength returning to what it was before.</span>"
on_created_text = span_warning("Twinkling spores of goo surround you. It makes you feel stronger and more robust.")
on_expired_text = span_notice("The spores of goo have faded, and you feel your strength returning to what it was before.")
stacks = MODIFIER_STACK_EXTEND
max_health_flat = 50
@@ -1468,8 +1468,8 @@
desc = "You feel much more agile than usual."
mob_overlay_state = "green_sparkles"
on_created_text = "<span class='warning'>Twinkling spores of goo surround you. It makes you feel more agile.</span>"
on_expired_text = "<span class='notice'>The spores of goo have faded, and you feel your agility returning to what it was before.</span>"
on_created_text = span_warning("Twinkling spores of goo surround you. It makes you feel more agile.")
on_expired_text = span_notice("The spores of goo have faded, and you feel your agility returning to what it was before.")
stacks = MODIFIER_STACK_EXTEND
evasion = 45
@@ -1494,8 +1494,8 @@
desc = "You feel much faster than usual."
mob_overlay_state = "haste"
on_created_text = "<span class='warning'>Twinkling spores of goo surround you. It makes you feel very fast.</span>"
on_expired_text = "<span class='notice'>The spores of goo have faded, and you feel your speed returning to what it was before.</span>"
on_created_text = span_warning("Twinkling spores of goo surround you. It makes you feel very fast.")
on_expired_text = span_notice("The spores of goo have faded, and you feel your speed returning to what it was before.")
stacks = MODIFIER_STACK_EXTEND
slowdown = -3

12
code/modules/xenobio/items/slime_objects.dm
View File

@@ -9,7 +9,7 @@
/obj/item/slime_cube/attack_self(mob/user as mob)
if(!searching)
to_chat(user, "<span class='warning'>You stare at the slimy cube, watching as some activity occurs.</span>")
to_chat(user, span_warning("You stare at the slimy cube, watching as some activity occurs."))
icon_state = "slime cube active"
searching = 1
request_player()
@@ -45,7 +45,7 @@
searching = 0
var/turf/T = get_turf_or_move(src.loc)
for (var/mob/M in viewers(T))
M.show_message("<span class='warning'>The activity in the cube dies down. Maybe it will spark another time.</span>")
M.show_message(span_warning("The activity in the cube dies down. Maybe it will spark another time."))
/obj/item/slime_cube/proc/transfer_personality(var/mob/candidate)
announce_ghost_joinleave(candidate, 0, "They are a promethean now.")
@@ -56,7 +56,7 @@
S.mind.assigned_role = JOB_PROMETHEAN
S.set_species("Promethean")
S.shapeshifter_set_colour("#2398FF")
visible_message("<span class='warning'>The monkey cube suddenly takes the shape of a humanoid!</span>")
visible_message(span_warning("The monkey cube suddenly takes the shape of a humanoid!"))
var/newname = sanitize(tgui_input_text(S, "You are a Promethean. Would you like to change your name to something else?", "Name change", null, MAX_NAME_LEN), MAX_NAME_LEN)
if(newname)
S.real_name = newname
@@ -80,12 +80,12 @@
force = 1 //Needs a token force to ensure you can attack because for some reason you can't attack with 0 force things
/obj/item/slime_crystal/apply_hit_effect(mob/living/target, mob/living/user, var/hit_zone)
target.visible_message("<span class='warning'>\The [target] has been teleported with \the [src] by \the [user]!</span>")
target.visible_message(span_warning("\The [target] has been teleported with \the [src] by \the [user]!"))
safe_blink(target, 14)
qdel(src)
/obj/item/slime_crystal/attack_self(mob/user)
user.visible_message("<span class='warning'>\The [user] teleports themselves with \the [src]!</span>")
user.visible_message(span_warning("\The [user] teleports themselves with \the [src]!"))
safe_blink(user, 14)
qdel(src)
@@ -96,7 +96,7 @@
if(AM.anchored)
return
AM.visible_message("<span class='warning'>\The [AM] has been teleported with \the [src]!</span>")
AM.visible_message(span_warning("\The [AM] has been teleported with \the [src]!"))
safe_blink(AM, 14)
qdel(src)

82
code/modules/xenobio/items/slimepotions.dm
View File

@@ -23,16 +23,16 @@
/obj/item/slimepotion/stabilizer/attack(mob/living/simple_mob/slime/xenobio/M, mob/user)
if(!istype(M))
to_chat(user, "<span class='warning'>The stabilizer only works on slimes!</span>")
to_chat(user, span_warning("The stabilizer only works on slimes!"))
return ..()
if(M.stat == DEAD)
to_chat(user, "<span class='warning'>The slime is dead!</span>")
to_chat(user, span_warning("The slime is dead!"))
return ..()
if(M.mutation_chance == 0)
to_chat(user, "<span class='warning'>The slime already has no chance of mutating!</span>")
to_chat(user, span_warning("The slime already has no chance of mutating!"))
return ..()
to_chat(user, "<span class='notice'>You feed the slime the stabilizer. It is now less likely to mutate.</span>")
to_chat(user, span_notice("You feed the slime the stabilizer. It is now less likely to mutate."))
M.mutation_chance = between(0, M.mutation_chance - 15, 100)
playsound(src, 'sound/effects/bubbles.ogg', 50, 1)
qdel(src)
@@ -47,16 +47,16 @@
/obj/item/slimepotion/mutator/attack(mob/living/simple_mob/slime/xenobio/M, mob/user)
if(!istype(M))
to_chat(user, "<span class='warning'>The mutator only works on slimes!</span>")
to_chat(user, span_warning("The mutator only works on slimes!"))
return ..()
if(M.stat == DEAD)
to_chat(user, "<span class='warning'>The slime is dead!</span>")
to_chat(user, span_warning("The slime is dead!"))
return ..()
if(M.mutation_chance == 100)
to_chat(user, "<span class='warning'>The slime is already guaranteed to mutate!</span>")
to_chat(user, span_warning("The slime is already guaranteed to mutate!"))
return ..()
to_chat(user, "<span class='notice'>You feed the slime the mutator. It is now more likely to mutate.</span>")
to_chat(user, span_notice("You feed the slime the mutator. It is now more likely to mutate."))
M.mutation_chance = between(0, M.mutation_chance + 12, 100)
playsound(src, 'sound/effects/bubbles.ogg', 50, 1)
qdel(src)
@@ -72,10 +72,10 @@
/obj/item/slimepotion/docility/attack(mob/living/simple_mob/M, mob/user)
if(!istype(M))
to_chat(user, "<span class='warning'>The agent only works on creatures!</span>")
to_chat(user, span_warning("The agent only works on creatures!"))
return ..()
if(M.stat == DEAD)
to_chat(user, "<span class='warning'>\The [M] is dead!</span>")
to_chat(user, span_warning("\The [M] is dead!"))
return ..()
if(!M.has_AI())
to_chat(user, span_warning("\The [M] is too strongly willed for this to affect them.")) // Most likely player controlled.
@@ -91,27 +91,27 @@
if(istype(M, /mob/living/simple_mob/slime/xenobio))
var/mob/living/simple_mob/slime/xenobio/S = M
if(S.harmless)
to_chat(user, "<span class='warning'>The slime is already docile!</span>")
to_chat(user, span_warning("The slime is already docile!"))
return ..()
S.pacify()
S.nutrition = 700
to_chat(M, "<span class='warning'>You absorb the agent and feel your intense desire to feed melt away.</span>")
to_chat(user, "<span class='notice'>You feed the slime the agent, removing its hunger and calming it.</span>")
to_chat(M, span_warning("You absorb the agent and feel your intense desire to feed melt away."))
to_chat(user, span_notice("You feed the slime the agent, removing its hunger and calming it."))
// Simple Mobs.
else if(istype(M, /mob/living/simple_mob))
var/mob/living/simple_mob/SM = M
if(!(SM.mob_class & MOB_CLASS_SLIME|MOB_CLASS_ANIMAL)) // So you can't use this on Russians/syndies/hivebots/etc.
to_chat(user, "<span class='warning'>\The [SM] only works on slimes and animals.</span>")
to_chat(user, span_warning("\The [SM] only works on slimes and animals."))
return ..()
if(!AI.hostile)
to_chat(user, "<span class='warning'>\The [SM] is already passive!</span>")
to_chat(user, span_warning("\The [SM] is already passive!"))
return ..()
AI.hostile = FALSE
to_chat(M, "<span class='warning'>You consume the agent and feel a serene sense of peace.</span>")
to_chat(user, "<span class='notice'>You feed \the [SM] the agent, calming it.</span>")
to_chat(M, span_warning("You consume the agent and feel a serene sense of peace."))
to_chat(user, span_notice("You feed \the [SM] the agent, calming it."))
playsound(src, 'sound/effects/bubbles.ogg', 50, 1)
AI.remove_target() // So hostile things stop attacking people even if not hostile anymore.
@@ -133,19 +133,19 @@
/obj/item/slimepotion/steroid/attack(mob/living/simple_mob/slime/xenobio/M, mob/user)
if(!istype(M))
to_chat(user, "<span class='warning'>The steroid only works on slimes!</span>")
to_chat(user, span_warning("The steroid only works on slimes!"))
return ..()
if(M.stat == DEAD)
to_chat(user, "<span class='warning'>The slime is dead!</span>")
to_chat(user, span_warning("The slime is dead!"))
return ..()
if(M.is_adult) //Can't steroidify adults
to_chat(user, "<span class='warning'>Only baby slimes can use the steroid!</span>")
to_chat(user, span_warning("Only baby slimes can use the steroid!"))
return ..()
if(M.cores >= 5)
to_chat(user, "<span class='warning'>The slime already has the maximum amount of extract!</span>")
to_chat(user, span_warning("The slime already has the maximum amount of extract!"))
return ..()
to_chat(user, "<span class='notice'>You feed the slime the steroid. It will now produce one more extract.</span>")
to_chat(user, span_notice("You feed the slime the steroid. It will now produce one more extract."))
M.cores++
playsound(src, 'sound/effects/bubbles.ogg', 50, 1)
qdel(src)
@@ -161,16 +161,16 @@
/obj/item/slimepotion/unity/attack(mob/living/simple_mob/slime/M, mob/user)
if(!istype(M))
to_chat(user, "<span class='warning'>The agent only works on slimes!</span>")
to_chat(user, span_warning("The agent only works on slimes!"))
return ..()
if(M.stat == DEAD)
to_chat(user, "<span class='warning'>The slime is dead!</span>")
to_chat(user, span_warning("The slime is dead!"))
return ..()
if(M.unity == TRUE)
to_chat(user, "<span class='warning'>The slime is already unified!</span>")
to_chat(user, span_warning("The slime is already unified!"))
return ..()
to_chat(user, "<span class='notice'>You feed the slime the agent. It will now be friendly to all other slimes.</span>")
to_chat(user, span_notice("You feed the slime the agent. It will now be friendly to all other slimes."))
to_chat(M, "<span class='notice'>\The [user] feeds you \the [src], and you suspect that all the other slimes will be \
your friends, at least if you don't attack them first.</span>")
M.unify()
@@ -187,16 +187,16 @@
/obj/item/slimepotion/loyalty/attack(mob/living/simple_mob/M, mob/user)
if(!istype(M))
to_chat(user, "<span class='warning'>The agent only works on creatures!</span>")
to_chat(user, span_warning("The agent only works on creatures!"))
return ..()
if(!(M.mob_class & MOB_CLASS_SLIME|MOB_CLASS_ANIMAL)) // So you can't use this on Russians/syndies/hivebots/etc.
to_chat(user, "<span class='warning'>\The [M] only works on slimes and animals.</span>")
to_chat(user, span_warning("\The [M] only works on slimes and animals."))
return ..()
if(M.stat == DEAD)
to_chat(user, "<span class='warning'>The animal is dead!</span>")
to_chat(user, span_warning("The animal is dead!"))
return ..()
if(M.faction == user.faction)
to_chat(user, "<span class='warning'>\The [M] is already loyal to your species!</span>")
to_chat(user, span_warning("\The [M] is already loyal to your species!"))
return ..()
if(!M.has_AI())
to_chat(user, span_warning("\The [M] is too strong-willed for this to affect them."))
@@ -204,8 +204,8 @@
var/datum/ai_holder/AI = M.ai_holder
to_chat(user, "<span class='notice'>You feed \the [M] the agent. It will now try to murder things that want to murder you instead.</span>")
to_chat(M, "<span class='notice'>\The [user] feeds you \the [src], and feel that the others will regard you as an outsider now.</span>")
to_chat(user, span_notice("You feed \the [M] the agent. It will now try to murder things that want to murder you instead."))
to_chat(M, span_notice("\The [user] feeds you \the [src], and feel that the others will regard you as an outsider now."))
M.faction = user.faction
AI.remove_target() // So hostile things stop attacking people even if not hostile anymore.
playsound(src, 'sound/effects/bubbles.ogg', 50, 1)
@@ -222,16 +222,16 @@
/obj/item/slimepotion/friendship/attack(mob/living/simple_mob/M, mob/user)
if(!istype(M))
to_chat(user, "<span class='warning'>The agent only works on creatures!</span>")
to_chat(user, span_warning("The agent only works on creatures!"))
return ..()
if(!(M.mob_class & MOB_CLASS_SLIME|MOB_CLASS_ANIMAL)) // So you can't use this on Russians/syndies/hivebots/etc.
to_chat(user, "<span class='warning'>\The [M] only works on slimes and animals.</span>")
to_chat(user, span_warning("\The [M] only works on slimes and animals."))
return ..()
if(M.stat == DEAD)
to_chat(user, "<span class='warning'>\The [M] is dead!</span>")
to_chat(user, span_warning("\The [M] is dead!"))
return ..()
if(user in M.friends)
to_chat(user, "<span class='warning'>\The [M] is already loyal to you!</span>")
to_chat(user, span_warning("\The [M] is already loyal to you!"))
return ..()
if(!M.has_AI())
to_chat(user, span_warning("\The [M] is too strong-willed for this to affect them."))
@@ -239,8 +239,8 @@
var/datum/ai_holder/AI = M.ai_holder
to_chat(user, "<span class='notice'>You feed \the [M] the agent. It will now be your best friend.</span>")
to_chat(M, "<span class='notice'>\The [user] feeds you \the [src], and feel that \the [user] wants to be best friends with you.</span>")
to_chat(user, span_notice("You feed \the [M] the agent. It will now be your best friend."))
to_chat(M, span_notice("\The [user] feeds you \the [src], and feel that \the [user] wants to be best friends with you."))
M.friends.Add(user)
AI.remove_target() // So hostile things stop attacking people even if not hostile anymore.
playsound(src, 'sound/effects/bubbles.ogg', 50, 1)
@@ -256,13 +256,13 @@
/obj/item/slimepotion/feeding/attack(mob/living/simple_mob/slime/xenobio/M, mob/user)
if(!istype(M))
to_chat(user, "<span class='warning'>The feeding agent only works on slimes!</span>")
to_chat(user, span_warning("The feeding agent only works on slimes!"))
return ..()
if(M.stat == DEAD)
to_chat(user, "<span class='warning'>The slime is dead!</span>")
to_chat(user, span_warning("The slime is dead!"))
return ..()
to_chat(user, "<span class='notice'>You feed the slime the feeding agent. It will now instantly reproduce.</span>")
to_chat(user, span_notice("You feed the slime the feeding agent. It will now instantly reproduce."))
M.amount_grown = 10
M.make_adult()
M.amount_grown = 10

58
code/modules/xenobio/items/slimepotions_vr.dm
View File

@@ -1,6 +1,6 @@
/obj/item/slimepotion/attackby(obj/item/O, mob/user)
if(istype(O, /obj/item/slimepotion/mimic))
to_chat(user, "<span class='notice'>You apply the mimic to the slime potion as it copies it's effects.</span>")
to_chat(user, span_notice("You apply the mimic to the slime potion as it copies it's effects."))
playsound(src, 'sound/effects/bubbles.ogg', 50, 1)
var/newtype = src.type
new newtype(get_turf(src))
@@ -16,16 +16,16 @@
/obj/item/slimepotion/infertility/attack(mob/living/simple_mob/slime/xenobio/M, mob/user)
if(!istype(M))
to_chat(user, "<span class='warning'>The agent only works on slimes!</span>")
to_chat(user, span_warning("The agent only works on slimes!"))
return ..()
if(M.stat == DEAD)
to_chat(user, "<span class='warning'>The slime is dead!</span>")
to_chat(user, span_warning("The slime is dead!"))
return ..()
if(M.split_amount <= 2)
to_chat(user, "<span class='warning'>The slime cannot get any less fertile!</span>")
to_chat(user, span_warning("The slime cannot get any less fertile!"))
return ..()
to_chat(user, "<span class='notice'>You feed the slime the infertility agent. It will now have less offspring.</span>")
to_chat(user, span_notice("You feed the slime the infertility agent. It will now have less offspring."))
M.split_amount = between(2, M.split_amount - 2, 6)
playsound(src, 'sound/effects/bubbles.ogg', 50, 1)
qdel(src)
@@ -38,16 +38,16 @@
/obj/item/slimepotion/fertility/attack(mob/living/simple_mob/slime/xenobio/M, mob/user)
if(!istype(M))
to_chat(user, "<span class='warning'>The agent only works on slimes!</span>")
to_chat(user, span_warning("The agent only works on slimes!"))
return ..()
if(M.stat == DEAD)
to_chat(user, "<span class='warning'>The slime is dead!</span>")
to_chat(user, span_warning("The slime is dead!"))
return ..()
if(M.split_amount >= 6)
to_chat(user, "<span class='warning'>The slime cannot get any more fertile!</span>")
to_chat(user, span_warning("The slime cannot get any more fertile!"))
return ..()
to_chat(user, "<span class='notice'>You feed the slime the fertility agent. It will now have more offspring.</span>")
to_chat(user, span_notice("You feed the slime the fertility agent. It will now have more offspring."))
M.split_amount = between(2, M.split_amount + 2, 6)
playsound(src, 'sound/effects/bubbles.ogg', 50, 1)
qdel(src)
@@ -60,16 +60,16 @@
/obj/item/slimepotion/shrink/attack(mob/living/simple_mob/slime/xenobio/M, mob/user)
if(!istype(M))
to_chat(user, "<span class='warning'>The agent only works on slimes!</span>")
to_chat(user, span_warning("The agent only works on slimes!"))
return ..()
if(M.stat == DEAD)
to_chat(user, "<span class='warning'>The slime is dead!</span>")
to_chat(user, span_warning("The slime is dead!"))
return ..()
if(!(M.is_adult))
to_chat(user, "<span class='warning'>The slime is already a baby!</span>")
to_chat(user, span_warning("The slime is already a baby!"))
return ..()
to_chat(user, "<span class='notice'>You feed the slime the shrinking agent. It is now back to being a baby.</span>")
to_chat(user, span_notice("You feed the slime the shrinking agent. It is now back to being a baby."))
M.make_baby()
playsound(src, 'sound/effects/bubbles.ogg', 50, 1)
qdel(src)
@@ -82,13 +82,13 @@
/obj/item/slimepotion/death/attack(mob/living/simple_mob/slime/xenobio/M, mob/user)
if(!istype(M))
to_chat(user, "<span class='warning'>The agent only works on slimes!</span>")
to_chat(user, span_warning("The agent only works on slimes!"))
return ..()
if(M.stat == DEAD)
to_chat(user, "<span class='warning'>The slime is already dead!</span>")
to_chat(user, span_warning("The slime is already dead!"))
return ..()
to_chat(user, "<span class='notice'>You feed the slime the death agent. Its face flashes pain of betrayal before it goes still.</span>")
to_chat(user, span_notice("You feed the slime the death agent. Its face flashes pain of betrayal before it goes still."))
M.adjustToxLoss(500)
playsound(src, 'sound/effects/bubbles.ogg', 50, 1)
qdel(src)
@@ -101,16 +101,16 @@
/obj/item/slimepotion/ferality/attack(mob/living/simple_mob/slime/xenobio/M, mob/user)
if(!istype(M))
to_chat(user, "<span class='warning'>The agent only works on slimes!</span>")
to_chat(user, span_warning("The agent only works on slimes!"))
return ..()
if(M.stat == DEAD)
to_chat(user, "<span class='warning'>The slime is already dead!</span>")
to_chat(user, span_warning("The slime is already dead!"))
return ..()
if(M.untamable && M.untamable_inheirit)
to_chat(user, "<span class='warning'>The slime is already untamable!</span>")
to_chat(user, span_warning("The slime is already untamable!"))
return ..()
to_chat(user, "<span class='notice'>You feed the slime the death agent. It will now only get angrier at taming attempts.</span>")
to_chat(user, span_notice("You feed the slime the death agent. It will now only get angrier at taming attempts."))
M.untamable = TRUE
M.untamable_inheirit = TRUE
playsound(src, 'sound/effects/bubbles.ogg', 50, 1)
@@ -130,7 +130,7 @@
/obj/item/slimepotion/mimic/attackby(obj/item/O, mob/user)
if(istype(O, /obj/item/slimepotion/mimic))
to_chat(user, "<span class='warning'>You apply the mimic to the mimic, resulting a mimic that copies a mimic that copies a mimic that copies a mimic that-</span>")
to_chat(user, span_warning("You apply the mimic to the mimic, resulting a mimic that copies a mimic that copies a mimic that copies a mimic that-"))
var/location = get_turf(src)
playsound(location, 'sound/weapons/gauss_shoot.ogg', 50, 1)
var/datum/effect/effect/system/grav_pull/s = new /datum/effect/effect/system/grav_pull
@@ -149,19 +149,19 @@
/obj/item/slimepotion/sapience/attack(mob/living/simple_mob/M, mob/user)
if(!istype(M))
to_chat(user, "<span class='warning'>The agent only works on creatures!</span>")
to_chat(user, span_warning("The agent only works on creatures!"))
return ..()
if(M.stat == DEAD)
to_chat(user, "<span class='warning'>The creature is dead!</span>")
to_chat(user, span_warning("The creature is dead!"))
return ..()
if(M.ghostjoin)
to_chat(user, "<span class='warning'>The creature is already developing sapience.</span>")
to_chat(user, span_warning("The creature is already developing sapience."))
return ..()
if(M.ckey)
to_chat(user, "<span class='warning'>The creature is already sapient!</span>")
to_chat(user, span_warning("The creature is already sapient!"))
return ..()
to_chat(user, "<span class='notice'>You feed \the [M] the agent. It may now eventually develop proper sapience.</span>")
to_chat(user, span_notice("You feed \the [M] the agent. It may now eventually develop proper sapience."))
M.ghostjoin = 1
active_ghost_pods |= M
if(!M.vore_active)
@@ -179,13 +179,13 @@
/obj/item/slimepotion/obedience/attack(mob/living/simple_mob/slime/xenobio/M, mob/user)
if(!istype(M))
to_chat(user, "<span class='warning'>The agent only works on slimes!</span>")
to_chat(user, span_warning("The agent only works on slimes!"))
return ..()
if(M.stat == DEAD)
to_chat(user, "<span class='warning'>The slime is dead!</span>")
to_chat(user, span_warning("The slime is dead!"))
return ..()
to_chat(user, "<span class='notice'>You feed the slime the agent. It has been disciplined, for better or worse...</span>")
to_chat(user, span_notice("You feed the slime the agent. It has been disciplined, for better or worse..."))
var/justified = M.is_justified_to_discipline()
M.adjust_discipline(10)
var/datum/ai_holder/simple_mob/xenobio_slime/AI = M.ai_holder

12
code/modules/xenobio/items/weapons_vr.dm
View File

@@ -17,7 +17,7 @@
/obj/item/xenobio/attack_hand(mob/user as mob)
if(user.get_inactive_hand() == src && loaded_item)
user.put_in_hands(loaded_item)
user.visible_message("<span class='notice'>[user] removes [loaded_item] from [src].</span>", "<span class='notice'>You remove [loaded_item] from [src].</span>")
user.visible_message(span_notice("[user] removes [loaded_item] from [src]."), span_notice("You remove [loaded_item] from [src]."))
loaded_item = null
playsound(src, 'sound/weapons/empty.ogg', 50, 1)
else
@@ -32,14 +32,14 @@
user.drop_item()
I.loc = src
loaded_item = I
user.visible_message("<span class='notice'>[user] inserts [I] into [src].</span>", "<span class='notice'>You slot [I] into [src].</span>")
user.visible_message(span_notice("[user] inserts [I] into [src]."), span_notice("You slot [I] into [src]."))
return 1
..()
/obj/item/xenobio/attack_self(mob/living/user as mob)
if(loaded_item)
user.put_in_hands(loaded_item)
user.visible_message("<span class='notice'>[user] removes [loaded_item] from [src].</span>", "<span class='notice'>You remove [loaded_item] from [src].</span>")
user.visible_message(span_notice("[user] removes [loaded_item] from [src]."), span_notice("You remove [loaded_item] from [src]."))
loaded_item = null
playsound(src, 'sound/weapons/empty.ogg', 50, 1)
@@ -54,7 +54,7 @@
playsound(src, 'sound/weapons/wave.ogg', 60, 1)
user.visible_message("<span class='warning'>[user] fires \the [src]!</span>","<span class='warning'>You fire \the [src]!</span>")
user.visible_message(span_warning("[user] fires \the [src]!"),span_warning("You fire \the [src]!"))
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
s.set_up(4, 1, A)
@@ -151,9 +151,9 @@
if(processing)
return
if(!can_insert(M))
to_chat(user, "<span class='warning'>\The [src] cannot process \the [M] at this time.</span>")
to_chat(user, span_warning("\The [src] cannot process \the [M] at this time."))
playsound(src, 'sound/machines/buzz-sigh.ogg', 50, 1)
return
extract(M, user)
return ..()
return ..()

8
code/modules/xenobio/machinery/processor.dm
View File

@@ -20,13 +20,13 @@
/obj/machinery/processor/attack_hand(mob/living/user)
if(processing)
to_chat(user, "<span class='warning'>The processor is in the process of processing!</span>")
to_chat(user, span_warning("The processor is in the process of processing!"))
return
if(to_be_processed.len)
spawn(1)
begin_processing()
else
to_chat(user, "<span class='warning'>The processor is empty.</span>")
to_chat(user, span_warning("The processor is empty."))
playsound(src, 'sound/machines/buzz-sigh.ogg', 50, 1)
return
@@ -53,7 +53,7 @@
if(!Adjacent(AM))
return
if(!can_insert(AM))
to_chat(user, "<span class='warning'>\The [src] cannot process \the [AM] at this time.</span>")
to_chat(user, span_warning("\The [src] cannot process \the [AM] at this time."))
playsound(src, 'sound/machines/buzz-sigh.ogg', 50, 1)
return
to_be_processed.Add(AM)
@@ -115,4 +115,4 @@
/obj/machinery/processor/MouseDrop_T(var/atom/movable/AM, var/mob/living/user)
if(user.stat || user.incapacitated(INCAPACITATION_DISABLED) || !istype(user))
return
insert(AM, user)
insert(AM, user)