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

refactors most spans

Browse Source
This commit is contained in:
Kashargul
2024-10-02 21:10:31 +02:00
parent 5417c7772c
commit a2c673ab7a
1517 changed files with 12436 additions and 12347 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/telesci/bscyrstal.dm
+2 -2
View File
@@ -15,7 +15,7 @@
pixel_y = rand(-5, 5)
/obj/item/bluespace_crystal/attack_self(mob/user)
user.visible_message("<span class='warning'>[user] crushes [src]!</span>", "<span class='danger'>You crush [src]!</span>")
user.visible_message(span_warning("[user] crushes [src]!"), span_danger("You crush [src]!"))
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread()
s.set_up(5, 1, get_turf(src))
s.start()
@@ -28,7 +28,7 @@
/obj/item/bluespace_crystal/throw_impact(atom/hit_atom)
if(!..()) // not caught in mid-air
visible_message("<span class='notice'>[src] fizzles and disappears upon impact!</span>")
visible_message(span_notice("[src] fizzles and disappears upon impact!"))
var/turf/T = get_turf(hit_atom)
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread()
s.set_up(5, 1, T)
code/modules/telesci/quantum_pad.dm
+22 -22
View File
@@ -35,15 +35,15 @@
/obj/machinery/power/quantumpad/examine(mob/user)
. = ..()
. += "<span class='notice'>It is [linked_pad ? "currently" : "not"] linked to another pad.</span>"
. += span_notice("It is [linked_pad ? "currently" : "not"] linked to another pad.")
if(world.time < last_teleport + teleport_cooldown)
. += "<span class='warning'>[src] is recharging power. A timer on the side reads <b>[round((last_teleport + teleport_cooldown - world.time)/10)]</b> seconds.</span>"
. += span_warning("[src] is recharging power. A timer on the side reads <b>[round((last_teleport + teleport_cooldown - world.time)/10)]</b> seconds.")
if(boosted)
. += span_notice("There appears to be a booster haphazardly jammed into the side of [src]. That looks unsafe.")
if(!panel_open)
. += "<span class='notice'>The panel is <i>screwed</i> in, obstructing the linking device.</span>"
. += span_notice("The panel is <i>screwed</i> in, obstructing the linking device.")
else
. += "<span class='notice'>The <i>linking</i> device is now able to be <i>scanned</i> with a multitool.</span>"
. += span_notice("The <i>linking</i> device is now able to be <i>scanned</i> with a multitool.")
/obj/machinery/power/quantumpad/RefreshParts()
var/E = 0
@@ -67,19 +67,19 @@
if(istype(I, /obj/item/multitool))
//VOREStation Addition Start
if(istype(get_area(src), /area/shuttle))
to_chat(user, "<span class='warning'>This is too unstable a platform for \the [src] to operate on!</span>")
to_chat(user, span_warning("This is too unstable a platform for \the [src] to operate on!"))
return
//VOREStation Addition End
if(panel_open)
var/obj/item/multitool/M = I
M.connectable = src
to_chat(user, "<span class='notice'>You save the data in [I]'s buffer.</span>")
to_chat(user, span_notice("You save the data in [I]'s buffer."))
return 1
else
var/obj/item/multitool/M = I
if(istype(M.connectable, /obj/machinery/power/quantumpad))
linked_pad = M.connectable
to_chat(user, "<span class='notice'>You link [src] to the one in [I]'s buffer.</span>")
to_chat(user, span_notice("You link [src] to the one in [I]'s buffer."))
update_icon()
return 1
@@ -128,11 +128,11 @@
if(.)
return
if(panel_open)
to_chat(user, "<span class='warning'>The panel must be closed before operating this machine!</span>")
to_chat(user, span_warning("The panel must be closed before operating this machine!"))
return
if(istype(get_area(src), /area/shuttle))
to_chat(user, "<span class='warning'>This is too unstable a platform for \the [src] to operate on!</span>")
to_chat(user, span_warning("This is too unstable a platform for \the [src] to operate on!"))
//VOREStation Addition Start
if(linked_pad)
linked_pad.linked_pad = null
@@ -140,28 +140,28 @@
return
if(!powernet)
to_chat(user, "<span class='warning'>[src] is not attached to a powernet!</span>")
to_chat(user, span_warning("[src] is not attached to a powernet!"))
return
if(!linked_pad || QDELETED(linked_pad))
if(!map_pad_link_id || !initMappedLink())
to_chat(user, "<span class='warning'>There is no linked pad!</span>")
to_chat(user, span_warning("There is no linked pad!"))
return
if(world.time < last_teleport + teleport_cooldown)
to_chat(user, "<span class='warning'>[src] is recharging power. Please wait [round((last_teleport + teleport_cooldown - world.time)/10)] seconds.</span>")
to_chat(user, span_warning("[src] is recharging power. Please wait [round((last_teleport + teleport_cooldown - world.time)/10)] seconds."))
return
if(teleporting)
to_chat(user, "<span class='warning'>[src] is charging up. Please wait.</span>")
to_chat(user, span_warning("[src] is charging up. Please wait."))
return
if(linked_pad.teleporting)
to_chat(user, "<span class='warning'>Linked pad is busy. Please wait.</span>")
to_chat(user, span_warning("Linked pad is busy. Please wait."))
return
if(linked_pad.inoperable())
to_chat(user, "<span class='warning'>Linked pad is not responding to ping.</span>")
to_chat(user, span_warning("Linked pad is not responding to ping."))
return
src.add_fingerprint(user)
doteleport(user)
@@ -186,7 +186,7 @@
return
//VOREStation Addition Start
if(istype(get_area(src), /area/shuttle))
to_chat(user, "<span class='warning'>This is too unstable a platform for \the [src] to operate on!</span>")
to_chat(user, span_warning("This is too unstable a platform for \the [src] to operate on!"))
return
//VOREStation Addition End
playsound(src, 'sound/weapons/flash.ogg', 25, 1)
@@ -199,7 +199,7 @@
return
// Broken or whatever
if(inoperable())
to_chat(user, "<span class='warning'>[src] is nonfunctional!</span>")
to_chat(user, span_warning("[src] is nonfunctional!"))
teleporting = 0
return
// Linked pad or not, we can always re-scatter people
@@ -210,12 +210,12 @@
return
// Nothing to teleport to
if(!linked_pad || QDELETED(linked_pad) || linked_pad.inoperable())
to_chat(user, "<span class='warning'>Linked pad is not responding to ping. Teleport aborted.</span>")
to_chat(user, span_warning("Linked pad is not responding to ping. Teleport aborted."))
teleporting = 0
return
// Insufficient power
if(!use_teleport_power())
to_chat(user, "<span class='warning'>Power is not sufficient to complete a teleport. Teleport aborted.</span>")
to_chat(user, span_warning("Power is not sufficient to complete a teleport. Teleport aborted."))
teleporting = 0
return
@@ -291,15 +291,15 @@
/obj/machinery/power/quantumpad/proc/gateway_scatter(mob/user)
var/obj/effect/landmark/dest = pick(awaydestinations)
if(!dest)
to_chat(user, "<span class='warning'>Nothing happens... maybe there's no signal to the remote pad?</span>")
to_chat(user, span_warning("Nothing happens... maybe there's no signal to the remote pad?"))
return
// Insufficient power
if(!use_teleport_power())
to_chat(user, "<span class='warning'>Power is not sufficient to complete a teleport. Teleport aborted.</span>")
to_chat(user, span_warning("Power is not sufficient to complete a teleport. Teleport aborted."))
return
sparks()
to_chat(user, "<span class='warning'>You feel yourself pulled in different directions, before ending up not far from where you started.</span>")
to_chat(user, span_warning("You feel yourself pulled in different directions, before ending up not far from where you started."))
flick("qpad-beam-out", src)
transport_objects(get_turf(dest))
code/modules/telesci/telepad.dm
+1 -1
View File
@@ -41,7 +41,7 @@
if(istype(W, /obj/item/multitool))
var/obj/item/multitool/M = W
M.connectable = src
to_chat(user, "<span class='caution'>You save the data in the [M.name]'s buffer.</span>")
to_chat(user, span_warning("You save the data in the [M.name]'s buffer."))
return 1
return ..()
code/modules/telesci/telesci_computer.dm
+7 -7
View File
@@ -51,26 +51,26 @@
/obj/machinery/computer/telescience/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/bluespace_crystal))
if(crystals.len >= max_crystals)
to_chat(user, "<span class='warning'>There are not enough crystal slots.</span>")
to_chat(user, span_warning("There are not enough crystal slots."))
return
if(!user.unEquip(W))
return
crystals += W
W.forceMove(src)
user.visible_message("[user] inserts [W] into \the [src]'s crystal slot.", "<span class='notice'>You insert [W] into \the [src]'s crystal slot.</span>")
user.visible_message("[user] inserts [W] into \the [src]'s crystal slot.", span_notice("You insert [W] into \the [src]'s crystal slot."))
updateDialog()
else if(istype(W, /obj/item/gps))
if(!inserted_gps)
inserted_gps = W
user.unEquip(W)
W.forceMove(src)
user.visible_message("[user] inserts [W] into \the [src]'s GPS device slot.", "<span class='notice'>You insert [W] into \the [src]'s GPS device slot.</span>")
user.visible_message("[user] inserts [W] into \the [src]'s GPS device slot.", span_notice("You insert [W] into \the [src]'s GPS device slot."))
else if(istype(W, /obj/item/multitool))
var/obj/item/multitool/M = W
if(M.connectable && istype(M.connectable, /obj/machinery/telepad))
telepad = M.connectable
M.connectable = null
to_chat(user, "<span class='caution'>You upload the data from the [W.name]'s buffer.</span>")
to_chat(user, span_warning("You upload the data from the [W.name]'s buffer."))
else
return ..()
@@ -191,7 +191,7 @@
switch(rand(99))
if(0 to 85)
sparks()
visible_message("<span class='warning'>The telepad weakly fizzles.</span>")
visible_message(span_warning("The telepad weakly fizzles."))
return
if(86 to 90)
// Irradiate everyone in telescience!
@@ -200,7 +200,7 @@
sparks()
for(var/mob/living/carbon/human/M in viewers(L, null))
M.apply_effect((rand(10, 20)), IRRADIATE, 0)
to_chat(M, "<span class='warning'>You feel strange.</span>")
to_chat(M, span_warning("You feel strange."))
return
if(91 to 98)
// They did the mash! (They did the monster mash!) The monster mash! (It was a graveyard smash!)
@@ -219,7 +219,7 @@
return
if(99)
sparks()
visible_message("<span class='warning'>The telepad changes colors rapidly, and opens a portal, and you see what your mind seems to think is the very threads that hold the pattern of the universe together, and a eerie sense of paranoia creeps into you.</span>")
visible_message(span_warning("The telepad changes colors rapidly, and opens a portal, and you see what your mind seems to think is the very threads that hold the pattern of the universe together, and a eerie sense of paranoia creeps into you."))
spacevine_infestation()
return