cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-17 10:05: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/detectivework/microscope/dnascanner.dm
+7 -7
View File
@@ -21,11 +21,11 @@
/obj/machinery/dnaforensics/attackby(obj/item/W, mob/user)
if(bloodsamp)
to_chat(user, "<span class='warning'>There is a sample in the machine.</span>")
to_chat(user, span_warning("There is a sample in the machine."))
return
if(scanning)
to_chat(user, "<span class='warning'>[src] is busy scanning right now.</span>")
to_chat(user, span_warning("[src] is busy scanning right now."))
return
if(default_deconstruction_screwdriver(user, W))
@@ -38,10 +38,10 @@
user.unEquip(W)
bloodsamp = swab
swab.forceMove(src)
to_chat(user, "<span class='notice'>You insert [W] into [src].</span>")
to_chat(user, span_notice("You insert [W] into [src]."))
update_icon()
else
to_chat(user, "<span class='warning'>\The [src] only accepts used swabs.</span>")
to_chat(user, span_warning("\The [src] only accepts used swabs."))
return
/obj/machinery/dnaforensics/tgui_interact(mob/user, datum/tgui/ui)
@@ -77,10 +77,10 @@
if(bloodsamp)
scanner_progress = 0
scanning = TRUE
to_chat(usr, "<span class='notice'>Scan initiated.</span>")
to_chat(usr, span_notice("Scan initiated."))
update_icon()
else
to_chat(usr, "<span class='warning'>Insert an item to scan.</span>")
to_chat(usr, span_warning("Insert an item to scan."))
. = TRUE
if("ejectItem")
@@ -105,7 +105,7 @@
last_process_worldtime = world.time
/obj/machinery/dnaforensics/proc/complete_scan()
visible_message("<span class='notice'>[icon2html(src,viewers(src))] makes an insistent chime.</span>", 2)
visible_message(span_notice("[icon2html(src,viewers(src))] makes an insistent chime."), 2)
update_icon()
if(bloodsamp)
var/obj/item/paper/P = new(src)
code/modules/detectivework/microscope/microscope.dm
+9 -9
View File
@@ -13,11 +13,11 @@
/obj/machinery/microscope/attackby(obj/item/W as obj, mob/user as mob)
if(sample)
to_chat(user, "<span class='warning'>There is already a slide in the microscope.</span>")
to_chat(user, span_warning("There is already a slide in the microscope."))
return
if(istype(W, /obj/item/forensics/swab)|| istype(W, /obj/item/sample/fibers) || istype(W, /obj/item/sample/print))
to_chat(user, "<span class='notice'>You insert \the [W] into the microscope.</span>")
to_chat(user, span_notice("You insert \the [W] into the microscope."))
user.unEquip(W)
W.forceMove(src)
sample = W
@@ -27,16 +27,16 @@
/obj/machinery/microscope/attack_hand(mob/user)
if(!sample)
to_chat(user, "<span class='warning'>The microscope has no sample to examine.</span>")
to_chat(user, span_warning("The microscope has no sample to examine."))
return
to_chat(user, "<span class='notice'>The microscope whirrs as you examine \the [sample].</span>")
to_chat(user, span_notice("The microscope whirrs as you examine \the [sample]."))
if(!do_after(user, 2 SECONDS) || !sample)
to_chat(user, "<span class='notice'>You stop examining \the [sample].</span>")
to_chat(user, span_notice("You stop examining \the [sample]."))
return
to_chat(user, "<span class='notice'>Printing findings now...</span>")
to_chat(user, span_notice("Printing findings now..."))
var/obj/item/paper/report = new(get_turf(src))
report.stamped = list(/obj/item/stamp)
report.overlays = list("paper_stamped")
@@ -70,7 +70,7 @@
if(card.evidence && card.evidence.len)
report.info += "Surface analysis has determined unique fingerprint strings:<br><br>"
for(var/prints in card.evidence)
report.info += "<span class='notice'>Fingerprint string: </span>"
report.info += span_notice("Fingerprint string: ")
if(!is_complete_print(card.evidence[prints]))
report.info += "INCOMPLETE PRINT:[card.evidence[prints]]"
else
@@ -89,9 +89,9 @@
if(!istype(remover) || remover.incapacitated() || !Adjacent(remover))
return
if(!sample)
to_chat(remover, "<span class='warning'>\The [src] does not have a sample in it.</span>")
to_chat(remover, span_warning("\The [src] does not have a sample in it."))
return
to_chat(remover, "<span class='notice'>You remove \the [sample] from \the [src].</span>")
to_chat(remover, span_notice("You remove \the [sample] from \the [src]."))
sample.forceMove(get_turf(src))
remover.put_in_hands(sample)
sample = null