cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-27 22:17:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Convert most spans to defines (#31080)

Browse Source 
* spanish?

* aaaagain

* keep maptext

* Update robot_items.dm

* Update span_defines.dm

* compiles

* Update silicon_mob.dm

* compile
This commit is contained in:
kyunkyunkyun
2025-12-13 23:55:48 +00:00
committed by GitHub
parent e5f0a6fffb
commit b0463d3c83
1624 changed files with 15737 additions and 15581 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/assembly/assembly.dm
+3 -3
View File
@@ -125,7 +125,7 @@
/obj/item/assembly/proc/attach_assembly(obj/item/assembly/A, mob/user)
holder = new /obj/item/assembly_holder(get_turf(src))
if(holder.attach(A, src, user))
to_chat(user, "<span class='notice'>You attach [A] to [src]!</span>")
to_chat(user, SPAN_NOTICE("You attach [A] to [src]!"))
user.put_in_active_hand(holder)
return TRUE
return FALSE
@@ -144,9 +144,9 @@
if(!I.use_tool(src, user, 0, volume = I.tool_volume))
return
if(toggle_secure())
to_chat(user, "<span class='notice'>[src] is ready!</span>")
to_chat(user, SPAN_NOTICE("[src] is ready!"))
else
to_chat(user, "<span class='notice'>[src] can now be attached!</span>")
to_chat(user, SPAN_NOTICE("[src] can now be attached!"))
/obj/item/assembly/process()
STOP_PROCESSING(SSobj, src)
code/modules/assembly/assembly_holder.dm
+4 -4
View File
@@ -139,7 +139,7 @@
/obj/item/assembly_holder/screwdriver_act(mob/user, obj/item/I)
if(!a_left || !a_right)
to_chat(user, "<span class='warning'>BUG:Assembly part missing, please report this!</span>")
to_chat(user, SPAN_WARNING("BUG:Assembly part missing, please report this!"))
return
. = TRUE
if(!I.use_tool(src, user, 0, volume = I.tool_volume))
@@ -148,16 +148,16 @@
a_right.toggle_secure()
secured = !secured
if(secured)
to_chat(user, "<span class='notice'>[src] is ready!</span>")
to_chat(user, SPAN_NOTICE("[src] is ready!"))
else
to_chat(user, "<span class='notice'>[src] can now be taken apart!</span>")
to_chat(user, SPAN_NOTICE("[src] can now be taken apart!"))
update_icon()
/obj/item/assembly_holder/attack_self__legacy__attackchain(mob/user)
add_fingerprint(user)
if(secured)
if(!a_left || !a_right)
to_chat(user, "<span class='warning'>Assembly part missing!</span>")
to_chat(user, SPAN_WARNING("Assembly part missing!"))
return
if(istype(a_left, a_right.type)) // If they are the same type it causes issues due to window code
switch(tgui_alert(user, "Which side would you like to use?", "Choose", list("Left", "Right")))
code/modules/assembly/bomb.dm
+3 -3
View File
@@ -44,7 +44,7 @@
. = TRUE
if(!I.use_tool(src, user, 0, volume = I.tool_volume))
return
to_chat(user, "<span class='notice'>You disassemble [src].</span>")
to_chat(user, SPAN_NOTICE("You disassemble [src]."))
bombassembly.forceMove(user.loc)
bombassembly.master = null
bombassembly = null
@@ -61,13 +61,13 @@
status = TRUE
investigate_log("[key_name(user)] welded a single tank bomb. Temperature: [bombtank.air_contents.temperature() - T0C]", INVESTIGATE_BOMB)
log_game("[key_name(user)] welded a single tank bomb. Temperature: [bombtank.air_contents.temperature() - T0C]")
to_chat(user, "<span class='notice'>A pressure hole has been bored to [bombtank] valve. [bombtank] can now be ignited.</span>")
to_chat(user, SPAN_NOTICE("A pressure hole has been bored to [bombtank] valve. [bombtank] can now be ignited."))
add_attack_logs(user, src, "welded a single tank bomb. Temperature: [bombtank.air_contents.temperature() - T0C]", ATKLOG_FEW)
else
status = FALSE
investigate_log("[key_name(user)] unwelded a single tank bomb. Temperature: [bombtank.air_contents.temperature() - T0C]", INVESTIGATE_BOMB)
add_attack_logs(user, src, "unwelded a single tank bomb. Temperature: [bombtank.air_contents.temperature() - T0C]", ATKLOG_ALMOSTALL)
to_chat(user, "<span class='notice'>The hole has been closed.</span>")
to_chat(user, SPAN_NOTICE("The hole has been closed."))
/obj/item/onetankbomb/attack_self__legacy__attackchain(mob/user) //pressing the bomb accesses its assembly
code/modules/assembly/igniter.dm
+8 -8
View File
@@ -29,8 +29,8 @@
if(location)
location.hotspot_expose(1000, 1)
visible_message(
"<span class='notice'>Sparks shoot out of [src].</span>",
"<span class='warning'>You hear a shower of sparks shooting out from something!</span>"
SPAN_NOTICE("Sparks shoot out of [src]."),
SPAN_WARNING("You hear a shower of sparks shooting out from something!")
)
sparks.start()
@@ -68,15 +68,15 @@
if(target == user)
user.visible_message(
"<span class='notice'>[user] presses [src] against [cig] and activates it, lighting [cig] in a shower of sparks!</span>",
"<span class='notice'>You press [src] against [cig] and activates it, lighting [cig] in a shower of sparks!</span>",
"<span class='warning'>You hear a shower of sparks shooting out from something!</span>"
SPAN_NOTICE("[user] presses [src] against [cig] and activates it, lighting [cig] in a shower of sparks!"),
SPAN_NOTICE("You press [src] against [cig] and activates it, lighting [cig] in a shower of sparks!"),
SPAN_WARNING("You hear a shower of sparks shooting out from something!")
)
else
user.visible_message(
"<span class='notice'>[user] presses [src] against [cig] and activates it, lighting [cig] for [target] in a shower of sparks!</span>",
"<span class='notice'>You press [src] against [cig] and activate it, lighting [cig] in a shower of sparks!</span>",
"<span class='warning'>You hear a shower of sparks shooting out from something!</span>"
SPAN_NOTICE("[user] presses [src] against [cig] and activates it, lighting [cig] for [target] in a shower of sparks!"),
SPAN_NOTICE("You press [src] against [cig] and activate it, lighting [cig] in a shower of sparks!"),
SPAN_WARNING("You hear a shower of sparks shooting out from something!")
)
sparks.start() // Make sparks fly!
cig.light(user, target)
code/modules/assembly/infrared.dm
+1 -1
View File
@@ -28,7 +28,7 @@
/obj/item/assembly/infra/examine(mob/user)
. = ..()
. += "The assembly is [secured ? "secure" : "not secure"]. The infrared trigger is [on ? "on" : "off"]."
. += "<span class='notice'><b>Alt-Click</b> to rotate it.</span>"
. += SPAN_NOTICE("<b>Alt-Click</b> to rotate it.")
/obj/item/assembly/infra/activate()
if(!..())
code/modules/assembly/mousetrap.dm
+10 -10
View File
@@ -13,7 +13,7 @@
. = ..()
if(armed)
. += "It looks like it's armed."
. += "<span class='notice'><b>Alt-Click</b> to hide it.</span>"
. += SPAN_NOTICE("<b>Alt-Click</b> to hide it.")
/obj/item/assembly/mousetrap/activate()
if(!..())
@@ -67,7 +67,7 @@
else if(ismouse(target))
var/mob/living/basic/mouse/M = target
visible_message("<span class='danger'>SPLAT!</span>")
visible_message(SPAN_DANGER("SPLAT!"))
M.death()
M.splat()
@@ -79,7 +79,7 @@
/obj/item/assembly/mousetrap/attack_self__legacy__attackchain(mob/living/user)
if(!armed)
to_chat(user, "<span class='notice'>You arm [src].</span>")
to_chat(user, SPAN_NOTICE("You arm [src]."))
else
if((user.getBrainLoss() >= 60 || HAS_TRAIT(user, TRAIT_CLUMSY)) && prob(50))
var/which_hand = "l_hand"
@@ -87,10 +87,10 @@
which_hand = "r_hand"
triggered(user, which_hand)
user.visible_message("<span class='warning'>[user] accidentally sets off [src], breaking [user.p_their()] fingers.</span>", "<span class='warning'>You accidentally trigger [src]!</span>")
user.visible_message(SPAN_WARNING("[user] accidentally sets off [src], breaking [user.p_their()] fingers."), SPAN_WARNING("You accidentally trigger [src]!"))
return
to_chat(user, "<span class='notice'>You disarm [src].</span>")
to_chat(user, SPAN_NOTICE("You disarm [src]."))
armed = !armed
update_icon()
@@ -104,7 +104,7 @@
which_hand = "r_hand"
triggered(user, which_hand)
user.visible_message("<span class='warning'>[user] accidentally sets off [src], breaking [user.p_their()] fingers.</span>", "<span class='warning'>You accidentally trigger [src]!</span>")
user.visible_message(SPAN_WARNING("[user] accidentally sets off [src], breaking [user.p_their()] fingers."), SPAN_WARNING("You accidentally trigger [src]!"))
return
..()
@@ -114,7 +114,7 @@
var/mob/living/carbon/H = entered
if(H.m_intent == MOVE_INTENT_RUN)
triggered(H)
H.visible_message("<span class='warning'>[H] accidentally steps on [src].</span>", "<span class='warning'>You accidentally step on [src]</span>")
H.visible_message(SPAN_WARNING("[H] accidentally steps on [src]."), SPAN_WARNING("You accidentally step on [src]"))
else if(ismouse(entered))
triggered(entered)
@@ -126,7 +126,7 @@
/obj/item/assembly/mousetrap/on_found(mob/finder)
if(armed)
finder.visible_message("<span class='warning'>[finder] accidentally sets off [src], breaking [finder.p_their()] fingers.</span>", "<span class='warning'>You accidentally trigger [src]!</span>")
finder.visible_message(SPAN_WARNING("[finder] accidentally sets off [src], breaking [finder.p_their()] fingers."), SPAN_WARNING("You accidentally trigger [src]!"))
triggered(finder, finder.hand ? "l_hand" : "r_hand")
return TRUE //end the search!
@@ -136,7 +136,7 @@
if(!armed)
return ..()
visible_message("<span class='warning'>[src] is triggered by [AM].</span>")
visible_message(SPAN_WARNING("[src] is triggered by [AM]."))
triggered(null)
/obj/item/assembly/mousetrap/armed
@@ -149,4 +149,4 @@
return
layer = TURF_LAYER + 0.2
to_chat(user, "<span class='notice'>You hide [src].</span>")
to_chat(user, SPAN_NOTICE("You hide [src]."))
code/modules/assembly/proximity.dm
+2 -2
View File
@@ -27,7 +27,7 @@
/obj/item/assembly/prox_sensor/examine(mob/user)
. = ..()
if(timing)
. += "<span class='notice'>The proximity sensor is arming.</span>"
. += SPAN_NOTICE("The proximity sensor is arming.")
else
. += "The proximity sensor is [scanning ? "armed" : "disarmed"]."
@@ -137,7 +137,7 @@
/obj/item/assembly/prox_sensor/interact(mob/user)//TODO: Change this to the wires thingy
if(!secured)
user.show_message("<span class='warning'>[src] is unsecured!</span>")
user.show_message(SPAN_WARNING("[src] is unsecured!"))
return FALSE
var/timing_ui = ""
var/time_display = ""
code/modules/assembly/shock_kit.dm
+2 -2
View File
@@ -24,13 +24,13 @@
part2?.master = null
part1 = null
part2 = null
visible_message("<span class='notice'>[user] disassembles [src].</span>")
visible_message(SPAN_NOTICE("[user] disassembles [src]."))
qdel(src)
return TRUE
/obj/item/assembly/shock_kit/screwdriver_act(mob/user, obj/item/I)
status = !status
to_chat(user, "<span class='notice'>[src] is now [status ? "secured" : "unsecured"]!</span>")
to_chat(user, SPAN_NOTICE("[src] is now [status ? "secured" : "unsecured"]!"))
add_fingerprint(user)
return TRUE
code/modules/assembly/signaler.dm
+2 -2
View File
@@ -26,10 +26,10 @@ GLOBAL_LIST_EMPTY(remote_signalers)
/obj/item/assembly/signaler/examine(mob/user)
. = ..()
. += "The power light is [receiving ? "on" : "off"]"
. += "<span class='notice'>Alt+Click to send a signal.</span>"
. += SPAN_NOTICE("Alt+Click to send a signal.")
/obj/item/assembly/signaler/AltClick(mob/user)
to_chat(user, "<span class='notice'>You activate [src].</span>")
to_chat(user, SPAN_NOTICE("You activate [src]."))
activate()
/obj/item/assembly/signaler/attackby__legacy__attackchain(obj/item/W, mob/user, params)
code/modules/assembly/timer.dm
+1 -1
View File
@@ -66,7 +66,7 @@
/obj/item/assembly/timer/interact(mob/user as mob)//TODO: Have this use the wires
if(!secured)
user.show_message("<span class='warning'>[src] is unsecured!</span>")
user.show_message(SPAN_WARNING("[src] is unsecured!"))
return FALSE
var/second = time % 60
var/minute = (time - second) / 60
code/modules/assembly/voice.dm
+2 -2
View File
@@ -38,7 +38,7 @@
else if(findtext(msg, recorded) && type == recorded_type)
var/turf/T = get_turf(src) //otherwise it won't work in hand
T.visible_message("<span class='warning'>[bicon(src)] beeps!</span>")
T.visible_message(SPAN_WARNING("[bicon(src)] beeps!"))
pulse(0)
/obj/item/assembly/voice/activate()
@@ -78,4 +78,4 @@
/obj/item/assembly/voice/noise/hear_message(mob/living/M as mob, msg)
pulse(0)
var/turf/T = get_turf(src) //otherwise it won't work in hand
T.visible_message("<span class='warning'>[bicon(src)] beeps!</span>")
T.visible_message(SPAN_WARNING("[bicon(src)] beeps!"))