Minor forensic additions (#12842)

* makes forensic equipment only be put in bags on help intent

* Updates description of some forensic equipment

* changelog typo fix

* updates swab kits

* Adds a suggestion

Co-authored-by: Wowzewow (Wezzy) <42310821+alsoandanswer@users.noreply.github.com>

* Update code/modules/detectivework/tools/sample_kits.dm

Co-authored-by: TGW <mc-casper@hotmail.dk>
Co-authored-by: Wowzewow (Wezzy) <42310821+alsoandanswer@users.noreply.github.com>
Co-authored-by: Werner <1331699+Arrow768@users.noreply.github.com>
This commit is contained in:
Casper3667
2021-12-20 21:35:23 +01:00
committed by GitHub
co-authored by Wowzewow TGW Werner
parent 068eebf6eb
commit c700d6b140
6 changed files with 79 additions and 39 deletions
@@ -2,6 +2,8 @@
/obj/machinery/microscope
name = "high powered electron microscope"
desc = "A highly advanced microscope capable of zooming up to 3000x."
desc_info = "Use a microscope slide or a fingerprint card on this machine to insert it.\
\nAlt click to remove any object within it."
icon = 'icons/obj/forensics.dmi'
icon_state = "microscope"
anchored = 1
@@ -13,11 +15,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/slide) || 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,15 +29,15 @@
/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, 25) || !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()
var/pname
var/info
@@ -63,7 +65,7 @@
if(fibers.evidence)
info = "Molecular analysis on [fibers.name] has determined the presence of unique fiber strings.<br><br>"
for(var/fiber in fibers.evidence)
info += "<span class='notice'>Most likely match for fibers: [fiber]</span><br><br>"
info += SPAN_NOTICE("Most likely match for fibers: [fiber]<br><br>")
else
info += "No fibers found."
else
@@ -76,7 +78,7 @@
if(card.evidence && card.evidence.len)
info += "Surface analysis has determined unique fingerprint strings:<br><br>"
for(var/prints in card.evidence)
info += "<span class='notice'>Fingerprint string: </span>"
info += SPAN_NOTICE("Fingerprint string: ")
if(!is_complete_print(prints))
info += "INCOMPLETE PRINT"
else
@@ -97,9 +99,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
@@ -1,34 +1,35 @@
/obj/item/forensics/slide
name = "microscope slide"
desc = "A pair of thin glass panes used in the examination of samples beneath a microscope."
desc_info = "Used with fibers and GSR swab tests to examine the samples in the microscope. To empty them, use in hand."
icon_state = "slide"
var/obj/item/forensics/swab/has_swab
var/obj/item/sample/fibers/has_sample
/obj/item/forensics/slide/attackby(var/obj/item/W, var/mob/user)
if(has_swab || has_sample)
to_chat(user, "<span class='warning'>There is already a sample in the slide.</span>")
to_chat(user, SPAN_WARNING("There is already a sample in the slide."))
return
if(istype (W, /obj/item/forensics/swab))
has_swab = W
else if(istype(W, /obj/item/sample/fibers))
has_sample = W
else
to_chat(user, "<span class='warning'>You don't think this will fit.</span>")
to_chat(user, SPAN_WARNING("You don't think this will fit."))
return
to_chat(user, "<span class='notice'>You insert the sample into the slide.</span>")
to_chat(user, SPAN_NOTICE("You insert the sample into the slide."))
user.unEquip(W)
W.forceMove(src)
update_icon()
/obj/item/forensics/slide/attack_self(var/mob/user)
if(has_swab || has_sample)
to_chat(user, "<span class='notice'>You remove \the sample from \the [src].</span>")
to_chat(user, SPAN_NOTICE("You remove \the sample from \the [src]."))
if(has_swab)
has_swab.forceMove(get_turf(src))
user.put_in_hands(has_swab)
has_swab = null
if(has_sample)
has_sample.forceMove(get_turf(src))
user.put_in_hands(has_sample)
has_sample = null
update_icon()
return