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

Deprecate the stream operator

Browse Source
This commit is contained in:
Arokha Sieyes
2020-02-12 19:38:43 -05:00
committed by Leshana
parent c8a8987610
commit 47ccc655db
762 changed files with 4492 additions and 4464 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/detectivework/microscope/dnascanner.dm
+8 -8
View File
@@ -28,7 +28,7 @@
/obj/machinery/dnaforensics/attackby(var/obj/item/W, mob/user as mob)
if(bloodsamp)
user << "<span class='warning'>There is already a sample in the machine.</span>"
to_chat(user, "<span class='warning'>There is already a sample in the machine.</span>")
return
if(closed)
@@ -38,7 +38,7 @@
if(default_deconstruction_crowbar(user, W))
return
else
user << "<span class='warning'>Open the cover before inserting the sample.</span>"
to_chat(user, "<span class='warning'>Open the cover before inserting the sample.</span>")
return
var/obj/item/weapon/forensics/swab/swab = W
@@ -46,9 +46,9 @@
user.unEquip(W)
src.bloodsamp = swab
swab.loc = src
user << "<span class='notice'>You insert \the [W] into \the [src].</span>"
to_chat(user, "<span class='notice'>You insert \the [W] into \the [src].</span>")
else
user << "<span class='warning'>\The [src] only accepts used swabs.</span>"
to_chat(user, "<span class='warning'>\The [src] only accepts used swabs.</span>")
return
/obj/machinery/dnaforensics/ui_interact(mob/user, ui_key = "main",var/datum/nanoui/ui = null)
@@ -83,12 +83,12 @@
if(closed == 1)
scanner_progress = 0
scanning = 1
usr << "<span class='notice'>Scan initiated.</span>"
to_chat(usr, "<span class='notice'>Scan initiated.</span>")
update_icon()
else
usr << "<span class='notice'>Please close sample lid before initiating scan.</span>"
to_chat(usr, "<span class='notice'>Please close sample lid before initiating scan.</span>")
else
usr << "<span class='warning'>Insert an item to scan.</span>"
to_chat(usr, "<span class='warning'>Insert an item to scan.</span>")
if(href_list["ejectItem"])
if(bloodsamp)
@@ -153,7 +153,7 @@
return
if(scanning)
usr << "<span class='warning'>You can't do that while [src] is scanning!</span>"
to_chat(usr, "<span class='warning'>You can't do that while [src] is scanning!</span>")
return
closed = !closed
code/modules/detectivework/microscope/microscope.dm
+9 -9
View File
@@ -13,11 +13,11 @@
/obj/machinery/microscope/attackby(obj/item/weapon/W as obj, mob/user as mob)
if(sample)
user << "<span class='warning'>There is already a slide in the microscope.</span>"
to_chat(user, "<span class='warning'>There is already a slide in the microscope.</span>")
return
if(istype(W, /obj/item/weapon/forensics/swab)|| istype(W, /obj/item/weapon/sample/fibers) || istype(W, /obj/item/weapon/sample/print))
user << "<span class='notice'>You insert \the [W] into the microscope.</span>"
to_chat(user, "<span class='notice'>You insert \the [W] into the microscope.</span>")
user.unEquip(W)
W.forceMove(src)
sample = W
@@ -27,16 +27,16 @@
/obj/machinery/microscope/attack_hand(mob/user)
if(!sample)
user << "<span class='warning'>The microscope has no sample to examine.</span>"
to_chat(user, "<span class='warning'>The microscope has no sample to examine.</span>")
return
user << "<span class='notice'>The microscope whirrs as you examine \the [sample].</span>"
to_chat(user, "<span class='notice'>The microscope whirrs as you examine \the [sample].</span>")
if(!do_after(user, 2 SECONDS) || !sample)
user << "<span class='notice'>You stop examining \the [sample].</span>"
to_chat(user, "<span class='notice'>You stop examining \the [sample].</span>")
return
user << "<span class='notice'>Printing findings now...</span>"
to_chat(user, "<span class='notice'>Printing findings now...</span>")
var/obj/item/weapon/paper/report = new(get_turf(src))
report.stamped = list(/obj/item/weapon/stamp)
report.overlays = list("paper_stamped")
@@ -82,16 +82,16 @@
if(report)
report.update_icon()
if(report.info)
user << report.info
to_chat(user,report.info)
return
/obj/machinery/microscope/proc/remove_sample(var/mob/living/remover)
if(!istype(remover) || remover.incapacitated() || !Adjacent(remover))
return ..()
if(!sample)
remover << "<span class='warning'>\The [src] does not have a sample in it.</span>"
to_chat(remover, "<span class='warning'>\The [src] does not have a sample in it.</span>")
return
remover << "<span class='notice'>You remove \the [sample] from \the [src].</span>"
to_chat(remover, "<span class='notice'>You remove \the [sample] from \the [src].</span>")
sample.forceMove(get_turf(src))
remover.put_in_hands(sample)
sample = null
code/modules/detectivework/tools/evidencebag.dm
+4 -4
View File
@@ -39,15 +39,15 @@
return
if(istype(I, /obj/item/weapon/evidencebag))
user << "<span class='notice'>You find putting an evidence bag in another evidence bag to be slightly absurd.</span>"
to_chat(user, "<span class='notice'>You find putting an evidence bag in another evidence bag to be slightly absurd.</span>")
return
if(I.w_class > 3)
user << "<span class='notice'>[I] won't fit in [src].</span>"
to_chat(user, "<span class='notice'>[I] won't fit in [src].</span>")
return
if(contents.len)
user << "<span class='notice'>[src] already has something inside it.</span>"
to_chat(user, "<span class='notice'>[src] already has something inside it.</span>")
return
user.visible_message("[user] puts [I] into [src]", "You put [I] inside [src].",\
@@ -86,7 +86,7 @@
icon_state = "evidenceobj"
desc = "An empty evidence bag."
else
user << "[src] is empty."
to_chat(user, "[src] is empty.")
icon_state = "evidenceobj"
return
code/modules/detectivework/tools/rag.dm
+3 -3
View File
@@ -53,7 +53,7 @@
if(on_fire)
visible_message("<span class='warning'>\The [user] lights [src] with [W].</span>")
else
user << "<span class='warning'>You manage to singe [src], but fail to light it.</span>"
to_chat(user, "<span class='warning'>You manage to singe [src], but fail to light it.</span>")
. = ..()
update_name()
@@ -94,7 +94,7 @@
/obj/item/weapon/reagent_containers/glass/rag/proc/wipe_down(atom/A, mob/user)
if(!reagents.total_volume)
user << "<span class='warning'>The [initial(name)] is dry!</span>"
to_chat(user, "<span class='warning'>The [initial(name)] is dry!</span>")
else
user.visible_message("\The [user] starts to wipe down [A] with [src]!")
//reagents.splash(A, 1) //get a small amount of liquid on the thing we're wiping.
@@ -138,7 +138,7 @@
if(istype(A, /obj/structure/reagent_dispensers) || istype(A, /obj/item/weapon/reagent_containers/glass/bucket) || istype(A, /obj/structure/mopbucket)) //VOREStation Edit - "Allows rags to be used on buckets and mopbuckets"
if(!reagents.get_free_space())
user << "<span class='warning'>\The [src] is already soaked.</span>"
to_chat(user, "<span class='warning'>\The [src] is already soaked.</span>")
return
if(A.reagents && A.reagents.trans_to_obj(src, reagents.maximum_volume))
code/modules/detectivework/tools/sample_kits.dm
+8 -8
View File
@@ -25,7 +25,7 @@
return 0
evidence |= supplied.evidence
name = "[initial(name)] (combined)"
user << "<span class='notice'>You transfer the contents of \the [supplied] into \the [src].</span>"
to_chat(user, "<span class='notice'>You transfer the contents of \the [supplied] into \the [src].</span>")
return 1
/obj/item/weapon/sample/print/merge_evidence(var/obj/item/weapon/sample/supplied, var/mob/user)
@@ -37,7 +37,7 @@
else
evidence[print] = supplied.evidence[print]
name = "[initial(name)] (combined)"
user << "<span class='notice'>You overlay \the [src] and \the [supplied], combining the print records.</span>"
to_chat(user, "<span class='notice'>You overlay \the [src] and \the [supplied], combining the print records.</span>")
return 1
/obj/item/weapon/sample/attackby(var/obj/O, var/mob/user)
@@ -67,10 +67,10 @@
return
var/mob/living/carbon/human/H = user
if(H.gloves)
user << "<span class='warning'>Take \the [H.gloves] off first.</span>"
to_chat(user, "<span class='warning'>Take \the [H.gloves] off first.</span>")
return
user << "<span class='notice'>You firmly press your fingertips onto the card.</span>"
to_chat(user, "<span class='notice'>You firmly press your fingertips onto the card.</span>")
var/fullprint = H.get_full_print()
evidence[fullprint] = fullprint
name = "[initial(name)] (\the [H])"
@@ -87,7 +87,7 @@
var/mob/living/carbon/human/H = M
if(H.gloves)
user << "<span class='warning'>\The [H] is wearing gloves.</span>"
to_chat(user, "<span class='warning'>\The [H] is wearing gloves.</span>")
return 1
if(user != H && H.a_intent != "help" && !H.lying)
@@ -104,7 +104,7 @@
if(istype(O) && !O.is_stump())
has_hand = 1
if(!has_hand)
user << "<span class='warning'>They don't have any hands.</span>"
to_chat(user, "<span class='warning'>They don't have any hands.</span>")
return 1
user.visible_message("[user] takes a copy of \the [H]'s fingerprints.")
var/fullprint = H.get_full_print()
@@ -134,7 +134,7 @@
/obj/item/weapon/forensics/sample_kit/proc/take_sample(var/mob/user, var/atom/supplied)
var/obj/item/weapon/sample/S = new evidence_path(get_turf(user), supplied)
user << "<span class='notice'>You transfer [S.evidence.len] [S.evidence.len > 1 ? "[evidence_type]s" : "[evidence_type]"] to \the [S].</span>"
to_chat(user, "<span class='notice'>You transfer [S.evidence.len] [S.evidence.len > 1 ? "[evidence_type]s" : "[evidence_type]"] to \the [S].</span>")
/obj/item/weapon/forensics/sample_kit/afterattack(var/atom/A, var/mob/user, var/proximity)
if(!proximity)
@@ -144,7 +144,7 @@
take_sample(user,A)
return 1
else
user << "<span class='warning'>You are unable to locate any [evidence_type]s on \the [A].</span>"
to_chat(user, "<span class='warning'>You are unable to locate any [evidence_type]s on \the [A].</span>")
return ..()
/obj/item/weapon/forensics/sample_kit/powder
code/modules/detectivework/tools/scanner.dm
+23 -23
View File
@@ -27,14 +27,14 @@
else if(user.zone_sel.selecting == "r_hand" || user.zone_sel.selecting == "l_hand")
var/obj/item/weapon/sample/print/P = new /obj/item/weapon/sample/print(user.loc)
P.attack(M, user)
to_chat(user,"<span class='notice'>Done printing.</span>")
// user << "<span class='notice'>[M]'s Fingerprints: [md5(M.dna.uni_identity)]</span>"
to_chat(user, "<span class='notice'>Done printing.</span>")
// to_chat(user, "<span class='notice'>[M]'s Fingerprints: [md5(M.dna.uni_identity)]</span>")
if(reveal_blood && M.blood_DNA && M.blood_DNA.len)
to_chat(user,"<span class='notice'>Blood found on [M]. Analysing...</span>")
to_chat(user, "<span class='notice'>Blood found on [M]. Analysing...</span>")
spawn(15)
for(var/blood in M.blood_DNA)
to_chat(user,"<span class='notice'>Blood type: [M.blood_DNA[blood]]\nDNA: [blood]</span>")
to_chat(user, "<span class='notice'>Blood type: [M.blood_DNA[blood]]\nDNA: [blood]</span>")
return
/obj/item/device/detective_scanner/afterattack(atom/A as obj|turf, mob/user, proximity)
@@ -52,14 +52,14 @@
*/
if(istype(A,/obj/item/weapon/sample/print))
to_chat(user,"The scanner displays on the screen: \"ERROR 43: Object on Excluded Object List.\"")
to_chat(user, "The scanner displays on the screen: \"ERROR 43: Object on Excluded Object List.\"")
flick("[icon_state]0",src)
return
add_fingerprint(user)
if(!(do_after(user, 1 SECOND)))
to_chat(user,"<span class='warning'>You must remain still for the device to complete its work.</span>")
to_chat(user, "<span class='warning'>You must remain still for the device to complete its work.</span>")
return 0
//General
@@ -71,15 +71,15 @@
return 0
if(add_data(A))
to_chat(user,"<span class='notice'>Object already in internal memory. Consolidating data...</span>")
to_chat(user, "<span class='notice'>Object already in internal memory. Consolidating data...</span>")
flick("[icon_state]2",src)
return
//PRINTS
if(A.fingerprints && A.fingerprints.len)
to_chat(user,"<span class='notice'>Isolated [A.fingerprints.len] fingerprints:</span>")
to_chat(user, "<span class='notice'>Isolated [A.fingerprints.len] fingerprints:</span>")
if(!reveal_incompletes)
to_chat(user,"<span class='warning'>Rapid Analysis Imperfect: Scan samples with H.R.F.S. equipment to determine nature of incomplete prints.</span>")
to_chat(user, "<span class='warning'>Rapid Analysis Imperfect: Scan samples with H.R.F.S. equipment to determine nature of incomplete prints.</span>")
var/list/complete_prints = list()
var/list/incomplete_prints = list()
for(var/i in A.fingerprints)
@@ -89,35 +89,35 @@
else
incomplete_prints += print
if(complete_prints.len < 1)
to_chat(user,"<span class='notice'>No intact prints found</span>")
to_chat(user, "<span class='notice'>No intact prints found</span>")
else
to_chat(user,"<span class='notice'>Found [complete_prints.len] intact prints</span>")
to_chat(user, "<span class='notice'>Found [complete_prints.len] intact prints</span>")
if(reveal_fingerprints)
for(var/i in complete_prints)
to_chat(user,"<span class='notice'>&nbsp;&nbsp;&nbsp;&nbsp;[i]</span>")
to_chat(user, "<span class='notice'>&nbsp;&nbsp;&nbsp;&nbsp;[i]</span>")
to_chat(user,"<span class='notice'>Found [incomplete_prints.len] incomplete prints</span>")
to_chat(user, "<span class='notice'>Found [incomplete_prints.len] incomplete prints</span>")
if(reveal_incompletes)
for(var/i in incomplete_prints)
to_chat(user,"<span class='notice'>&nbsp;&nbsp;&nbsp;&nbsp;[i]</span>")
to_chat(user, "<span class='notice'>&nbsp;&nbsp;&nbsp;&nbsp;[i]</span>")
//FIBERS
if(A.suit_fibers && A.suit_fibers.len)
to_chat(user,"<span class='notice'>Fibers/Materials detected.[reveal_fibers ? " Analysing..." : " Acquisition of fibers for H.R.F.S. analysis advised."]</span>")
to_chat(user, "<span class='notice'>Fibers/Materials detected.[reveal_fibers ? " Analysing..." : " Acquisition of fibers for H.R.F.S. analysis advised."]</span>")
flick("[icon_state]2",src)
if(reveal_fibers && do_after(user, 5 SECONDS))
to_chat(user,"<span class='notice'>Apparel samples scanned:</span>")
to_chat(user, "<span class='notice'>Apparel samples scanned:</span>")
for(var/sample in A.suit_fibers)
to_chat(user," - <span class='notice'>[sample]</span>")
to_chat(user, " - <span class='notice'>[sample]</span>")
//Blood
if (A.blood_DNA && A.blood_DNA.len)
to_chat(user,"<span class='notice'>Blood detected.[reveal_blood ? " Analysing..." : " Acquisition of swab for H.R.F.S. analysis advised."]</span>")
to_chat(user, "<span class='notice'>Blood detected.[reveal_blood ? " Analysing..." : " Acquisition of swab for H.R.F.S. analysis advised."]</span>")
if(reveal_blood && do_after(user, 5 SECONDS))
flick("[icon_state]2",src)
for(var/blood in A.blood_DNA)
to_chat(user,"Blood type: <span class='warning'>[A.blood_DNA[blood]]</span> DNA: <span class='warning'>[blood]</span>")
to_chat(user, "Blood type: <span class='warning'>[A.blood_DNA[blood]]</span> DNA: <span class='warning'>[blood]</span>")
user.visible_message("\The [user] scans \the [A] with \a [src], the air around [user.gender == MALE ? "him" : "her"] humming[prob(70) ? " gently." : "."]" ,\
"<span class='notice'>You finish scanning \the [A].</span>",\
@@ -139,7 +139,7 @@
set category = "Object"
set src in view(1)
world << "usr is [usr]"
to_world("usr is [usr]")
display_data(usr)
/obj/item/device/detective_scanner/proc/display_data(var/mob/user)
@@ -167,7 +167,7 @@
incomplete_prints += print
if(complete_prints.len < 1)
to_chat(user,"<span class='notice'>No intact prints found.</span>")
to_chat(user, "<span class='notice'>No intact prints found.</span>")
if(reveal_incompletes)
for(var/print in incomplete_prints)
@@ -177,7 +177,7 @@
to_chat(user, "<span class='notice'>[fibers.len] samples of material were present.</span>")
if(reveal_fibers)
for(var/sample in fibers)
to_chat(user," - <span class='notice'>[sample]</span>")
to_chat(user, " - <span class='notice'>[sample]</span>")
if(bloods && bloods.len)
to_chat(user, "<span class='notice'>[bloods.len] samples of blood were present.</span>")
@@ -192,7 +192,7 @@
if (alert("Are you sure you want to wipe all data from [src]?",,"Yes","No") == "Yes")
stored = list()
to_chat(usr,"<span class='notice'>Forensic data erase complete.</span>")
to_chat(usr, "<span class='notice'>Forensic data erase complete.</span>")
/obj/item/device/detective_scanner/advanced
name = "advanced forensic scanner"
code/modules/detectivework/tools/swabs.dm
+8 -8
View File
@@ -21,11 +21,11 @@
var/sample_type
if(H.wear_mask)
user << "<span class='warning'>\The [H] is wearing a mask.</span>"
to_chat(user, "<span class='warning'>\The [H] is wearing a mask.</span>")
return
if(!H.dna || !H.dna.unique_enzymes)
user << "<span class='warning'>They don't seem to have DNA!</span>"
to_chat(user, "<span class='warning'>They don't seem to have DNA!</span>")
return
if(user != H && H.a_intent != "help" && !H.lying)
@@ -34,10 +34,10 @@
if(user.zone_sel.selecting == O_MOUTH)
if(!H.organs_by_name[BP_HEAD])
user << "<span class='warning'>They don't have a head.</span>"
to_chat(user, "<span class='warning'>They don't have a head.</span>")
return
if(!H.check_has_mouth())
user << "<span class='warning'>They don't have a mouth.</span>"
to_chat(user, "<span class='warning'>They don't have a mouth.</span>")
return
user.visible_message("[user] swabs \the [H]'s mouth for a saliva sample.")
dna = list(H.dna.unique_enzymes)
@@ -53,7 +53,7 @@
if(istype(O) && !O.is_stump())
has_hand = 1
if(!has_hand)
user << "<span class='warning'>They don't have any hands.</span>"
to_chat(user, "<span class='warning'>They don't have any hands.</span>")
return
user.visible_message("[user] swabs [H]'s palm for a sample.")
sample_type = "GSR"
@@ -72,7 +72,7 @@
return
if(is_used())
user << "<span class='warning'>This swab has already been used.</span>"
to_chat(user, "<span class='warning'>This swab has already been used.</span>")
return
add_fingerprint(user)
@@ -85,7 +85,7 @@
var/choice
if(!choices.len)
user << "<span class='warning'>There is no evidence on \the [A].</span>"
to_chat(user, "<span class='warning'>There is no evidence on \the [A].</span>")
return
else if(choices.len == 1)
choice = choices[1]
@@ -104,7 +104,7 @@
else if(choice == "Gunshot Residue")
var/obj/item/clothing/B = A
if(!istype(B) || !B.gunshot_residue)
user << "<span class='warning'>There is no residue on \the [A].</span>"
to_chat(user, "<span class='warning'>There is no residue on \the [A].</span>")
return
gsr = B.gunshot_residue
sample_type = "residue"