From 35438fff0aebf6a11c6a1b0d81ceefa532a1844b Mon Sep 17 00:00:00 2001 From: Casper3667 Date: Thu, 17 Jun 2021 17:24:23 +0200 Subject: [PATCH] Puts some items into the crime scene kit (#11989) Co-authored-by: TheGreyWolf --- .../objects/items/weapons/storage/boxes.dm | 11 +++- .../crates_lockers/closets/secure/security.dm | 2 + code/modules/detectivework/tools/crimekit.dm | 3 + code/modules/paperwork/photography.dm | 5 ++ html/changelogs/ForensicMap.yml | 6 ++ maps/aurora/aurora-4_mainlevel.dmm | 65 +++++++------------ 6 files changed, 49 insertions(+), 43 deletions(-) create mode 100644 html/changelogs/ForensicMap.yml diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index 2359287f6c9..e31d65eb4e1 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -911,4 +911,13 @@ /obj/item/storage/box/goldstar name = "gold star box" desc = "A box containing gold star stickers." - starts_with = list(/obj/item/sticker/goldstar = 8) \ No newline at end of file + starts_with = list(/obj/item/sticker/goldstar = 8) + +/obj/item/storage/box/folders + name = "box of folders" + desc = "A box full of folders." + starts_with = list(/obj/item/folder = 5) + +/obj/item/storage/box/folders/blue + starts_with = list(/obj/item/folder/sec = 5) + diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index b998e8b638e..2b3c87f76ea 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -401,6 +401,8 @@ new /obj/item/taperoll/police(src) new /obj/item/device/flash(src) new /obj/item/device/laser_pointer/blue(src) + new /obj/item/device/camera/detective(src) + new /obj/item/device/camera_film(src) //Belts new /obj/item/clothing/accessory/holster/waist(src) diff --git a/code/modules/detectivework/tools/crimekit.dm b/code/modules/detectivework/tools/crimekit.dm index bf9f8ca15fe..43483a08fac 100644 --- a/code/modules/detectivework/tools/crimekit.dm +++ b/code/modules/detectivework/tools/crimekit.dm @@ -20,3 +20,6 @@ new /obj/item/device/uv_light(src) new /obj/item/forensics/sample_kit(src) new /obj/item/forensics/sample_kit/powder(src) + new /obj/item/device/mass_spectrometer(src) + new /obj/item/device/reagent_scanner(src) + new /obj/item/storage/box/fancy/csi_markers(src) diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm index 4c1d92b31a2..6390240bb6f 100644 --- a/code/modules/paperwork/photography.dm +++ b/code/modules/paperwork/photography.dm @@ -209,6 +209,11 @@ var/global/photo_count = 0 icon_state = icon_on on = 1 +/obj/item/device/camera/detective + name = "detectives camera" + desc = "A one use - polaroid camera." + pictures_left = 30 + //Proc for capturing check /mob/living/proc/can_capture_turf(turf/T) return TRUE // DVIEW will do sanity checks, we've got no special checks. diff --git a/html/changelogs/ForensicMap.yml b/html/changelogs/ForensicMap.yml new file mode 100644 index 00000000000..8221f1fccd1 --- /dev/null +++ b/html/changelogs/ForensicMap.yml @@ -0,0 +1,6 @@ +author: TheGreyWolf + +delete-after: True + +changes: + - maptweak: "The forensic lab has been slightly adjusted and the mass spectrometer, reagent scanner & crime scene cards spawn within the crime scene kit." diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm index 5cb7c522f52..4fb309bb197 100644 --- a/maps/aurora/aurora-4_mainlevel.dmm +++ b/maps/aurora/aurora-4_mainlevel.dmm @@ -398,6 +398,9 @@ c_tag = "Security - Forensics Lab Port"; dir = 4 }, +/obj/item/storage/box/folders/blue{ + pixel_y = 15 + }, /turf/simulated/floor/tiled/white, /area/security/forensics_laboratory) "aaV" = ( @@ -460,11 +463,9 @@ "abd" = ( /obj/effect/floor_decal/corner/beige/diagonal, /obj/structure/table/glass, -/obj/item/storage/box/fancy/csi_markers{ - pixel_x = -5 - }, -/obj/item/storage/box/fancy/csi_markers{ - pixel_x = 5 +/obj/item/reagent_containers/spray/cleaner{ + pixel_x = 2; + pixel_y = 4 }, /turf/simulated/floor/tiled/white, /area/security/forensics_laboratory) @@ -642,17 +643,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/security_starboard) -"abv" = ( -/obj/effect/floor_decal/corner/beige/diagonal, -/obj/structure/table/glass, -/obj/item/device/reagent_scanner{ - pixel_x = -8 - }, -/obj/item/device/reagent_scanner{ - pixel_x = 8 - }, -/turf/simulated/floor/tiled/white, -/area/security/forensics_laboratory) "abw" = ( /obj/effect/floor_decal/corner/beige/diagonal, /obj/machinery/light, @@ -60205,7 +60195,6 @@ "eNv" = ( /obj/effect/floor_decal/corner/beige/diagonal, /obj/structure/table/glass, -/obj/item/reagent_containers/spray/cleaner, /obj/machinery/newscaster{ pixel_y = 32 }, @@ -64537,13 +64526,12 @@ /obj/machinery/light_switch{ pixel_y = -26 }, -/obj/structure/closet/crate, /obj/machinery/light, -/obj/item/folder/sec, -/obj/item/folder/sec, -/obj/item/folder/sec, -/obj/item/folder/sec, -/obj/item/folder/sec, +/obj/structure/table/rack, +/obj/item/storage/briefcase/crimekit, +/obj/item/storage/briefcase/crimekit{ + pixel_y = 16 + }, /turf/simulated/floor/tiled/white, /area/security/forensics_laboratory) "ncB" = ( @@ -65462,12 +65450,6 @@ "oOw" = ( /obj/effect/floor_decal/corner/beige/diagonal, /obj/structure/table/glass, -/obj/item/device/mass_spectrometer{ - pixel_x = -8 - }, -/obj/item/device/mass_spectrometer{ - pixel_x = 8 - }, /obj/machinery/alarm{ dir = 4; pixel_x = -28 @@ -66225,6 +66207,11 @@ pixel_y = 5 }, /obj/item/storage/box/sharps, +/obj/structure/noticeboard{ + layer = 3.3; + pixel_x = 32; + pixel_y = 2 + }, /turf/simulated/floor/tiled/white, /area/security/forensics_laboratory) "pZF" = ( @@ -66812,14 +66799,12 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/structure/table/rack, -/obj/item/storage/briefcase/crimekit{ - pixel_y = 16 - }, -/obj/item/storage/briefcase/crimekit, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/coatrack{ + pixel_x = 4 + }, /turf/simulated/floor/tiled, /area/security/forensics_laboratory) "rbT" = ( @@ -69493,12 +69478,6 @@ /turf/simulated/wall, /area/assembly/chargebay) "vsB" = ( -/obj/item/device/camera_film, -/obj/item/device/camera{ - desc = "A one use - polaroid camera. 30 photos left."; - name = "detectives camera"; - pictures_left = 30 - }, /obj/structure/closet/secure_closet/investigator, /turf/simulated/floor/lino/grey, /area/security/forensics_office{ @@ -71170,7 +71149,9 @@ /obj/structure/table/standard, /obj/item/folder/sec, /obj/machinery/atmospherics/unary/vent_pump/on, -/obj/item/device/hand_labeler, +/obj/item/device/hand_labeler{ + pixel_x = 16 + }, /obj/machinery/alarm{ pixel_y = 28; target_temperature = 278 @@ -100139,7 +100120,7 @@ srX xxd aaU oOw -abv +vhY abP afe nmV