upstream-merge

.gitignore

@@ -6,6 +6,7 @@
 #Ignore everything in datafolder and subdirectories
 /data/**/*
 /tmp/**/*
+/cache/**/*
 
 #Ignore byond config folder.
 /cfg/**/*
@@ -191,6 +192,9 @@ Temporary Items
 /_maps/**/backup/
 /_maps/templates.dm
 
+#dmm palette file. You really should be using StrongDMM instead.
+*.dmm-pal
+
 #dmdoc default folder
 /dmdoc
 

_maps/RandomRuins/IceRuins/icemoon_surface_engioutpost.dmm

@@ -88,7 +88,7 @@
 /turf/open/floor/iron,
 /area/ruin/planetengi)
 "aA" = (
-/obj/machinery/rnd/production/protolathe/department/engineering/no_tax,
+/obj/machinery/rnd/production/protolathe/department/engineering,
 /obj/effect/turf_decal/trimline/yellow/filled/warning{
 	dir = 9
 	},

_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_plasma_facility.dmm

@@ -1016,7 +1016,7 @@
 /area/ruin/plasma_facility/commons)
 "pE" = (
 /obj/structure/bed/maint,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
 /obj/item/flashlight/flare/candle{
 	pixel_x = 12;
 	pixel_y = 9

_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm

@@ -40,7 +40,7 @@
 "fD" = (
 /obj/structure/bed,
 /obj/effect/decal/cleanable/blood/bubblegum,
-/obj/item/bedsheet/random,
+/obj/effect/spawner/random/bedsheet/any,
 /turf/open/floor/wood,
 /area/ruin/powered)
 "gG" = (
@@ -416,7 +416,7 @@
 /obj/structure/bed{
 	dir = 4
 	},
-/obj/item/bedsheet/random{
+/obj/effect/spawner/random/bedsheet/any{
 	dir = 4
 	},
 /turf/open/floor/wood,

_maps/RandomRuins/IceRuins/icemoon_underground_frozen_comms.dmm

@@ -63,7 +63,7 @@
 "oj" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/bed,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
 /turf/open/floor/iron/grimy{
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},

_maps/RandomRuins/IceRuins/icemoon_underground_mailroom.dmm

@@ -113,7 +113,7 @@
 /area/ruin/powered/mailroom)
 "kZ" = (
 /obj/structure/filingcabinet/chestdrawer/wheeled,
-/obj/item/valentine,
+/obj/item/paper/valentine,
 /obj/item/grenade/c4,
 /obj/item/clothing/accessory/medal/conduct,
 /obj/item/paper/crumpled/muddy/fluff/instructions,

_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm

@@ -286,7 +286,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4{
 	dir = 4
 	},
-/obj/item/bedsheet/dorms{
+/obj/effect/spawner/random/bedsheet{
 	dir = 4
 	},
 /obj/structure/bed{
@@ -524,8 +524,8 @@
 /turf/closed/wall/mineral/sandstone,
 /area/ruin/powered/beach)
 "qK" = (
-/obj/structure/closet/secure_closet/bar/lavaland_bartender_clothes,
 /obj/machinery/light/small/directional/east,
+/obj/structure/closet/secure_closet/bar/lavaland_bartender_clothes,
 /turf/open/floor/wood,
 /area/ruin/powered/beach)
 "qT" = (

_maps/RandomRuins/SpaceRuins/DJstation/quarters_1.dmm

@@ -16,7 +16,7 @@
 /area/ruin/space/djstation)
 "k" = (
 /obj/structure/bed,
-/obj/item/bedsheet/random,
+/obj/effect/spawner/random/bedsheet/any,
 /turf/open/floor/iron/grimy,
 /area/ruin/space/djstation)
 "p" = (
@@ -41,7 +41,7 @@
 /obj/structure/bed{
 	dir = 4
 	},
-/obj/item/bedsheet/random{
+/obj/effect/spawner/random/bedsheet/any{
 	dir = 4
 	},
 /turf/open/floor/iron/grimy,

_maps/RandomRuins/SpaceRuins/DJstation/quarters_4.dmm

@@ -39,7 +39,7 @@
 /turf/open/floor/iron/freezer/airless,
 /area/ruin/space/djstation)
 "x" = (
-/obj/item/bedsheet/random,
+/obj/effect/spawner/random/bedsheet/any,
 /turf/open/floor/plating/airless,
 /area/ruin/space/djstation)
 "A" = (

_maps/RandomRuins/SpaceRuins/deepstorage.dmm

@@ -1958,7 +1958,7 @@
 /area/ruin/space/has_grav/deepstorage/hydroponics)
 "zl" = (
 /obj/structure/bed/double,
-/obj/item/bedsheet/dorms_double,
+/obj/effect/spawner/random/bedsheet/double,
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
 /turf/open/floor/wood,
 /area/ruin/space/has_grav/deepstorage/dorm)
@@ -2128,7 +2128,7 @@
 "Ev" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
 /obj/structure/bed/double,
-/obj/item/bedsheet/dorms_double,
+/obj/effect/spawner/random/bedsheet/double,
 /turf/open/floor/wood,
 /area/ruin/space/has_grav/deepstorage/dorm)
 "EA" = (

_maps/RandomRuins/SpaceRuins/hellfactory.dmm

@@ -570,7 +570,7 @@
 /area/ruin/space/has_grav/hellfactory)
 "cc" = (
 /obj/structure/bed,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
 /turf/open/floor/holofloor/wood,
 /area/ruin/space/has_grav/hellfactory)
 "cd" = (
@@ -899,7 +899,7 @@
 /area/ruin/space/has_grav/hellfactoryoffice)
 "xK" = (
 /obj/structure/bed,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
 /obj/effect/decal/cleanable/cobweb/cobweb2,
 /turf/open/floor/holofloor/wood,
 /area/ruin/space/has_grav/hellfactory)

_maps/RandomRuins/SpaceRuins/hilbertresearchfacility.dmm

@@ -349,7 +349,7 @@
 /area/ruin/space/has_grav/powered/hilbertresearchfacility)
 "jt" = (
 /obj/structure/bed,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
 /turf/open/floor/carpet/black,
 /area/ruin/space/has_grav/powered/hilbertresearchfacility)
 "jC" = (

_maps/RandomRuins/SpaceRuins/waystation.dmm

@@ -1143,7 +1143,7 @@
 /area/ruin/space/has_grav/waystation/dorms)
 "rQ" = (
 /obj/structure/bed,
-/obj/item/bedsheet/random,
+/obj/effect/spawner/random/bedsheet/any,
 /turf/open/floor/wood,
 /area/ruin/space/has_grav/waystation/dorms)
 "rV" = (
@@ -1889,7 +1889,7 @@
 /area/ruin/space/has_grav/waystation/cargobay)
 "IS" = (
 /obj/structure/bed,
-/obj/item/bedsheet/random,
+/obj/effect/spawner/random/bedsheet/any,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/wood,
 /area/ruin/space/has_grav/waystation/dorms)

_maps/RandomZLevels/SnowCabin.dmm

@@ -2142,7 +2142,7 @@
 /area/awaymission/cabin/caves)
 "km" = (
 /obj/structure/bed,
-/obj/item/bedsheet/dorms,
+/obj/effect/spawner/random/bedsheet,
 /turf/open/floor/wood,
 /area/awaymission/cabin/caves)
 "ko" = (