From fbda59a8f59caef71bc4dd8e7850006b5f15f690 Mon Sep 17 00:00:00 2001 From: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com> Date: Fri, 16 Jul 2021 11:34:06 -0500 Subject: [PATCH] slime-iv (#15642) --- _maps/map_files/Delta/delta.dmm | 8 +--- _maps/map_files/MetaStation/MetaStation.dmm | 34 ++------------ _maps/map_files/cyberiad/cyberiad.dmm | 46 ++----------------- code/datums/supplypacks.dm | 3 +- code/game/machinery/vending.dm | 2 +- .../structures/crates_lockers/crates.dm | 17 +++++++ 6 files changed, 29 insertions(+), 81 deletions(-) diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index 126790eb8e5..329501117dc 100644 --- a/_maps/map_files/Delta/delta.dmm +++ b/_maps/map_files/Delta/delta.dmm @@ -97692,14 +97692,8 @@ dir = 1; network = list("SS13","Medical") }, -/obj/structure/closet/crate/freezer, -/obj/item/reagent_containers/iv_bag/blood/AMinus, -/obj/item/reagent_containers/iv_bag/blood/APlus, -/obj/item/reagent_containers/iv_bag/blood/BMinus, -/obj/item/reagent_containers/iv_bag/blood/BPlus, -/obj/item/reagent_containers/iv_bag/blood/OMinus, -/obj/item/reagent_containers/iv_bag/blood/OPlus, /obj/machinery/iv_drip, +/obj/structure/closet/crate/freezer/iv_storage, /turf/simulated/floor/plasteel{ icon_state = "dark" }, diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 4bd8185a0c1..24a1172d589 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -53561,14 +53561,11 @@ }, /area/atmos) "ciX" = ( -/obj/structure/closet/crate/freezer, -/obj/item/reagent_containers/iv_bag, -/obj/item/reagent_containers/iv_bag, -/obj/item/reagent_containers/iv_bag, /obj/machinery/light{ dir = 1; on = 1 }, +/obj/structure/closet/crate/freezer/iv_storage, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "whiteblue" @@ -58845,14 +58842,10 @@ /turf/simulated/floor/plasteel, /area/toxins/explab) "ctT" = ( -/obj/structure/closet/crate/freezer, -/obj/item/reagent_containers/iv_bag, -/obj/item/reagent_containers/iv_bag, -/obj/item/reagent_containers/iv_bag, -/obj/item/reagent_containers/iv_bag, /obj/item/radio/intercom{ pixel_x = -28 }, +/obj/structure/closet/crate/freezer/iv_storage, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -60113,12 +60106,6 @@ /area/maintenance/incinerator) "cwC" = ( /obj/structure/table, -/obj/item/reagent_containers/iv_bag/blood/AMinus, -/obj/item/reagent_containers/iv_bag/blood/APlus, -/obj/item/reagent_containers/iv_bag/blood/BMinus, -/obj/item/reagent_containers/iv_bag/blood/BPlus, -/obj/item/reagent_containers/iv_bag/blood/OPlus, -/obj/item/reagent_containers/iv_bag/blood/OMinus, /obj/machinery/alarm{ dir = 1; pixel_y = -24 @@ -64689,15 +64676,9 @@ /area/medical/genetics_cloning) "cGi" = ( /obj/structure/table, -/obj/item/reagent_containers/iv_bag/blood/AMinus, -/obj/item/reagent_containers/iv_bag/blood/APlus, -/obj/item/reagent_containers/iv_bag/blood/BMinus, -/obj/item/reagent_containers/iv_bag/blood/BPlus, -/obj/item/reagent_containers/iv_bag/blood/OPlus, /obj/machinery/alarm{ pixel_y = 23 }, -/obj/item/reagent_containers/iv_bag/blood/OMinus, /obj/machinery/light{ dir = 1; in_use = 1 @@ -66927,14 +66908,10 @@ name = "\improper Toxins Lab" }) "cKz" = ( -/obj/structure/closet/crate/freezer, -/obj/item/reagent_containers/iv_bag, -/obj/item/reagent_containers/iv_bag, -/obj/item/reagent_containers/iv_bag, -/obj/item/reagent_containers/iv_bag, /obj/item/radio/intercom{ pixel_x = -28 }, +/obj/structure/closet/crate/freezer/iv_storage, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -82963,14 +82940,11 @@ name = "\improper Auxiliary Restrooms" }) "umT" = ( -/obj/structure/closet/crate/freezer, -/obj/item/reagent_containers/iv_bag, -/obj/item/reagent_containers/iv_bag, -/obj/item/reagent_containers/iv_bag, /obj/machinery/light{ dir = 1; on = 1 }, +/obj/structure/closet/crate/freezer/iv_storage, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "whiteblue" diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm index 832b425a7b1..71a6fbd3663 100644 --- a/_maps/map_files/cyberiad/cyberiad.dmm +++ b/_maps/map_files/cyberiad/cyberiad.dmm @@ -46219,23 +46219,11 @@ /turf/simulated/floor/plasteel, /area/hallway/primary/central/se) "bUM" = ( -/obj/structure/closet/crate/freezer, -/obj/item/tank/internals/emergency_oxygen/engi/empty, -/obj/item/tank/internals/emergency_oxygen/engi/empty, -/obj/item/reagent_containers/iv_bag/blood/AMinus, -/obj/item/reagent_containers/iv_bag/blood/APlus, -/obj/item/reagent_containers/iv_bag/blood/BMinus, -/obj/item/reagent_containers/iv_bag/blood/BPlus, -/obj/item/reagent_containers/iv_bag/blood/OMinus, -/obj/item/reagent_containers/iv_bag/blood/OPlus, -/obj/item/reagent_containers/iv_bag/blood/random, -/obj/item/reagent_containers/iv_bag/blood/random, -/obj/item/reagent_containers/iv_bag/blood/random, /obj/machinery/iv_drip, /obj/machinery/ai_status_display{ pixel_y = -32 }, -/obj/item/reagent_containers/iv_bag/salglu, +/obj/structure/closet/crate/freezer/iv_storage, /turf/simulated/floor/plasteel{ icon_state = "whiteblue" }, @@ -50297,20 +50285,8 @@ }, /area/medical/genetics_cloning) "cca" = ( -/obj/structure/closet/crate/freezer, -/obj/item/tank/internals/emergency_oxygen/engi/empty, -/obj/item/tank/internals/emergency_oxygen/engi/empty, -/obj/item/reagent_containers/iv_bag/blood/AMinus, -/obj/item/reagent_containers/iv_bag/blood/APlus, -/obj/item/reagent_containers/iv_bag/blood/BMinus, -/obj/item/reagent_containers/iv_bag/blood/BPlus, -/obj/item/reagent_containers/iv_bag/blood/OMinus, -/obj/item/reagent_containers/iv_bag/blood/OPlus, -/obj/item/reagent_containers/iv_bag/blood/random, -/obj/item/reagent_containers/iv_bag/blood/random, -/obj/item/reagent_containers/iv_bag/blood/random, /obj/machinery/iv_drip, -/obj/item/reagent_containers/iv_bag/salglu, +/obj/structure/closet/crate/freezer/iv_storage, /turf/simulated/floor/plasteel{ icon_state = "whiteblue" }, @@ -52219,15 +52195,8 @@ }, /area/medical/ward) "cfJ" = ( -/obj/structure/closet/crate/freezer, -/obj/item/reagent_containers/iv_bag/blood/AMinus, -/obj/item/reagent_containers/iv_bag/blood/APlus, -/obj/item/reagent_containers/iv_bag/blood/BMinus, -/obj/item/reagent_containers/iv_bag/blood/BPlus, -/obj/item/reagent_containers/iv_bag/blood/OPlus, -/obj/item/reagent_containers/iv_bag/blood/OMinus, /obj/structure/disposalpipe/segment, -/obj/item/reagent_containers/iv_bag/salglu, +/obj/structure/closet/crate/freezer/iv_storage, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -53105,14 +53074,7 @@ }, /area/medical/surgery2) "chu" = ( -/obj/structure/closet/crate/freezer, -/obj/item/reagent_containers/iv_bag/blood/AMinus, -/obj/item/reagent_containers/iv_bag/blood/APlus, -/obj/item/reagent_containers/iv_bag/blood/BMinus, -/obj/item/reagent_containers/iv_bag/blood/BPlus, -/obj/item/reagent_containers/iv_bag/blood/OPlus, -/obj/item/reagent_containers/iv_bag/blood/OMinus, -/obj/item/reagent_containers/iv_bag/salglu, +/obj/structure/closet/crate/freezer/iv_storage, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index 2bf9f914ad0..c48b518fa19 100644 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -905,7 +905,8 @@ GLOBAL_LIST_INIT(all_supply_groups, list(SUPPLY_EMERGENCY,SUPPLY_SECURITY,SUPPLY /obj/item/reagent_containers/iv_bag/blood/BPlus, /obj/item/reagent_containers/iv_bag/blood/BMinus, /obj/item/reagent_containers/iv_bag/blood/OPlus, - /obj/item/reagent_containers/iv_bag/blood/OMinus) + /obj/item/reagent_containers/iv_bag/blood/OMinus, + /obj/item/reagent_containers/iv_bag/slime) cost = 35 containertype = /obj/structure/closet/crate/freezer containername = "blood pack crate" diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 88deaf8647b..375cb4b8628 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -1175,7 +1175,7 @@ /obj/item/reagent_containers/syringe/insulin = 6, /obj/item/reagent_containers/syringe/calomel = 10, /obj/item/reagent_containers/syringe/heparin = 4, /obj/item/reagent_containers/hypospray/autoinjector = 5, /obj/item/reagent_containers/food/pill/salbutamol = 10, /obj/item/reagent_containers/food/pill/mannitol = 10, /obj/item/reagent_containers/food/pill/mutadone = 5, /obj/item/stack/medical/bruise_pack/advanced = 4, /obj/item/stack/medical/ointment/advanced = 4, /obj/item/stack/medical/bruise_pack = 4, /obj/item/stack/medical/splint = 4, /obj/item/reagent_containers/glass/beaker = 4, /obj/item/reagent_containers/dropper = 4, /obj/item/healthanalyzer = 4, - /obj/item/healthupgrade = 4, /obj/item/reagent_containers/hypospray/safety = 2, /obj/item/sensor_device = 2, /obj/item/pinpointer/crew = 2, /obj/item/reagent_containers/iv_bag/slime = 1) + /obj/item/healthupgrade = 4, /obj/item/reagent_containers/hypospray/safety = 2, /obj/item/sensor_device = 2, /obj/item/pinpointer/crew = 2) contraband = list(/obj/item/reagent_containers/glass/bottle/sulfonal = 1, /obj/item/reagent_containers/glass/bottle/pancuronium = 1) armor = list(melee = 100, bullet = 100, laser = 100, energy = 100, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 50) resistance_flags = FIRE_PROOF diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index f6b9ab8de60..f86c37229c6 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -367,6 +367,23 @@ newgas.temperature = target_temp return newgas +/obj/structure/closet/crate/freezer/iv_storage + name = "IV storage freezer" + desc = "A freezer used to store IV bags containing various blood types." + +/obj/structure/closet/crate/freezer/iv_storage/populate_contents() + new /obj/item/reagent_containers/iv_bag/blood/OMinus(src) + new /obj/item/reagent_containers/iv_bag/blood/OPlus(src) + new /obj/item/reagent_containers/iv_bag/blood/AMinus(src) + new /obj/item/reagent_containers/iv_bag/blood/APlus(src) + new /obj/item/reagent_containers/iv_bag/blood/BMinus(src) + new /obj/item/reagent_containers/iv_bag/blood/BPlus(src) + new /obj/item/reagent_containers/iv_bag/blood/random(src) + new /obj/item/reagent_containers/iv_bag/blood/random(src) + new /obj/item/reagent_containers/iv_bag/blood/random(src) + new /obj/item/reagent_containers/iv_bag/salglu(src) + new /obj/item/reagent_containers/iv_bag/slime(src) + /obj/structure/closet/crate/can desc = "A large can, looks like a bin to me." name = "garbage can"