From 4c3cac73cb04e941dc283bd67742e5af16e5051d Mon Sep 17 00:00:00 2001 From: oranges Date: Wed, 2 Jan 2019 01:02:00 +1300 Subject: [PATCH] Runtimestation tweaks --- _maps/map_files/debug/runtimestation.dmm | 39 ++++++++++++------- code/game/objects/items/storage/boxes.dm | 21 ++++++++++ .../crates_lockers/closets/secure/medical.dm | 14 +++++++ 3 files changed, 61 insertions(+), 13 deletions(-) diff --git a/_maps/map_files/debug/runtimestation.dmm b/_maps/map_files/debug/runtimestation.dmm index 7f6c55a90c20..05e2a8a17e32 100644 --- a/_maps/map_files/debug/runtimestation.dmm +++ b/_maps/map_files/debug/runtimestation.dmm @@ -619,15 +619,11 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "bP" = ( -/obj/item/storage/box/beakers, -/obj/item/storage/box/syringes, -/obj/structure/table, -/obj/item/reagent_containers/glass/beaker/bluespace, -/obj/item/reagent_containers/glass/beaker/bluespace, -/obj/item/reagent_containers/syringe, /obj/machinery/airalarm/unlocked{ pixel_y = 23 }, +/obj/structure/table, +/obj/machinery/reagentgrinder, /turf/open/floor/plasteel/dark, /area/medical/chemistry) "bQ" = ( @@ -964,6 +960,11 @@ /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/structure/table, +/obj/item/gun/magic/wand/resurrection/debug, +/obj/item/gun/magic/wand/death/debug{ + pixel_y = 10 + }, /turf/open/floor/plasteel/white/corner{ dir = 1 }, @@ -1499,11 +1500,6 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) -"er" = ( -/obj/item/gun/magic/staff/healing, -/obj/item/gun/magic/wand/resurrection/debug, -/turf/open/floor/plasteel, -/area/medical/medbay) "es" = ( /obj/machinery/light, /obj/machinery/clonepod, @@ -2520,6 +2516,9 @@ /obj/structure/cable{ icon_state = "0-2" }, +/obj/structure/closet/secure_closet/chemical/heisenberg{ + locked = 0 + }, /turf/open/floor/plasteel, /area/medical/chemistry) "ii" = ( @@ -2770,6 +2769,16 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) +"EX" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/table, +/obj/item/screwdriver{ + pixel_y = 10 + }, +/turf/open/floor/plasteel, +/area/medical/chemistry) "If" = ( /obj/machinery/rnd/production/techfab/department, /turf/open/floor/plasteel, @@ -2910,6 +2919,10 @@ /obj/machinery/light{ dir = 4 }, +/obj/machinery/vending/syndichem{ + onstation = 0; + req_access = null + }, /turf/open/floor/plasteel, /area/medical/chemistry) "Xp" = ( @@ -8132,7 +8145,7 @@ aI aI ak Ly -pQ +EX Xg Ce oV @@ -8780,7 +8793,7 @@ af by cz by -er +cm es by eu diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm index d11f43b96277..fde4b00cb892 100644 --- a/code/game/objects/items/storage/boxes.dm +++ b/code/game/objects/items/storage/boxes.dm @@ -170,6 +170,16 @@ for(var/i in 1 to 7) new /obj/item/reagent_containers/syringe(src) +/obj/item/storage/box/syringes/variety + name = "syringe variety box" + +/obj/item/storage/box/syringes/variety/PopulateContents() + new /obj/item/reagent_containers/syringe(src) + new /obj/item/reagent_containers/syringe/lethal(src) + new /obj/item/reagent_containers/syringe/noreact(src) + new /obj/item/reagent_containers/syringe/piercing(src) + new /obj/item/reagent_containers/syringe/bluespace(src) + /obj/item/storage/box/medipens name = "box of medipens" desc = "A box full of epinephrine MediPens." @@ -205,6 +215,17 @@ for(var/i in 1 to 7) new /obj/item/reagent_containers/glass/beaker/bluespace(src) +/obj/item/storage/box/beakers/variety + name = "beaker variety box" + +/obj/item/storage/box/beakers/variety/PopulateContents() + new /obj/item/reagent_containers/glass/beaker(src) + new /obj/item/reagent_containers/glass/beaker/large(src) + new /obj/item/reagent_containers/glass/beaker/plastic(src) + new /obj/item/reagent_containers/glass/beaker/meta(src) + new /obj/item/reagent_containers/glass/beaker/noreact(src) + new /obj/item/reagent_containers/glass/beaker/bluespace(src) + /obj/item/storage/box/medsprays name = "box of medical sprayers" desc = "A box full of medical sprayers, with unscrewable caps and precision spray heads." diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm index ac9791c4ec5a..56f6ffab824f 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -97,8 +97,22 @@ new /obj/item/storage/box/pillbottles(src) new /obj/item/storage/box/medsprays(src) new /obj/item/storage/box/medsprays(src) +<<<<<<< HEAD //yogs start - adds reagent bottles new /obj/item/reagent_containers/glass/bottle/facid(src) new /obj/item/reagent_containers/glass/bottle/capsaicin(src) new /obj/item/reagent_containers/glass/bottle/mutagen(src) //yogs end +======= + +/obj/structure/closet/secure_closet/chemical/heisenberg //contains one of each beaker, syringe etc. + name = "advanced chemical closet" + +/obj/structure/closet/secure_closet/chemical/heisenberg/PopulateContents() + ..() + new /obj/item/reagent_containers/dropper(src) + new /obj/item/reagent_containers/dropper(src) + new /obj/item/storage/box/syringes/variety(src) + new /obj/item/storage/box/beakers/variety(src) + new /obj/item/clothing/glasses/science(src) +>>>>>>> a5c5e8b35e... Merge pull request #42114 from 81Denton/runtime-tweaks