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

16
code/modules/xenobio2/machinery/core_extractor.dm
View File

@@ -35,7 +35,7 @@
return
if(panel_open)
to_chat(user, "<span class='warning'>Close the panel first!</span>")
to_chat(user, span_warning("Close the panel first!"))
var/obj/item/grab/G = W
@@ -43,7 +43,7 @@
return ..()
if(G.state < 2)
to_chat(user, "<span class='danger'>You need a better grip to do that!</span>")
to_chat(user, span_danger("You need a better grip to do that!"))
return
move_into_extractor(user,G.affecting)
@@ -56,26 +56,26 @@
/obj/machinery/slime/extractor/proc/move_into_extractor(var/mob/user,var/mob/living/victim)
if(src.occupant)
to_chat(user, "<span class='danger'>The core extractor is full, empty it first!</span>")
to_chat(user, span_danger("The core extractor is full, empty it first!"))
return
if(inuse)
to_chat(user, "<span class='danger'>The core extractor is locked and running, wait for it to finish.</span>")
to_chat(user, span_danger("The core extractor is locked and running, wait for it to finish."))
return
if(!(istype(victim, /mob/living/simple_mob/xeno/slime)))
to_chat(user, "<span class='danger'>This is not a suitable subject for the core extractor!</span>")
to_chat(user, span_danger("This is not a suitable subject for the core extractor!"))
return
var/mob/living/simple_mob/xeno/slime/S = victim
if(S.is_child)
to_chat(user, "<span class='danger'>This subject is not developed enough for the core extractor!</span>")
to_chat(user, span_danger("This subject is not developed enough for the core extractor!"))
return
user.visible_message("<span class='danger'>[user] starts to put [victim] into the core extractor!</span>")
user.visible_message(span_danger("[user] starts to put [victim] into the core extractor!"))
src.add_fingerprint(user)
if(do_after(user, 30) && victim.Adjacent(src) && user.Adjacent(src) && victim.Adjacent(user) && !occupant)
user.visible_message("<span class='danger'>[user] stuffs [victim] into the core extractor!</span>")
user.visible_message(span_danger("[user] stuffs [victim] into the core extractor!"))
if(victim.client)
victim.client.perspective = EYE_PERSPECTIVE
victim.client.eye = src

12
code/modules/xenobio2/machinery/gene_manipulators.dm
View File

@@ -277,7 +277,7 @@
occupant = X
to_chat(user, "You load [X] into [src]."
else
to_chat(user, "<span class='danger'>This specimen is incompatible with the machinery!</span>")
to_chat(user, span_danger("This specimen is incompatible with the machinery!"))
return
..()
@@ -360,21 +360,21 @@
/obj/machinery/xenobio/editor/proc/move_into_editor(var/mob/user,var/mob/living/victim)
if(src.occupant)
to_chat(user, "<span class='danger'>The [src] is full, empty it first!</span>")
to_chat(user, span_danger("The [src] is full, empty it first!"))
return
if(in_use)
to_chat(user, "<span class='danger'>The [src] is locked and running, wait for it to finish.</span>")
to_chat(user, span_danger("The [src] is locked and running, wait for it to finish."))
return
if(!(istype(victim, /mob/living/simple_mob/xeno/slime)) )
to_chat(user, "<span class='danger'>This is not a suitable subject for the [src]!</span>")
to_chat(user, span_danger("This is not a suitable subject for the [src]!"))
return
user.visible_message("<span class='danger'>[user] starts to put [victim] into the [src]!</span>")
user.visible_message(span_danger("[user] starts to put [victim] into the [src]!"))
src.add_fingerprint(user)
if(do_after(user, 30) && victim.Adjacent(src) && user.Adjacent(src) && victim.Adjacent(user) && !occupant)
user.visible_message("<span class='danger'>[user] stuffs [victim] into the [src]!</span>")
user.visible_message(span_danger("[user] stuffs [victim] into the [src]!"))
if(victim.client)
victim.client.perspective = EYE_PERSPECTIVE
victim.client.eye = src

18
code/modules/xenobio2/machinery/injector.dm
View File

@@ -43,17 +43,17 @@
/obj/machinery/xenobio2/manualinjector/proc/move_into_injector(var/mob/user,var/mob/living/victim)
if(src.occupant)
to_chat(user, "<span class='danger'>The injector is full, empty it first!</span>")
to_chat(user, span_danger("The injector is full, empty it first!"))
return
if(!(istype(victim, /mob/living/simple_mob/xeno)) && !emagged)
to_chat(user, "<span class='danger'>This is not a suitable subject for the injector!</span>")
to_chat(user, span_danger("This is not a suitable subject for the injector!"))
return
user.visible_message("<span class='danger'>[user] starts to put [victim] into the injector!</span>")
user.visible_message(span_danger("[user] starts to put [victim] into the injector!"))
src.add_fingerprint(user)
if(do_after(user, 30) && victim.Adjacent(src) && user.Adjacent(src) && victim.Adjacent(user) && !occupant)
user.visible_message("<span class='danger'>[user] stuffs [victim] into the injector!</span>")
user.visible_message(span_danger("[user] stuffs [victim] into the injector!"))
if(victim.client)
victim.client.perspective = EYE_PERSPECTIVE
victim.client.eye = src
@@ -111,14 +111,14 @@
var/obj/machinery/computer/xenobio2/C = P.connectable
computer = C
C.injector = src
to_chat(user, "<span class='warning'> You link the [src] to the [P.connectable]!</span>")
to_chat(user, span_warning(" You link the [src] to the [P.connectable]!"))
else
to_chat(user, "<span class='warning'> You store the [src] in the [P]'s buffer!</span>")
to_chat(user, span_warning(" You store the [src] in the [P]'s buffer!"))
P.connectable = src
return
if(panel_open)
to_chat(user, "<span class='warning'>Close the panel first!</span>")
to_chat(user, span_warning("Close the panel first!"))
var/obj/item/grab/G = W
@@ -126,7 +126,7 @@
return ..()
if(G.state < 2)
to_chat(user, "<span class='danger'>You need a better grip to do that!</span>")
to_chat(user, span_danger("You need a better grip to do that!"))
return
move_into_injector(user,G.affecting)
@@ -137,4 +137,4 @@
build_path = /obj/machinery/xenobio2/manualinjector
board_type = /datum/frame/frame_types/machine
origin_tech = list() //To be filled,
req_components = list() //To be filled,
req_components = list() //To be filled,

4
code/modules/xenobio2/machinery/injector_computer.dm
View File

@@ -38,9 +38,9 @@
var/obj/machinery/xenobio2/manualinjector/I = P.connectable
injector = I
I.computer = src
to_chat(user, "<span class='warning'> You link the [src] to the [P.connectable]!</span>")
to_chat(user, span_warning(" You link the [src] to the [P.connectable]!"))
else
to_chat(user, "<span class='warning'> You store the [src] in the [P]'s buffer!</span>")
to_chat(user, span_warning(" You store the [src] in the [P]'s buffer!"))
P.connectable = src
return

4
code/modules/xenobio2/machinery/slime_replicator.dm
View File

@@ -38,10 +38,10 @@
return ..()
if(core)
to_chat(user, "<span class='warning'>[src] is already filled!</span>")
to_chat(user, span_warning("[src] is already filled!"))
return
if(panel_open)
to_chat(user, "<span class='warning'>Close the panel first!</span>")
to_chat(user, span_warning("Close the panel first!"))
core = G
user.drop_from_inventory(G)
G.forceMove(src)

6
code/modules/xenobio2/mob/slime/slime_monkey.dm
View File

@@ -10,7 +10,7 @@ Slime cube lives here.
/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."))
request_player()
/obj/item/slime_cube/proc/request_player()
@@ -31,7 +31,7 @@ Slime cube lives here.
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.")
@@ -43,7 +43,7 @@ Slime cube lives here.
S.set_species("Promethean")
S.shapeshifter_set_colour("#05FF9B")
for(var/mob/M in viewers(get_turf_or_move(loc)))
M.show_message("<span class='warning'>The monkey cube suddenly takes the shape of a humanoid!</span>")
M.show_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"), MAX_NAME_LEN)
if(newname)
S.real_name = newname

2
code/modules/xenobio2/mob/xeno procs.dm
View File

@@ -134,7 +134,7 @@ Divergence proc, used in mutation to make unique datums.
/mob/living/simple_mob/xeno/bullet_act(var/obj/item/projectile/P)
//Shamelessly stolen from ablative armor.
if((traitdat.traits[TRAIT_XENO_CHROMATIC]) && istype(P, /obj/item/projectile/beam))
visible_message("<span class='danger'>)\The beam reflects off of the [src]!</span>")
visible_message(span_danger(")\The beam reflects off of the [src]!"))
// Find a turf near or on the original location to bounce to
var/new_x = P.starting.x + pick(0, -1, 1, -2, 2)
var/new_y = P.starting.y + pick(0, -1, 1, -2, 2)

6
code/modules/xenobio2/tools/xeno_trait_scanner.dm
View File

@@ -65,12 +65,12 @@
prod_reagents = P.reagents
if(!trait_info)
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
form_title = "[targetName]"
var/dat = "<h3>Biological data for [form_title]</h3>"
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]."))
dat += "<h2>General Data</h2>"
@@ -182,4 +182,4 @@
dat += "<br><br>\[<a href='?src=\ref[src];print=1'>print report</a>\]"
user << browse(dat,"window=xeno_analyzer")
return
return