diff --git a/_maps/map_files220/MetaStation/MetaStation.dmm b/_maps/map_files220/MetaStation/MetaStation.dmm index bc29ff3ba716..bdc98e2223ca 100644 --- a/_maps/map_files220/MetaStation/MetaStation.dmm +++ b/_maps/map_files220/MetaStation/MetaStation.dmm @@ -6055,7 +6055,7 @@ "aGi" = ( /obj/structure/extinguisher_cabinet/directional/east, /obj/structure/table, -/obj/item/storage/pill_bottle/dice, +/obj/item/storage/bag/dice, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "brown" @@ -6587,7 +6587,7 @@ /area/station/maintenance/fsmaint) "aIp" = ( /obj/structure/table, -/obj/item/storage/pill_bottle/dice, +/obj/item/storage/bag/dice, /turf/simulated/floor/plasteel, /area/station/public/dorms) "aIq" = ( @@ -10405,7 +10405,7 @@ /area/station/maintenance/fsmaint) "aUy" = ( /obj/structure/table, -/obj/item/storage/pill_bottle/dice, +/obj/item/storage/bag/dice, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -14077,7 +14077,7 @@ "beK" = ( /obj/structure/table/reinforced, /obj/item/folder/yellow, -/obj/item/reagent_containers/food/pill/patch/silver_sulf, +/obj/item/reagent_containers/patch/silver_sulf, /obj/item/stamp/ce, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" @@ -21532,7 +21532,7 @@ /area/station/service/hydroponics) "byM" = ( /obj/structure/table/wood/poker, -/obj/item/storage/pill_bottle/dice, +/obj/item/storage/bag/dice, /turf/simulated/floor/wood, /area/station/service/bar) "byP" = ( @@ -28397,7 +28397,7 @@ /obj/effect/decal/cleanable/dirt, /obj/item/dice/d20, /obj/item/dice, -/obj/item/storage/pill_bottle/dice, +/obj/item/storage/bag/dice, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "bWF" = ( @@ -29508,7 +29508,7 @@ /area/station/service/library) "caa" = ( /obj/machinery/firealarm/directional/south, -/obj/item/storage/pill_bottle/dice, +/obj/item/storage/bag/dice, /obj/structure/table/wood, /obj/machinery/camera{ c_tag = "Library Quiet Room"; @@ -56910,7 +56910,6 @@ /area/station/science/research) "iGf" = ( /obj/machinery/firealarm/directional/west, -/obj/effect/landmark/start/barber, /obj/machinery/power/apc/directional/south, /obj/structure/cable/yellow, /turf/simulated/floor/plasteel{ @@ -58849,18 +58848,18 @@ pixel_x = 6; pixel_y = 8 }, -/obj/item/reagent_containers/food/pill/patch/styptic{ +/obj/item/reagent_containers/patch/styptic{ pixel_y = 6 }, -/obj/item/reagent_containers/food/pill/patch/styptic{ +/obj/item/reagent_containers/patch/styptic{ pixel_x = 2; pixel_y = 8 }, -/obj/item/reagent_containers/food/pill/patch/silver_sulf{ +/obj/item/reagent_containers/patch/silver_sulf{ pixel_x = -8; pixel_y = 6 }, -/obj/item/reagent_containers/food/pill/patch/silver_sulf{ +/obj/item/reagent_containers/patch/silver_sulf{ pixel_x = -8; pixel_y = 8 }, @@ -70713,7 +70712,7 @@ /area/station/maintenance/fore) "pcD" = ( /obj/structure/table, -/obj/item/storage/pill_bottle/dice, +/obj/item/storage/bag/dice, /obj/structure/cable/yellow{ d1 = 1; d2 = 8; @@ -88889,7 +88888,7 @@ /area/station/science/toxins/mixing) "xUA" = ( /obj/structure/table, -/obj/item/storage/pill_bottle/dice, +/obj/item/storage/bag/dice, /obj/structure/cable/yellow{ d1 = 1; d2 = 8; diff --git a/_maps/map_files220/RandomRuins/SpaceRuins/convoy_ambush.dmm b/_maps/map_files220/RandomRuins/SpaceRuins/convoy_ambush.dmm index 076fd9798ff9..292dace2438e 100644 --- a/_maps/map_files220/RandomRuins/SpaceRuins/convoy_ambush.dmm +++ b/_maps/map_files220/RandomRuins/SpaceRuins/convoy_ambush.dmm @@ -805,9 +805,9 @@ /obj/structure/closet/cardboard, /obj/item/reagent_containers/food/snacks/chinese/rice, /obj/item/reagent_containers/food/snacks/chinese/chowmein, -/obj/item/reagent_containers/food/pill/methamphetamine, -/obj/item/reagent_containers/food/pill/methamphetamine, -/obj/item/reagent_containers/food/pill/methamphetamine, +/obj/item/reagent_containers/pill/methamphetamine, +/obj/item/reagent_containers/pill/methamphetamine, +/obj/item/reagent_containers/pill/methamphetamine, /turf/simulated/floor/plasteel/airless{ icon_state = "blackfull" }, diff --git a/_maps/map_files220/RandomRuins/SpaceRuins/destroyed_infiltrator.dmm b/_maps/map_files220/RandomRuins/SpaceRuins/destroyed_infiltrator.dmm index 5e166d9de526..b3d58cc4e120 100644 --- a/_maps/map_files220/RandomRuins/SpaceRuins/destroyed_infiltrator.dmm +++ b/_maps/map_files220/RandomRuins/SpaceRuins/destroyed_infiltrator.dmm @@ -29,7 +29,7 @@ /turf/template_noop, /area/ruin/space/unpowered/unpowered_structures) "bi" = ( -/obj/item/storage/box/syndie_kit/bonerepair, +/obj/item/reagent_containers/hypospray/autoinjector/nanocalcium, /turf/template_noop, /area/template_noop) "bq" = ( diff --git a/_maps/map_files220/RandomRuins/SpaceRuins/spacehotel.dmm b/_maps/map_files220/RandomRuins/SpaceRuins/spacehotel.dmm index 19e81a1ef404..ee23b7afc7bc 100644 --- a/_maps/map_files220/RandomRuins/SpaceRuins/spacehotel.dmm +++ b/_maps/map_files220/RandomRuins/SpaceRuins/spacehotel.dmm @@ -3616,8 +3616,8 @@ "zx" = ( /obj/structure/rack, /obj/item/storage/firstaid/brute, -/obj/item/reagent_containers/food/pill/patch/silver_sulf, -/obj/item/reagent_containers/food/pill/patch/silver_sulf{ +/obj/item/reagent_containers/patch/silver_sulf, +/obj/item/reagent_containers/patch/silver_sulf{ pixel_y = 3; pixel_x = 3 }, diff --git a/_maps/map_files220/RandomRuins/SpaceRuins/whiteship.dmm b/_maps/map_files220/RandomRuins/SpaceRuins/whiteship.dmm index 47c0b51fbbca..7f547e2b3dde 100644 --- a/_maps/map_files220/RandomRuins/SpaceRuins/whiteship.dmm +++ b/_maps/map_files220/RandomRuins/SpaceRuins/whiteship.dmm @@ -123,18 +123,18 @@ pixel_x = 6; pixel_y = 8 }, -/obj/item/reagent_containers/food/pill/patch/styptic{ +/obj/item/reagent_containers/patch/styptic{ pixel_y = 6 }, -/obj/item/reagent_containers/food/pill/patch/styptic{ +/obj/item/reagent_containers/patch/styptic{ pixel_x = 2; pixel_y = 8 }, -/obj/item/reagent_containers/food/pill/patch/silver_sulf{ +/obj/item/reagent_containers/patch/silver_sulf{ pixel_x = -8; pixel_y = 6 }, -/obj/item/reagent_containers/food/pill/patch/silver_sulf{ +/obj/item/reagent_containers/patch/silver_sulf{ pixel_x = -8; pixel_y = 8 }, diff --git a/_maps/map_files220/RandomZLevels/beach.dmm b/_maps/map_files220/RandomZLevels/beach.dmm index a1f4f3701551..1b137e8c3416 100644 --- a/_maps/map_files220/RandomZLevels/beach.dmm +++ b/_maps/map_files220/RandomZLevels/beach.dmm @@ -2077,7 +2077,7 @@ pixel_x = -12; pixel_y = 8 }, -/obj/item/reagent_containers/food/pill/patch/silver_sulf/small{ +/obj/item/reagent_containers/patch/silver_sulf/small{ pixel_x = 2 }, /turf/simulated/floor/plasteel/white{ @@ -3105,7 +3105,7 @@ /area/awaymission/beach) "Ol" = ( /obj/structure/table/wood/poker, -/obj/item/storage/pill_bottle/dice{ +/obj/item/storage/bag/dice{ pixel_x = 4; pixel_y = 2 }, diff --git a/_maps/map_files220/RandomZLevels/blackmarketpackers.dmm b/_maps/map_files220/RandomZLevels/blackmarketpackers.dmm index de7e3ae62822..ef3956d9de24 100644 --- a/_maps/map_files220/RandomZLevels/blackmarketpackers.dmm +++ b/_maps/map_files220/RandomZLevels/blackmarketpackers.dmm @@ -587,7 +587,7 @@ dir = 2 }, /obj/item/reagent_containers/food/drinks/sillycup, -/obj/item/reagent_containers/food/pill/methamphetamine, +/obj/item/reagent_containers/pill/methamphetamine, /turf/simulated/floor/wood/fancy/oak, /area/awaymission/BMPship/CommonArea) "ca" = ( @@ -689,7 +689,7 @@ /obj/item/bedsheet/centcom{ dir = 4 }, -/obj/item/reagent_containers/food/pill/methamphetamine, +/obj/item/reagent_containers/pill/methamphetamine, /obj/structure/sign/poster/contraband/d_day_promo{ pixel_x = -32 }, @@ -982,7 +982,7 @@ /obj/structure/sign/poster/contraband/tools{ pixel_x = -32 }, -/obj/item/reagent_containers/food/pill/charcoal{ +/obj/item/reagent_containers/pill/charcoal{ layer = 2.9 }, /turf/simulated/floor/carpet, @@ -1486,7 +1486,7 @@ /area/awaymission/BMPship/Bath) "eq" = ( /obj/structure/weightmachine/stacklifter, -/obj/item/reagent_containers/food/pill/methamphetamine, +/obj/item/reagent_containers/pill/methamphetamine, /turf/simulated/floor/wood/fancy/oak, /area/awaymission/BMPship/CommonArea) "er" = ( @@ -4165,7 +4165,7 @@ /obj/structure/sign/poster/contraband/syndicate_recruitment{ pixel_x = -32 }, -/obj/item/reagent_containers/food/pill/charcoal, +/obj/item/reagent_containers/pill/charcoal, /turf/simulated/floor/carpet, /area/awaymission/BMPship/Dormitories) "su" = ( @@ -4955,7 +4955,7 @@ /turf/simulated/floor/plasteel, /area/awaymission/BMPship/Bath) "zC" = ( -/obj/item/reagent_containers/food/pill/charcoal, +/obj/item/reagent_containers/pill/charcoal, /turf/simulated/floor/carpet, /area/awaymission/BMPship/Dormitories) "zD" = ( @@ -5035,7 +5035,7 @@ /obj/structure/chair/office/dark{ dir = 1 }, -/obj/item/reagent_containers/food/pill/charcoal, +/obj/item/reagent_containers/pill/charcoal, /turf/simulated/floor/carpet, /area/awaymission/BMPship/Dormitories) "Ay" = ( @@ -5069,14 +5069,14 @@ dir = 4 }, /obj/item/clothing/head/bearpelt, -/obj/item/reagent_containers/food/pill/methamphetamine{ +/obj/item/reagent_containers/pill/methamphetamine{ layer = 2.9 }, /obj/structure/sign/poster/contraband/have_a_puff{ pixel_x = -32 }, /mob/living/simple_animal/cockroach, -/obj/item/reagent_containers/food/pill/charcoal{ +/obj/item/reagent_containers/pill/charcoal{ layer = 2.9 }, /turf/simulated/floor/carpet, @@ -5562,7 +5562,7 @@ /area/space) "Fs" = ( /obj/machinery/light/small/directional/north, -/obj/item/reagent_containers/food/pill/charcoal, +/obj/item/reagent_containers/pill/charcoal, /turf/simulated/floor/carpet, /area/awaymission/BMPship/Dormitories) "Fz" = ( @@ -7312,7 +7312,7 @@ /obj/item/bedsheet/hos{ dir = 4 }, -/obj/item/reagent_containers/food/pill/methamphetamine{ +/obj/item/reagent_containers/pill/methamphetamine{ layer = 2.9 }, /obj/structure/sign/poster/contraband/grey_tide{ diff --git a/_maps/map_files220/cyberiad/cyberiad.dmm b/_maps/map_files220/cyberiad/cyberiad.dmm index 309c7d023896..277294cc273f 100644 --- a/_maps/map_files220/cyberiad/cyberiad.dmm +++ b/_maps/map_files220/cyberiad/cyberiad.dmm @@ -2025,7 +2025,7 @@ icon_state = "1-2" }, /obj/structure/table, -/obj/item/storage/pill_bottle/dice, +/obj/item/storage/bag/dice, /turf/simulated/floor/plasteel, /area/station/security/permabrig) "akI" = ( @@ -9545,7 +9545,6 @@ }, /area/station/service/barber) "aJs" = ( -/obj/effect/landmark/start/barber, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -87426,25 +87425,25 @@ /area/station/maintenance/starboardsolar) "sTQ" = ( /obj/structure/table, -/obj/item/reagent_containers/food/pill/patch/styptic{ +/obj/item/reagent_containers/patch/styptic{ pixel_x = -5 }, -/obj/item/reagent_containers/food/pill/patch/silver_sulf{ +/obj/item/reagent_containers/patch/silver_sulf{ pixel_x = 6 }, -/obj/item/reagent_containers/food/pill/patch/styptic{ +/obj/item/reagent_containers/patch/styptic{ pixel_x = -5; pixel_y = 2 }, -/obj/item/reagent_containers/food/pill/patch/silver_sulf{ +/obj/item/reagent_containers/patch/silver_sulf{ pixel_x = 6; pixel_y = 2 }, -/obj/item/reagent_containers/food/pill/patch/styptic{ +/obj/item/reagent_containers/patch/styptic{ pixel_x = -5; pixel_y = 4 }, -/obj/item/reagent_containers/food/pill/patch/silver_sulf{ +/obj/item/reagent_containers/patch/silver_sulf{ pixel_x = 6; pixel_y = 4 }, @@ -98774,7 +98773,7 @@ /area/space/nearstation) "xdS" = ( /obj/structure/table/wood, -/obj/item/storage/pill_bottle/dice{ +/obj/item/storage/bag/dice{ pixel_y = 2 }, /turf/simulated/floor/plasteel{ diff --git a/_maps/map_files220/delta/delta.dmm b/_maps/map_files220/delta/delta.dmm index f7e84379b07d..fb4dd52a173f 100644 --- a/_maps/map_files220/delta/delta.dmm +++ b/_maps/map_files220/delta/delta.dmm @@ -1238,7 +1238,7 @@ "ajF" = ( /obj/structure/table/reinforced, /obj/item/folder, -/obj/item/storage/pill_bottle/dice, +/obj/item/storage/bag/dice, /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "ajK" = ( @@ -8825,7 +8825,7 @@ /obj/structure/table/reinforced, /obj/item/clipboard, /obj/item/folder/yellow, -/obj/item/reagent_containers/food/pill/patch/silver_sulf, +/obj/item/reagent_containers/patch/silver_sulf, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 @@ -21952,7 +21952,7 @@ /obj/item/cartridge/engineering{ pixel_y = 6 }, -/obj/item/reagent_containers/food/pill/patch/silver_sulf, +/obj/item/reagent_containers/patch/silver_sulf, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -29719,7 +29719,7 @@ /area/station/maintenance/starboard2) "cxV" = ( /obj/structure/table/wood, -/obj/item/storage/pill_bottle/dice, +/obj/item/storage/bag/dice, /obj/structure/sign/poster/official/random/west, /turf/simulated/floor/carpet, /area/station/service/library) @@ -53318,7 +53318,7 @@ /obj/item/deck/cards{ pixel_y = 6 }, -/obj/item/storage/pill_bottle/dice, +/obj/item/storage/bag/dice, /obj/effect/landmark/damageturf, /turf/simulated/floor/wood/oak, /area/station/maintenance/library) @@ -56130,7 +56130,7 @@ /area/station/legal/lawoffice) "hDS" = ( /obj/structure/table, -/obj/item/storage/pill_bottle/dice, +/obj/item/storage/bag/dice, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitepurple" @@ -57534,7 +57534,7 @@ /area/station/engineering/controlroom) "iaw" = ( /obj/structure/table, -/obj/item/storage/pill_bottle/dice, +/obj/item/storage/bag/dice, /obj/item/deck/cards, /obj/machinery/atmospherics/unary/outlet_injector/on, /turf/simulated/floor/carpet, @@ -71058,7 +71058,7 @@ /area/station/bridge/checkpoint/south) "mJi" = ( /obj/structure/table/wood, -/obj/item/storage/pill_bottle/dice{ +/obj/item/storage/bag/dice{ pixel_y = 2 }, /turf/simulated/floor/carpet/arcade, @@ -87128,7 +87128,6 @@ /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "sgO" = ( -/obj/effect/landmark/start/barber, /turf/simulated/floor/plasteel{ icon_state = "barber" }, @@ -87490,11 +87489,11 @@ /area/station/security/permabrig) "soV" = ( /obj/item/storage/bag/chemistry, -/obj/item/reagent_containers/food/pill/random_drugs, -/obj/item/reagent_containers/food/pill/random_drugs, -/obj/item/reagent_containers/food/pill/random_drugs, -/obj/item/reagent_containers/food/pill/random_drugs, -/obj/item/reagent_containers/food/pill/random_drugs, +/obj/item/reagent_containers/pill/random_drugs, +/obj/item/reagent_containers/pill/random_drugs, +/obj/item/reagent_containers/pill/random_drugs, +/obj/item/reagent_containers/pill/random_drugs, +/obj/item/reagent_containers/pill/random_drugs, /obj/effect/landmark/damageturf, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, @@ -99879,19 +99878,19 @@ pixel_y = -2; pixel_x = -6 }, -/obj/item/reagent_containers/food/pill/patch/styptic{ +/obj/item/reagent_containers/patch/styptic{ pixel_x = 8; pixel_y = 8 }, -/obj/item/reagent_containers/food/pill/patch/styptic{ +/obj/item/reagent_containers/patch/styptic{ pixel_x = 8; pixel_y = 8 }, -/obj/item/reagent_containers/food/pill/patch/silver_sulf{ +/obj/item/reagent_containers/patch/silver_sulf{ pixel_x = 8; pixel_y = -2 }, -/obj/item/reagent_containers/food/pill/patch/silver_sulf{ +/obj/item/reagent_containers/patch/silver_sulf{ pixel_x = 8; pixel_y = -2 },