Merge branch 'master' of https://github.com/ParadiseSS13/Paradise int…

…o ParadiseSS13-master
ss220club · Nov 24, 2023 · 03ddf49 · 03ddf49
2 parents 09ab49f + 3679215
commit 03ddf49
Show file tree

Hide file tree

Showing 190 changed files with 1,881 additions and 1,087 deletions.
diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -6399,7 +6399,7 @@
 	pixel_x = 27
 	},
 /obj/structure/table,
-/obj/item/storage/pill_bottle/dice,
+/obj/item/storage/bag/dice,
 /turf/simulated/floor/plasteel{
 	dir = 8;
 	icon_state = "brown"
@@ -6981,7 +6981,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" = (
@@ -11137,7 +11137,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
 	},
@@ -15060,7 +15060,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"
@@ -23136,7 +23136,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" = (
@@ -30628,7 +30628,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" = (
@@ -31837,7 +31837,7 @@
 	name = "south bump";
 	pixel_y = -24
 	},
-/obj/item/storage/pill_bottle/dice,
+/obj/item/storage/bag/dice,
 /obj/structure/table/wood,
 /obj/machinery/camera{
 	c_tag = "Library Quiet Room";
@@ -60370,7 +60370,6 @@
 	name = "west bump";
 	pixel_x = -24
 	},
-/obj/effect/landmark/start/barber,
 /obj/machinery/power/apc{
 	name = "south bump";
 	pixel_y = -24
@@ -62379,18 +62378,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
 	},
@@ -74687,7 +74686,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;
@@ -93619,7 +93618,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_files/cerestation/cerestation.dmm b/_maps/map_files/cerestation/cerestation.dmm
@@ -14429,7 +14429,7 @@
 /area/station/medical/reception)
 "bBs" = (
 /obj/structure/table/wood,
-/obj/item/storage/pill_bottle/dice,
+/obj/item/storage/bag/dice,
 /turf/simulated/floor/carpet,
 /area/station/public/locker)
 "bBt" = (
@@ -77253,7 +77253,7 @@
 /area/station/maintenance/fore)
 "rUL" = (
 /obj/structure/table/wood,
-/obj/item/storage/pill_bottle/dice,
+/obj/item/storage/bag/dice,
 /turf/simulated/floor/wood,
 /area/station/service/library)
 "rUQ" = (
@@ -93911,7 +93911,6 @@
 /turf/simulated/floor/carpet/cyan,
 /area/station/public/fitness)
 "xhr" = (
-/obj/effect/landmark/start/barber,
 /obj/structure/cable/orange{
 	d1 = 1;
 	d2 = 2;