cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-26 22:57:39 +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