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

10
code/modules/hydroponics/backtank.dm
View File

@@ -78,16 +78,16 @@
var/mob/living/carbon/human/user = usr
if(!noz)
to_chat(user, "<span class='warning'>The mister is missing!</span>")
to_chat(user, span_warning("The mister is missing!"))
return
if(noz.loc != src)
remove_noz(user) //Remove from their hands and back onto the defib unit
return
if(!slot_check())
to_chat(user, "<span class='warning'>You need to equip [src] before taking out [noz].</span>")
to_chat(user, span_warning("You need to equip [src] before taking out [noz]."))
else
if(!usr.put_in_hands(noz)) //Detach the handset into the user's hands
to_chat(user, "<span class='warning'>You need a free hand to hold the handset!</span>")
to_chat(user, span_warning("You need a free hand to hold the handset!"))
update_icon() //success
/obj/item/watertank/proc/make_noz()
@@ -104,7 +104,7 @@
if(ismob(noz.loc))
var/mob/M = noz.loc
if(M.drop_from_inventory(noz, src))
to_chat(user, "<span class='notice'>\The [noz] snaps back into the main unit.</span>")
to_chat(user, span_notice("\The [noz] snaps back into the main unit."))
else
noz.forceMove(src)
@@ -304,4 +304,4 @@
reagents.trans_to_obj(D, amount_per_transfer_from_this)
D.set_color()
D.set_up(my_target, rand(6, 8), 2)
return
return

2
code/modules/hydroponics/beekeeping/beehive.dm
View File

@@ -96,7 +96,7 @@
update_icon()
return
else if(istype(I, /obj/item/analyzer/plant_analyzer))
to_chat(user, "<span class='notice'>Scan result of \the [src]...</span>")
to_chat(user, span_notice("Scan result of \the [src]..."))
to_chat(user, "Beehive is [bee_count ? "[round(bee_count)]% full" : "empty"].[bee_count > 90 ? " Colony is ready to split." : ""]")
if(length(frames))
to_chat(user, "[length(frames)] frames installed, [round(honeycombs / 100)] filled.")

36
code/modules/hydroponics/grown.dm
View File

@@ -157,7 +157,7 @@
return
M.stop_pulling()
to_chat(M, "<span class='notice'>You slipped on the [name]!</span>")
to_chat(M, span_notice("You slipped on the [name]!"))
playsound(src, 'sound/misc/slip.ogg', 50, 1, -3)
M.Stun(8)
M.Weaken(5)
@@ -177,7 +177,7 @@
var/obj/item/stack/cable_coil/C = W
if(C.use(5))
//TODO: generalize this.
to_chat(user, "<span class='notice'>You add some cable to the [src.name] and slide it inside the battery casing.</span>")
to_chat(user, span_notice("You add some cable to the [src.name] and slide it inside the battery casing."))
var/obj/item/cell/potato/pocell = new /obj/item/cell/potato(get_turf(user))
if(src.loc == user && istype(user,/mob/living/carbon/human))
user.put_in_hands(pocell)
@@ -189,7 +189,7 @@
if(W.sharp)
if(seed.kitchen_tag == "pumpkin") // Ugggh these checks are awful.
user.show_message("<span class='notice'>You carve a face into [src]!</span>", 1)
user.show_message(span_notice("You carve a face into [src]!"), 1)
new /obj/item/clothing/head/pumpkinhead (user.loc)
qdel(src)
return
@@ -197,7 +197,7 @@
if(seed.chems)
if(W.sharp && W.edge && !isnull(seed.chems["woodpulp"]))
user.show_message("<span class='notice'>You make planks out of \the [src]!</span>", 1)
user.show_message(span_notice("You make planks out of \the [src]!"), 1)
playsound(src, 'sound/effects/woodcutting.ogg', 50, 1)
var/flesh_colour = seed.get_trait(TRAIT_FLESH_COLOUR)
if(!flesh_colour) flesh_colour = seed.get_trait(TRAIT_PRODUCT_COLOUR)
@@ -210,7 +210,7 @@
if(G.get_amount() >= G.max_amount)
continue
G.attackby(NG, user)
to_chat(user, "<span class='filter_notice'>You add the newly-formed wood to the stack. It now contains [NG.get_amount()] planks.</span>")
to_chat(user, span_filter_notice("You add the newly-formed wood to the stack. It now contains [NG.get_amount()] planks."))
qdel(src)
return
@@ -221,31 +221,31 @@
return
if(seed.kitchen_tag == "potato" || !isnull(seed.chems["potato"]))
to_chat(user, "<span class='filter_notice'>You slice \the [src] into sticks.</span>")
to_chat(user, span_filter_notice("You slice \the [src] into sticks."))
new /obj/item/reagent_containers/food/snacks/rawsticks(get_turf(src))
qdel(src)
return
if(!isnull(seed.chems["carrotjuice"]))
to_chat(user, "<span class='filter_notice'>You slice \the [src] into sticks.</span>")
to_chat(user, span_filter_notice("You slice \the [src] into sticks."))
new /obj/item/reagent_containers/food/snacks/carrotfries(get_turf(src))
qdel(src)
return
if(!isnull(seed.chems["pineapplejuice"]))
to_chat(user, "<span class='filter_notice'>You slice \the [src] into rings.</span>")
to_chat(user, span_filter_notice("You slice \the [src] into rings."))
new /obj/item/reagent_containers/food/snacks/pineapple_ring(get_turf(src))
qdel(src)
return
if(!isnull(seed.chems["soymilk"]))
to_chat(user, "<span class='filter_notice'>You roughly chop up \the [src].</span>")
to_chat(user, span_filter_notice("You roughly chop up \the [src]."))
new /obj/item/reagent_containers/food/snacks/soydope(get_turf(src))
qdel(src)
return
if(seed.get_trait(TRAIT_FLESH_COLOUR))
to_chat(user, "<span class='filter_notice'>You slice up \the [src].</span>")
to_chat(user, span_filter_notice("You slice up \the [src]."))
var/slices = rand(3,5)
var/reagents_to_transfer = round(reagents.total_volume/slices)
for(var/i=1; i<=slices; i++)
@@ -270,7 +270,7 @@
return
if(prob(35))
if(user)
to_chat(user, "<span class='danger'>\The [src] has fallen to bits.</span>")
to_chat(user, span_danger("\The [src] has fallen to bits."))
user.drop_from_inventory(src)
qdel(src)
@@ -283,14 +283,14 @@
return
if(user.a_intent == I_HURT)
user.visible_message("<span class='danger'>\The [user] squashes \the [src]!</span>")
user.visible_message(span_danger("\The [user] squashes \the [src]!"))
seed.thrown_at(src,user)
sleep(-1)
if(src) qdel(src)
return
if(seed.kitchen_tag == "grass")
user.show_message("<span class='notice'>You make a grass tile out of \the [src]!</span>", 1)
user.show_message(span_notice("You make a grass tile out of \the [src]!"), 1)
var/flesh_colour = seed.get_trait(TRAIT_FLESH_COLOUR)
if(!flesh_colour) flesh_colour = seed.get_trait(TRAIT_PRODUCT_COLOUR)
for(var/i=0,i<2,i++)
@@ -307,7 +307,7 @@
return
if(seed.kitchen_tag == "carpet")
user.show_message("<span class='notice'>You shape some carpet squares out of \the [src] fibers!</span>", 1)
user.show_message(span_notice("You shape some carpet squares out of \the [src] fibers!"), 1)
for(var/i=0,i<2,i++)
var/obj/item/stack/tile/carpet/G = new (user.loc)
for (var/obj/item/stack/tile/carpet/NG in user.loc)
@@ -316,12 +316,12 @@
if(NG.get_amount() >= NG.max_amount)
continue
NG.attackby(G, user)
to_chat(user, "<span class='filter_notice'>You add the newly-formed carpet to the stack. It now contains [G.get_amount()] tiles.</span>")
to_chat(user, span_filter_notice("You add the newly-formed carpet to the stack. It now contains [G.get_amount()] tiles."))
qdel(src)
return
if(seed.get_trait(TRAIT_SPREAD) > 0)
to_chat(user, "<span class='notice'>You plant the [src.name].</span>")
to_chat(user, span_notice("You plant the [src.name]."))
new /obj/machinery/portable_atmospherics/hydroponics/soil/invisible(get_turf(user),src.seed)
GLOB.seed_planted_shift_roundstat++
qdel(src)
@@ -333,13 +333,13 @@
if("shand")
var/obj/item/stack/medical/bruise_pack/tajaran/poultice = new /obj/item/stack/medical/bruise_pack/tajaran(user.loc)
poultice.heal_brute = potency
to_chat(user, "<span class='notice'>You mash the leaves into a poultice.</span>")
to_chat(user, span_notice("You mash the leaves into a poultice."))
qdel(src)
return
if("mtear")
var/obj/item/stack/medical/ointment/tajaran/poultice = new /obj/item/stack/medical/ointment/tajaran(user.loc)
poultice.heal_burn = potency
to_chat(user, "<span class='notice'>You mash the petals into a poultice.</span>")
to_chat(user, span_notice("You mash the petals into a poultice."))
qdel(src)
return
*/

2
code/modules/hydroponics/grown_inedible.dm
View File

@@ -44,7 +44,7 @@
/obj/item/corncob/attackby(obj/item/W as obj, mob/user as mob)
..()
if(istype(W, /obj/item/surgical/circular_saw) || istype(W, /obj/item/material/knife/machete/hatchet) || istype(W, /obj/item/material/knife))
to_chat(user, "<span class='notice'>You use [W] to fashion a pipe out of the corn cob!</span>")
to_chat(user, span_notice("You use [W] to fashion a pipe out of the corn cob!"))
new /obj/item/clothing/mask/smokable/pipe/cobpipe (user.loc)
qdel(src)
return

22
code/modules/hydroponics/seed.dm
View File

@@ -139,19 +139,19 @@
has_edge = prob(get_trait(TRAIT_POTENCY)/2)
if(affecting)
to_chat(target, "<span class='danger'>\The [fruit]'s thorns pierce your [affecting.name] greedily!</span>")
to_chat(target, span_danger("\The [fruit]'s thorns pierce your [affecting.name] greedily!"))
target.apply_damage(damage, BRUTE, target_limb, blocked, soaked, TRUE, has_edge, "Thorns")
else
to_chat(target, "<span class='danger'>\The [fruit]'s thorns pierce your flesh greedily!</span>")
to_chat(target, span_danger("\The [fruit]'s thorns pierce your flesh greedily!"))
target.adjustBruteLoss(damage)
else
damage = max(1, round(5*get_trait(TRAIT_POTENCY)/100, 1))
has_edge = prob(get_trait(TRAIT_POTENCY)/5)
if(affecting)
to_chat(target, "<span class='danger'>\The [fruit]'s thorns dig deeply into your [affecting.name]!</span>")
to_chat(target, span_danger("\The [fruit]'s thorns dig deeply into your [affecting.name]!"))
target.apply_damage(damage, BRUTE, target_limb, blocked, soaked, TRUE, has_edge, "Thorns")
else
to_chat(target, "<span class='danger'>\The [fruit]'s thorns dig deeply into your flesh!</span>")
to_chat(target, span_danger("\The [fruit]'s thorns dig deeply into your flesh!"))
target.adjustBruteLoss(damage)
// Adds reagents to a target.
@@ -270,7 +270,7 @@
apply_special_effect(M)
splatter(T,thrown)
if(origin_turf)
origin_turf.visible_message("<span class='danger'>The [thrown.name] explodes!</span>")
origin_turf.visible_message(span_danger("The [thrown.name] explodes!"))
qdel(thrown)
return
@@ -284,7 +284,7 @@
if(get_trait(TRAIT_JUICY) && splatted)
splatter(origin_turf,thrown)
if(origin_turf)
origin_turf.visible_message("<span class='danger'>The [thrown.name] splatters against [target]!</span>")
origin_turf.visible_message(span_danger("The [thrown.name] splatters against [target]!"))
qdel(thrown)
/datum/seed/proc/handle_environment(var/turf/current_turf, var/datum/gas_mixture/environment, var/light_supplied, var/check_only)
@@ -584,7 +584,7 @@
switch(rand(0,11))
if(0) //Plant cancer!
set_trait(TRAIT_ENDURANCE,get_trait(TRAIT_ENDURANCE)-rand(10,20),null,0)
source_turf.visible_message("<span class='danger'>\The [display_name] withers rapidly!</span>")
source_turf.visible_message(span_danger("\The [display_name] withers rapidly!"))
if(1)
set_trait(TRAIT_NUTRIENT_CONSUMPTION,get_trait(TRAIT_NUTRIENT_CONSUMPTION)+rand(-(degree*0.1),(degree*0.1)),5,0)
set_trait(TRAIT_WATER_CONSUMPTION, get_trait(TRAIT_WATER_CONSUMPTION) +rand(-degree,degree),50,0)
@@ -657,7 +657,7 @@
set_trait(TRAIT_BIOLUM_COLOUR,get_random_colour(0,75,190))
source_turf.visible_message("<span class='notice'>\The [display_name]'s glow </span><font color='[get_trait(TRAIT_BIOLUM_COLOUR)]'>changes colour</font>!")
else
source_turf.visible_message("<span class='notice'>\The [display_name]'s glow dims...</span>")
source_turf.visible_message(span_notice("\The [display_name]'s glow dims..."))
if(11)
set_trait(TRAIT_TELEPORTING,1)
@@ -793,10 +793,10 @@
if(!force_amount && get_trait(TRAIT_YIELD) == 0 && !harvest_sample)
if(istype(user))
to_chat(user, "<span class='danger'>You fail to harvest anything useful.</span>")
to_chat(user, span_danger("You fail to harvest anything useful."))
else
if(istype(user))
to_chat(user, "<span class='filter_notice'>You [harvest_sample ? "take a sample" : "harvest"] from the [display_name].</span>")
to_chat(user, span_filter_notice("You [harvest_sample ? "take a sample" : "harvest"] from the [display_name]."))
//This may be a new line. Update the global if it is.
if(name == "new line" || !(name in SSplants.seeds))
@@ -854,7 +854,7 @@
//Handle spawning in living, mobile products (like dionaea).
if(istype(product,/mob/living))
product.visible_message("<span class='notice'>The pod disgorges [product]!</span>")
product.visible_message(span_notice("The pod disgorges [product]!"))
handle_living_product(product)
// When the seed in this machine mutates/is modified, the tray seed value

24
code/modules/hydroponics/seed_machines.dm
View File

@@ -17,7 +17,7 @@
if(genes.len)
var/choice = tgui_alert(user, "Are you sure you want to wipe the disk?", "Xenobotany Data", list("No", "Yes"))
if(src && user && genes && choice && choice == "Yes" && user.Adjacent(get_turf(src)))
to_chat(user, "<span class='filter_notice'>You wipe the disk data.</span>")
to_chat(user, span_filter_notice("You wipe the disk data."))
name = initial(name)
desc = initial(name)
genes = list()
@@ -68,61 +68,61 @@
active = 0
if(failed_task)
failed_task = 0
visible_message("<span class='filter_notice'>[icon2html(src,viewers(src))] [src] pings unhappily, flashing a red warning light.</span>")
visible_message(span_filter_notice("[icon2html(src,viewers(src))] [src] pings unhappily, flashing a red warning light."))
else
visible_message("<span class='filter_notice'>[icon2html(src,viewers(src))] [src] pings happily.</span>")
visible_message(span_filter_notice("[icon2html(src,viewers(src))] [src] pings happily."))
if(eject_disk)
eject_disk = 0
if(loaded_disk)
loaded_disk.loc = get_turf(src)
visible_message("<span class='filter_notice'>[icon2html(src,viewers(src))] [src] beeps and spits out [loaded_disk].</span>")
visible_message(span_filter_notice("[icon2html(src,viewers(src))] [src] beeps and spits out [loaded_disk]."))
loaded_disk = null
/obj/machinery/botany/attackby(obj/item/W as obj, mob/user as mob)
if(istype(W,/obj/item/seeds))
if(seed)
to_chat(user, "<span class='filter_notice'>There is already a seed loaded.</span>")
to_chat(user, span_filter_notice("There is already a seed loaded."))
return
var/obj/item/seeds/S =W
if(S.seed && S.seed.get_trait(TRAIT_IMMUTABLE) > 0)
to_chat(user, "<span class='filter_notice'>That seed is not compatible with our genetics technology.</span>")
to_chat(user, span_filter_notice("That seed is not compatible with our genetics technology."))
else
user.drop_from_inventory(W)
W.loc = src
seed = W
to_chat(user, "<span class='filter_notice'>You load [W] into [src].</span>")
to_chat(user, span_filter_notice("You load [W] into [src]."))
return
if(default_deconstruction_screwdriver(user, W))
return
if(W.has_tool_quality(TOOL_WRENCH))
playsound(src, W.usesound, 100, 1)
to_chat(user, "<span class='notice'>You [anchored ? "un" : ""]secure \the [src].</span>")
to_chat(user, span_notice("You [anchored ? "un" : ""]secure \the [src]."))
anchored = !anchored
return
// if(default_deconstruction_crowbar(user, W)) //No circuit boards to give.
// return
if(istype(W,/obj/item/disk/botany))
if(loaded_disk)
to_chat(user, "<span class='filter_notice'>There is already a data disk loaded.</span>")
to_chat(user, span_filter_notice("There is already a data disk loaded."))
return
else
var/obj/item/disk/botany/B = W
if(B.genes && B.genes.len)
if(!disk_needs_genes)
to_chat(user, "<span class='filter_notice'>That disk already has gene data loaded.</span>")
to_chat(user, span_filter_notice("That disk already has gene data loaded."))
return
else
if(disk_needs_genes)
to_chat(user, "<span class='filter_notice'>That disk does not have any gene data loaded.</span>")
to_chat(user, span_filter_notice("That disk does not have any gene data loaded."))
return
user.drop_from_inventory(W)
W.loc = src
loaded_disk = W
to_chat(user, "<span class='filter_notice'>You load [W] into [src].</span>")
to_chat(user, span_filter_notice("You load [W] into [src]."))
return
..()

2
code/modules/hydroponics/seed_mobs.dm
View File

@@ -13,7 +13,7 @@
if(!host.ckey && !host.client)
host.death() // This seems redundant, but a lot of mobs don't
host.set_stat(DEAD) // handle death() properly. Better safe than etc.
host.visible_message("<span class='danger'>[host] is malformed and unable to survive. It expires pitifully, leaving behind some seeds.</span>")
host.visible_message(span_danger("[host] is malformed and unable to survive. It expires pitifully, leaving behind some seeds."))
var/total_yield = rand(1,3)
for(var/j = 0;j<=total_yield;j++)

8
code/modules/hydroponics/seed_storage.dm
View File

@@ -400,7 +400,7 @@
if (loaded)
user.visible_message("<span class ='filter_notice'>[user] puts the seeds from \the [O.name] into \the [src].</span>", "<span class ='filter_notice'>You put the seeds from \the [O.name] into \the [src].</span>")
else
to_chat(user, "<span class='notice'>There are no seeds in \the [O.name].</span>")
to_chat(user, span_notice("There are no seeds in \the [O.name]."))
return
else if(O.has_tool_quality(TOOL_WRENCH))
playsound(src, O.usesound, 50, 1)
@@ -420,16 +420,16 @@
if(!src.emagged)
emagged = 1
if(lockdown)
to_chat(user, "<span class='notice'>\The [src]'s control panel thunks, as its cover retracts.</span>")
to_chat(user, span_notice("\The [src]'s control panel thunks, as its cover retracts."))
lockdown = 0
if(LAZYLEN(req_access) || LAZYLEN(req_one_access))
req_access = list()
req_one_access = list()
to_chat(user, "<span class='warning'>\The [src]'s access mechanism shorts out.</span>")
to_chat(user, span_warning("\The [src]'s access mechanism shorts out."))
var/datum/effect/effect/system/spark_spread/sparks = new /datum/effect/effect/system/spark_spread()
sparks.set_up(3, 0, get_turf(src))
sparks.start()
visible_message("<span class='warning'>\The [src]'s panel sparks!</span>")
visible_message(span_warning("\The [src]'s panel sparks!"))
qdel(sparks)
return 1

14
code/modules/hydroponics/spreading/spreading.dm
View File

@@ -24,9 +24,9 @@
vine.mature_time = 0
vine.process()
message_admins("<span class='notice'>Event: Spacevines spawned at [T.loc] ([T.x],[T.y],[T.z])</span>")
message_admins(span_notice("Event: Spacevines spawned at [T.loc] ([T.x],[T.y],[T.z])"))
return
message_admins("<span class='notice'>Event: Spacevines failed to find a viable turf.</span>")
message_admins(span_notice("Event: Spacevines failed to find a viable turf."))
/obj/effect/dead_plant
anchored = TRUE
@@ -98,7 +98,7 @@
if(!SSplants)
sleep(250) // ugly hack, should mean roundstart plants are fine. TODO initialize perhaps?
if(!SSplants)
to_world("<span class='danger'>Plant controller does not exist and [src] requires it. Aborting.</span>")
to_world(span_danger("Plant controller does not exist and [src] requires it. Aborting."))
qdel(src)
return
@@ -254,16 +254,16 @@
if(W.has_tool_quality(TOOL_WIRECUTTER) || istype(W, /obj/item/surgical/scalpel))
if(sampled)
to_chat(user, "<span class='warning'>\The [src] has already been sampled recently.</span>")
to_chat(user, span_warning("\The [src] has already been sampled recently."))
return
if(!is_mature())
to_chat(user, "<span class='warning'>\The [src] is not mature enough to yield a sample yet.</span>")
to_chat(user, span_warning("\The [src] is not mature enough to yield a sample yet."))
return
if(!seed)
to_chat(user, "<span class='warning'>There is nothing to take a sample from.</span>")
to_chat(user, span_warning("There is nothing to take a sample from."))
return
if(sampled)
to_chat(user, "<span class='danger'>You cannot take another sample from \the [src].</span>")
to_chat(user, span_danger("You cannot take another sample from \the [src]."))
return
if(prob(70))
sampled = 1

16
code/modules/hydroponics/spreading/spreading_response.dm
View File

@@ -79,21 +79,21 @@
L.visible_message(\
"<b>\The [user]</b> frees \the [L] from \the [src].",\
"<b>\The [user]</b> frees you from \the [src].",\
"<span class='warning'>You hear shredding and ripping.</span>")
span_warning("You hear shredding and ripping."))
else
L.visible_message(\
"<b>\The [L]</b> struggles free of \the [src].",\
"<span class='notice'>You untangle \the [src] from around yourself.</span>",\
"<span class='warning'>You hear shredding and ripping.</span>")
span_notice("You untangle \the [src] from around yourself."),\
span_warning("You hear shredding and ripping."))
unbuckle()
else
user.setClickCooldown(user.get_attack_speed())
health -= rand(1,5)
var/text = pick("rip","tear","pull", "bite", "tug")
user.visible_message(\
"<span class='warning'>\The [user] [text]s at \the [src].</span>",\
"<span class='warning'>You [text] at \the [src].</span>",\
"<span class='warning'>You hear shredding and ripping.</span>")
span_warning("\The [user] [text]s at \the [src]."),\
span_warning("You [text] at \the [src]."),\
span_warning("You hear shredding and ripping."))
check_health()
return
@@ -113,10 +113,10 @@
if(istype(H.shoes, /obj/item/clothing/shoes/magboots) && (H.shoes.item_flags & NOSLIP))
can_grab = 0
if(can_grab)
src.visible_message("<span class='danger'>Tendrils lash out from \the [src] and drag \the [victim] in!</span>")
src.visible_message(span_danger("Tendrils lash out from \the [src] and drag \the [victim] in!"))
victim.forceMove(src.loc)
buckle_mob(victim)
victim.set_dir(pick(cardinal))
to_chat(victim, "<span class='danger'>Tendrils [pick("wind", "tangle", "tighten")] around you!</span>")
to_chat(victim, span_danger("Tendrils [pick("wind", "tangle", "tighten")] around you!"))
victim.Weaken(0.5)
seed.do_thorns(victim,src)

64
code/modules/hydroponics/trays/tray.dm
View File

@@ -175,13 +175,13 @@
if(weedlevel > 0)
nymph.reagents.add_reagent("glucose", weedlevel)
weedlevel = 0
nymph.visible_message("<span class='notice'><b>[nymph]</b> begins rooting through [src], ripping out weeds and eating them noisily.</span>","<span class='notice'>You begin rooting through [src], ripping out weeds and eating them noisily.</span>")
nymph.visible_message(span_notice("<b>[nymph]</b> begins rooting through [src], ripping out weeds and eating them noisily."),span_notice("You begin rooting through [src], ripping out weeds and eating them noisily."))
else if(nymph.nutrition > 100 && nutrilevel < 10)
nymph.nutrition -= ((10-nutrilevel)*5)
nutrilevel = 10
nymph.visible_message("<span class='notice'><b>[nymph]</b> secretes a trickle of green liquid, refilling [src].</span>","<span class='notice'>You secrete a trickle of green liquid, refilling [src].</span>")
nymph.visible_message(span_notice("<b>[nymph]</b> secretes a trickle of green liquid, refilling [src]."),span_notice("You secrete a trickle of green liquid, refilling [src]."))
else
nymph.visible_message("<span class='notice'><b>[nymph]</b> rolls around in [src] for a bit.</span>","<span class='notice'>You roll around in [src] for a bit.</span>")
nymph.visible_message(span_notice("<b>[nymph]</b> rolls around in [src] for a bit."),span_notice("You roll around in [src] for a bit."))
return
/obj/machinery/portable_atmospherics/hydroponics/Initialize()
@@ -344,7 +344,7 @@
if(closed_system)
if(user)
to_chat(user, "<span class='filter_notice'>You can't harvest from the plant while the lid is shut.</span>")
to_chat(user, span_filter_notice("You can't harvest from the plant while the lid is shut."))
return
if(user)
@@ -372,7 +372,7 @@
if(!user || !dead) return
if(closed_system)
to_chat(user, "<span class='filter_notice'>You can't remove the dead plant while the lid is shut.</span>")
to_chat(user, span_filter_notice("You can't remove the dead plant while the lid is shut."))
return
seed = null
@@ -383,7 +383,7 @@
mutation_mod = 0
age_mod = 0 //CHOMPedit
to_chat(user, "<span class='filter_notice'>You remove the dead plant.</span>")
to_chat(user, span_filter_notice("You remove the dead plant."))
lastproduce = 0
check_health()
return
@@ -409,7 +409,7 @@
pestlevel = 0
sampled = 0
update_icon()
visible_message("<span class='notice'>\The [previous_plant ? previous_plant : initial(name)] has been overtaken by [seed.display_name].</span>")
visible_message(span_notice("\The [previous_plant ? previous_plant : initial(name)] has been overtaken by [seed.display_name]."))
return
@@ -443,11 +443,11 @@
return
if(ishuman(usr) || istype(usr, /mob/living/silicon/robot))
if(labelled)
to_chat(usr, "<span class='filter_notice'>You remove the label.</span>")
to_chat(usr, span_filter_notice("You remove the label."))
labelled = null
update_icon()
else
to_chat(usr, "<span class='filter_notice'>There is no label to remove.</span>")
to_chat(usr, span_filter_notice("There is no label to remove."))
return
/obj/machinery/portable_atmospherics/hydroponics/verb/setlight()
@@ -461,7 +461,7 @@
var/new_light = tgui_input_list(usr, "Specify a light level.", "Light Level", list(0,1,2,3,4,5,6,7,8,9,10))
if(new_light)
tray_light = new_light
to_chat(usr, "<span class='filter_notice'>You set the tray to a light level of [tray_light] lumens.</span>")
to_chat(usr, span_filter_notice("You set the tray to a light level of [tray_light] lumens."))
return
/obj/machinery/portable_atmospherics/hydroponics/proc/check_level_sanity()
@@ -498,7 +498,7 @@
weedlevel = 0
update_icon()
visible_message("<span class='danger'>The <span class='notice'>[previous_plant]</span> has suddenly mutated into <span class='notice'>[seed.display_name]!</span></span>")
visible_message(span_danger("The <span class='notice'>[previous_plant]</span> has suddenly mutated into <span class='notice'>[seed.display_name]!</span>"))
return
@@ -510,15 +510,15 @@
if(O.has_tool_quality(TOOL_WIRECUTTER) || istype(O, /obj/item/surgical/scalpel))
if(!seed)
to_chat(user, "<span class='filter_notice'>There is nothing to take a sample from in \the [src].</span>")
to_chat(user, span_filter_notice("There is nothing to take a sample from in \the [src]."))
return
if(sampled)
to_chat(user, "<span class='filter_notice'>You have already sampled from this plant.</span>")
to_chat(user, span_filter_notice("You have already sampled from this plant."))
return
if(dead)
to_chat(user, "<span class='filter_notice'>The plant is dead.</span>")
to_chat(user, span_filter_notice("The plant is dead."))
return
// Create a sample.
@@ -543,14 +543,14 @@
if(seed)
return ..()
else
to_chat(user, "<span class='filter_notice'>There's no plant to inject.</span>")
to_chat(user, span_filter_notice("There's no plant to inject."))
return 1
else
if(seed)
//Leaving this in in case we want to extract from plants later.
to_chat(user, "<span class='filter_notice'>You can't get any extract out of this plant.</span>")
to_chat(user, span_filter_notice("You can't get any extract out of this plant."))
else
to_chat(user, "<span class='filter_notice'>There's nothing to draw something from.</span>")
to_chat(user, span_filter_notice("There's nothing to draw something from."))
return 1
else if (istype(O, /obj/item/seeds))
@@ -561,24 +561,24 @@
user.remove_from_mob(O)
if(!S.seed)
to_chat(user, "<span class='filter_notice'>The packet seems to be empty. You throw it away.</span>")
to_chat(user, span_filter_notice("The packet seems to be empty. You throw it away."))
qdel(O)
return
to_chat(user, "<span class='filter_notice'>You plant the [S.seed.seed_name] [S.seed.seed_noun].</span>")
to_chat(user, span_filter_notice("You plant the [S.seed.seed_name] [S.seed.seed_noun]."))
plant_seeds(S)
else
to_chat(user, "<span class='danger'>\The [src] already has seeds in it!</span>")
to_chat(user, span_danger("\The [src] already has seeds in it!"))
else if (istype(O, /obj/item/material/minihoe)) // The minihoe
if(weedlevel > 0)
user.visible_message("<span class='danger'>[user] starts uprooting the weeds.</span>", "<span class='danger'>You remove the weeds from the [src].</span>")
user.visible_message(span_danger("[user] starts uprooting the weeds."), span_danger("You remove the weeds from the [src]."))
weedlevel = 0
update_icon()
else
to_chat(user, "<span class='danger'>This plot is completely devoid of weeds. It doesn't need uprooting.</span>")
to_chat(user, span_danger("This plot is completely devoid of weeds. It doesn't need uprooting."))
else if (istype(O, /obj/item/storage/bag/plants))
@@ -597,7 +597,7 @@
toxins += spray.toxicity
pestlevel -= spray.pest_kill_str
weedlevel -= spray.weed_kill_str
to_chat(user, "<span class='filter_notice'>You spray [src] with [O].</span>")
to_chat(user, span_filter_notice("You spray [src] with [O]."))
playsound(src, 'sound/effects/spray3.ogg', 50, 1, -6)
qdel(O)
check_health()
@@ -610,23 +610,23 @@
playsound(src, O.usesound, 50, 1)
anchored = !anchored
to_chat(user, "<span class='filter_notice'>You [anchored ? "wrench" : "unwrench"] \the [src].</span>")
to_chat(user, span_filter_notice("You [anchored ? "wrench" : "unwrench"] \the [src]."))
else if(istype(O,/obj/item/multitool))
if(!anchored)
to_chat(user, "<span class='warning'>Anchor it first!</span>")
to_chat(user, span_warning("Anchor it first!"))
return
if(frozen == -1)
to_chat(user, "<span class='warning'>You see no way to use \the [O] on [src].</span>")
to_chat(user, span_warning("You see no way to use \the [O] on [src]."))
return
to_chat(user, "<span class='notice'>You [frozen ? "disable" : "enable"] the cryogenic freezing.</span>")
to_chat(user, span_notice("You [frozen ? "disable" : "enable"] the cryogenic freezing."))
frozen = !frozen
update_icon()
return
else if(O.force && seed)
user.setClickCooldown(user.get_attack_speed(O))
user.visible_message("<span class='danger'>\The [seed.display_name] has been attacked by [user] with \the [O]!</span>")
user.visible_message(span_danger("\The [seed.display_name] has been attacked by [user] with \the [O]!"))
if(!dead)
health -= O.force
check_health()
@@ -644,7 +644,7 @@
if(istype(usr,/mob/living/silicon))
return
if(frozen == 1)
to_chat(user, "<span class='warning'>Disable the cryogenic freezing first!</span>")
to_chat(user, span_warning("Disable the cryogenic freezing first!"))
if(harvest)
harvest(user)
else if(dead)
@@ -654,7 +654,7 @@
. = ..()
if(seed)
. += "<span class='notice'>[seed.display_name] are growing here.</span>"
. += span_notice("[seed.display_name] are growing here.")
else
. += "It is empty."
@@ -674,7 +674,7 @@
else if(health <= (seed.get_trait(TRAIT_ENDURANCE)/ 2))
. += "It has <span class='danger'>an unhealthy plant</span>!"
if(frozen == 1)
. += "<span class='notice'>It is cryogenically frozen.</span>"
. += span_notice("It is cryogenically frozen.")
if(mechanical)
var/turf/T = loc
var/datum/gas_mixture/environment
@@ -712,7 +712,7 @@
/obj/machinery/portable_atmospherics/hydroponics/proc/close_lid(var/mob/living/user)
closed_system = !closed_system
to_chat(user, "<span class='filter_notice'>You [closed_system ? "close" : "open"] the tray's lid.</span>")
to_chat(user, span_filter_notice("You [closed_system ? "close" : "open"] the tray's lid."))
update_icon()
#undef AGE_MOD_MAX //CHOMPedit

2
code/modules/hydroponics/trays/tray_soil.dm
View File

@@ -19,7 +19,7 @@
if(do_after(user, 5 SECONDS, exclusive = TASK_USER_EXCLUSIVE))
qdel(src)
else
to_chat(user, "<span class='notice'>There is something growing here.</span>")
to_chat(user, span_notice("There is something growing here."))
else
return ..()

10
code/modules/hydroponics/trays/tray_tools.dm
View File

@@ -100,20 +100,20 @@
var/obj/machinery/portable_atmospherics/hydroponics/H = target
if(H.frozen == 1)
to_chat(user, "<span class='warning'>Disable the cryogenic freezing first!</span>")
to_chat(user, span_warning("Disable the cryogenic freezing first!"))
return
grown_seed = H.seed
grown_reagents = H.reagents
if(!grown_seed)
to_chat(user, "<span class='danger'>[src] can tell you nothing about \the [target].</span>")
to_chat(user, span_danger("[src] can tell you nothing about \the [target]."))
return
last_seed = grown_seed.diverge()
if(!istype(last_seed))
last_seed = grown_seed // TRAIT_IMMUTABLE makes diverge() return null
user.visible_message("<span class='notice'>[user] runs the scanner over \the [target].</span>")
user.visible_message(span_notice("[user] runs the scanner over \the [target]."))
last_reagents = list()
if(grown_reagents && grown_reagents.reagent_list && grown_reagents.reagent_list.len)
@@ -137,7 +137,7 @@
/obj/item/analyzer/plant_analyzer/proc/print_report(var/mob/living/user)
var/datum/seed/grown_seed = last_seed
if(!istype(grown_seed))
to_chat(user, "<span class='warning'>There is no scan data to print.</span>")
to_chat(user, span_warning("There is no scan data to print."))
return
var/form_title = "[grown_seed.seed_name] (#[grown_seed.uid])"
@@ -306,4 +306,4 @@
amount = "small amounts of "
data["trait_info"] += "It will consume [amount][gas_data.name[gas]] from the environment."
return data
return data

2
code/modules/hydroponics/trays/tray_update_icons.dm
View File

@@ -44,7 +44,7 @@
if(!seed.growth_stages)
seed.update_growth_stages()
if(!seed.growth_stages)
log_debug("<span class='danger'>Seed type [seed.get_trait(TRAIT_PLANT_ICON)] cannot find a growth stage value.</span>")
log_debug(span_danger("Seed type [seed.get_trait(TRAIT_PLANT_ICON)] cannot find a growth stage value.")) //CHOMPEdit
return
var/overlay_stage = 1
if(age >= seed.get_trait(TRAIT_MATURATION))