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

[MIRROR] First part of a span rework (#9120)

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-02 07:25:48 -07:00
committed by GitHub
parent 07c3627fbf
commit 31407a0be3
241 changed files with 1108 additions and 1081 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,34 +38,34 @@
/obj/machinery/beehive/attackby(var/obj/item/I, var/mob/user)
if(I.has_tool_quality(TOOL_CROWBAR))
closed = !closed
user.visible_message(SPAN_NOTICE("[user] [closed ? "closes" : "opens"] \the [src]."), SPAN_NOTICE("You [closed ? "close" : "open"] \the [src]."))
user.visible_message(span_notice("[user] [closed ? "closes" : "opens"] \the [src]."), span_notice("You [closed ? "close" : "open"] \the [src]."))
update_icon()
return
else if(I.has_tool_quality(TOOL_WRENCH))
anchored = !anchored
playsound(src, I.usesound, 50, 1)
user.visible_message(SPAN_NOTICE("[user] [anchored ? "wrenches" : "unwrenches"] \the [src]."), SPAN_NOTICE("You [anchored ? "wrench" : "unwrench"] \the [src]."))
user.visible_message(span_notice("[user] [anchored ? "wrenches" : "unwrenches"] \the [src]."), span_notice("You [anchored ? "wrench" : "unwrench"] \the [src]."))
return
else if(istype(I, /obj/item/bee_smoker))
if(closed)
to_chat(user, SPAN_NOTICE("You need to open \the [src] with a crowbar before smoking the bees."))
to_chat(user, span_notice("You need to open \the [src] with a crowbar before smoking the bees."))
return
user.visible_message(SPAN_NOTICE("[user] smokes the bees in \the [src]."), SPAN_NOTICE("You smoke the bees in \the [src]."))
user.visible_message(span_notice("[user] smokes the bees in \the [src]."), span_notice("You smoke the bees in \the [src]."))
smoked = 30
update_icon()
return
else if(istype(I, /obj/item/honey_frame))
if(closed)
to_chat(user, SPAN_NOTICE("You need to open \the [src] with a crowbar before inserting \the [I]."))
to_chat(user, span_notice("You need to open \the [src] with a crowbar before inserting \the [I]."))
return
if(length(frames) >= maxFrames)
to_chat(user, SPAN_NOTICE("There is no place for an another frame."))
to_chat(user, span_notice("There is no place for an another frame."))
return
var/obj/item/honey_frame/H = I
if(H.honey)
to_chat(user, SPAN_NOTICE("\The [I] is full with beeswax and honey, empty it in the extractor first."))
to_chat(user, span_notice("\The [I] is full with beeswax and honey, empty it in the extractor first."))
return
user.visible_message(SPAN_NOTICE("[user] loads \the [I] into \the [src]."), SPAN_NOTICE("You load \the [I] into \the [src]."))
user.visible_message(span_notice("[user] loads \the [I] into \the [src]."), span_notice("You load \the [I] into \the [src]."))
update_icon()
user.drop_from_inventory(H)
H.forceMove(src)
@@ -74,23 +74,23 @@
else if(istype(I, /obj/item/bee_pack))
var/obj/item/bee_pack/B = I
if(B.full && bee_count)
to_chat(user, SPAN_NOTICE("\The [src] already has bees inside."))
to_chat(user, span_notice("\The [src] already has bees inside."))
return
if(!B.full && bee_count < 90)
to_chat(user, SPAN_NOTICE("\The [src] is not ready to split."))
to_chat(user, span_notice("\The [src] is not ready to split."))
return
if(!B.full && !smoked)
to_chat(user, SPAN_NOTICE("Smoke \the [src] first!"))
to_chat(user, span_notice("Smoke \the [src] first!"))
return
if(closed)
to_chat(user, SPAN_NOTICE("You need to open \the [src] with a crowbar before moving the bees."))
to_chat(user, span_notice("You need to open \the [src] with a crowbar before moving the bees."))
return
if(B.full)
user.visible_message(SPAN_NOTICE("[user] puts the queen and the bees from \the [I] into \the [src]."), SPAN_NOTICE("You put the queen and the bees from \the [I] into \the [src]."))
user.visible_message(span_notice("[user] puts the queen and the bees from \the [I] into \the [src]."), span_notice("You put the queen and the bees from \the [I] into \the [src]."))
bee_count = 20
B.empty()
else
user.visible_message(SPAN_NOTICE("[user] puts bees and larvae from \the [src] into \the [I]."), SPAN_NOTICE("You put bees and larvae from \the [src] into \the [I]."))
user.visible_message(span_notice("[user] puts bees and larvae from \the [src] into \the [I]."), span_notice("You put bees and larvae from \the [src] into \the [I]."))
bee_count /= 2
B.fill()
update_icon()
@@ -109,15 +109,15 @@
return 1
else if(I.has_tool_quality(TOOL_SCREWDRIVER))
if(bee_count)
to_chat(user, SPAN_NOTICE("You can't dismantle \the [src] with these bees inside."))
to_chat(user, span_notice("You can't dismantle \the [src] with these bees inside."))
return
if(length(frames))
to_chat(user, SPAN_NOTICE("You can't dismantle \the [src] with [length(frames)] frames still inside!"))
to_chat(user, span_notice("You can't dismantle \the [src] with [length(frames)] frames still inside!"))
return
to_chat(user, SPAN_NOTICE("You start dismantling \the [src]..."))
to_chat(user, span_notice("You start dismantling \the [src]..."))
playsound(src, I.usesound, 50, 1)
if(do_after(user, 30))
user.visible_message(SPAN_NOTICE("[user] dismantles \the [src]."), SPAN_NOTICE("You dismantle \the [src]."))
user.visible_message(span_notice("[user] dismantles \the [src]."), span_notice("You dismantle \the [src]."))
new /obj/item/beehive_assembly(loc)
qdel(src)
return
@@ -125,12 +125,12 @@
/obj/machinery/beehive/attack_hand(var/mob/user)
if(!closed)
if(honeycombs < 100)
to_chat(user, SPAN_NOTICE("There are no filled honeycombs."))
to_chat(user, span_notice("There are no filled honeycombs."))
return
if(!smoked && bee_count)
to_chat(user, SPAN_NOTICE("The bees won't let you take the honeycombs out like this, smoke them first."))
to_chat(user, span_notice("The bees won't let you take the honeycombs out like this, smoke them first."))
return
user.visible_message(SPAN_NOTICE("[user] starts taking the honeycombs out of \the [src]."), SPAN_NOTICE("You start taking the honeycombs out of \the [src]..."))
user.visible_message(span_notice("[user] starts taking the honeycombs out of \the [src]."), span_notice("You start taking the honeycombs out of \the [src]..."))
while(honeycombs >= 100 && length(frames) && do_after(user, 30))
var/obj/item/honey_frame/H = pop(frames)
H.honey = 20
@@ -139,7 +139,7 @@
H.forceMove(get_turf(src))
update_icon()
if(honeycombs < 100)
to_chat(user, SPAN_NOTICE("You take all filled honeycombs out."))
to_chat(user, span_notice("You take all filled honeycombs out."))
return
/obj/machinery/beehive/process()
@@ -173,14 +173,14 @@
/obj/machinery/honey_extractor/attackby(var/obj/item/I, var/mob/user)
if(processing)
to_chat(user, SPAN_NOTICE("\The [src] is currently spinning, wait until it's finished."))
to_chat(user, span_notice("\The [src] is currently spinning, wait until it's finished."))
return
else if(istype(I, /obj/item/honey_frame))
var/obj/item/honey_frame/H = I
if(!H.honey)
to_chat(user, SPAN_NOTICE("\The [H] is empty, put it into a beehive."))
to_chat(user, span_notice("\The [H] is empty, put it into a beehive."))
return
user.visible_message(SPAN_NOTICE("[user] loads \the [H]'s comb into \the [src] and turns it on."), SPAN_NOTICE("You load \the [H] into \the [src] and turn it on."))
user.visible_message(span_notice("[user] loads \the [H]'s comb into \the [src] and turns it on."), span_notice("You load \the [H] into \the [src] and turn it on."))
processing = H.honey
icon_state = "[initial(icon_state)]_moving"
H.honey = 0
@@ -192,13 +192,13 @@
icon_state = "[initial(icon_state)]"
else if(istype(I, /obj/item/reagent_containers/glass))
if(!honey)
to_chat(user, SPAN_NOTICE("There is no honey in \the [src]."))
to_chat(user, span_notice("There is no honey in \the [src]."))
return
var/obj/item/reagent_containers/glass/G = I
var/transferred = min(G.reagents.maximum_volume - G.reagents.total_volume, honey)
G.reagents.add_reagent("honey", transferred)
honey -= transferred
user.visible_message(SPAN_NOTICE("[user] collects honey from \the [src] into \the [G]."), SPAN_NOTICE("You collect [transferred] units of honey from \the [src] into \the [G]."))
user.visible_message(span_notice("[user] collects honey from \the [src] into \the [G]."), span_notice("You collect [transferred] units of honey from \the [src] into \the [G]."))
return 1
/obj/item/bee_smoker
@@ -240,9 +240,9 @@
icon_state = "apiary"
/obj/item/beehive_assembly/attack_self(var/mob/user)
to_chat(user, SPAN_NOTICE("You start assembling \the [src]..."))
to_chat(user, span_notice("You start assembling \the [src]..."))
if(do_after(user, 30))
user.visible_message(SPAN_NOTICE("[user] constructs a beehive."), SPAN_NOTICE("You construct a beehive."))
user.visible_message(span_notice("[user] constructs a beehive."), span_notice("You construct a beehive."))
new /obj/machinery/beehive(get_turf(user))
user.drop_from_inventory(src)
qdel(src)

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

@@ -216,7 +216,7 @@
if(seed.kitchen_tag == "sunflower")
new /obj/item/reagent_containers/food/snacks/rawsunflower(get_turf(src))
to_chat(user, SPAN_NOTICE("You remove the seeds from the flower, slightly damaging them."))
to_chat(user, span_notice("You remove the seeds from the flower, slightly damaging them."))
qdel(src)
return

4
code/modules/hydroponics/grown_sif.dm
View File

@@ -8,13 +8,13 @@
/obj/item/reagent_containers/food/snacks/grown/sif/examine(mob/user)
. = ..()
if(seeds)
to_chat(user, SPAN_NOTICE("You can see [seeds] seed\s in \the [src]. You might be able to extract them with a sharp object."))
to_chat(user, span_notice("You can see [seeds] seed\s in \the [src]. You might be able to extract them with a sharp object."))
/obj/item/reagent_containers/food/snacks/grown/sif/attackby(var/obj/item/W, var/mob/living/user)
if(seed && W.sharp && seeds > 0)
var/take_seeds = min(seeds, rand(1,2))
seeds -= take_seeds
to_chat(user, SPAN_NOTICE("You stick \the [W] into \the [src] and lever out [take_seeds] seed\s."))
to_chat(user, span_notice("You stick \the [W] into \the [src] and lever out [take_seeds] seed\s."))
for(var/i = 1 to take_seeds)
new /obj/item/seeds(get_turf(src), seed.name)
return

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

@@ -174,7 +174,7 @@
var/obj/item/organ/external/E = target.get_organ(target.hand ? BP_L_HAND : BP_R_HAND)
if(istype(E) && E.robotic < ORGAN_ROBOT && fruit)
var/injecting = min(5,max(1,get_trait(TRAIT_POTENCY)/5))
to_chat(target, SPAN_DANGER("You are stung by \the [fruit]!"))
to_chat(target, span_danger("You are stung by \the [fruit]!"))
for(var/chem in chems)
target.reagents.add_reagent(chem,injecting)
if (fruit.reagents)

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

@@ -94,22 +94,22 @@
if(prob(50))
S.set_trait(TRAIT_BIOLUM, !S.get_trait(TRAIT_BIOLUM))
if(S.get_trait(TRAIT_BIOLUM))
T.visible_message(SPAN_NOTICE("\The [S.display_name] begins to glow!"))
T.visible_message(span_notice("\The [S.display_name] begins to glow!"))
if(prob(50))
S.set_trait(TRAIT_BIOLUM_COLOUR,get_random_colour(0,75,190))
T.visible_message("<span class='notice'>\The [S.display_name]'s glow </span><font color='[S.get_trait(TRAIT_BIOLUM_COLOUR)]'>changes colour</font>!")
else
T.visible_message(SPAN_NOTICE("\The [S.display_name]'s glow dims..."))
T.visible_message(span_notice("\The [S.display_name]'s glow dims..."))
if(prob(60))
S.set_trait(TRAIT_PRODUCES_POWER, !S.get_trait(TRAIT_PRODUCES_POWER))
if(prob(30))
S.set_trait(TRAIT_SPORING, !S.get_trait(TRAIT_SPORING))
if(S.get_trait(TRAIT_SPORING))
T.visible_message(SPAN_NOTICE("\The [S.display_name] releases a cloud of spores!"))
T.visible_message(span_notice("\The [S.display_name] releases a cloud of spores!"))
S.create_spores(T)
else
T.visible_message(SPAN_NOTICE("\The [S.display_name]'s spores no longer fall."))
T.visible_message(span_notice("\The [S.display_name]'s spores no longer fall."))
/decl/plantgene/atmosphere/mutate(var/datum/seed/S)
if(prob(60))

4
code/modules/hydroponics/spreading/spreading_growth.dm
View File

@@ -99,7 +99,7 @@
entangle(M)
if(seed.get_trait(TRAIT_SPORING) && prob(1))
visible_message(SPAN_WARNING("\The [src] hisses, releasing a cloud of spores!"), SPAN_WARNING("Something nearby hisses loudly!"))
visible_message(span_warning("\The [src] hisses, releasing a cloud of spores!"), span_warning("Something nearby hisses loudly!"))
seed.create_spores(get_turf(src))
if(length(neighbors) && prob(spread_chance))
@@ -123,7 +123,7 @@
/obj/effect/plant/proc/spread_to(turf/target_turf)
//VOREStation Edit Start - Vines can go up/down stairs, but don't register that they have done this, so do so infinitely, which is annoying and laggy.
if(istype(target_turf, /turf/simulated/open))
return
return
//VOREStation Edit End
var/obj/effect/plant/child = new(get_turf(src),seed,parent)

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

@@ -34,13 +34,13 @@
/obj/machinery/portable_atmospherics/hydroponics/soil/attackby(obj/item/O, mob/user)
if(istype(O, /obj/item/shovel) && user.a_intent == I_HURT)
user.visible_message(SPAN_NOTICE("\The [user] begins filling in \the [src]."))
user.visible_message(span_notice("\The [user] begins filling in \the [src]."))
if(do_after(user, 3 SECONDS) && !QDELETED(src))
user.visible_message(SPAN_NOTICE("\The [user] fills in \the [src]."))
user.visible_message(span_notice("\The [user] fills in \the [src]."))
qdel(src)
return
. = ..()
// Holder for vine plants.
// Icons for plants are generated as overlays, so setting it to invisible wouldn't work.