Merge branch 'master' of https://github.com/Singul0/tgstation

_maps/RandomRuins/IceRuins/icemoon_surface_smoking_room.dmm

@@ -54,6 +54,10 @@
 /obj/structure/chair/comfy{
 	dir = 1
 	},
+/obj/effect/decal/remains/human/smokey{
+	pixel_x = -3;
+	pixel_y = 9
+	},
 /turf/open/floor/carpet/blue,
 /area/ruin/smoking_room/room)
 "k" = (
@@ -245,11 +249,6 @@
 /turf/open/misc/asteroid/snow/icemoon,
 /area/icemoon/surface/outdoors/nospawn)
 "R" = (
-/obj/effect/spawner/random/entertainment/cigarette_pack,
-/obj/effect/decal/cleanable/ash/large{
-	pixel_x = -1;
-	pixel_y = 5
-	},
 /obj/structure/showcase/machinery/tv/broken,
 /turf/open/floor/carpet/blue,
 /area/ruin/smoking_room/room)
@@ -279,17 +278,12 @@
 /turf/open/floor/stone,
 /area/ruin/smoking_room/house)
 "W" = (
-/obj/effect/spawner/random/entertainment/cigarette_pack,
 /obj/structure/chair/plastic{
 	dir = 8
 	},
 /obj/effect/spawner/random/entertainment/cigarette_pack,
 /obj/effect/decal/cleanable/ash/large,
 /obj/structure/sign/calendar/directional/east,
-/obj/effect/decal/remains/human/smokey{
-	pixel_x = -3;
-	pixel_y = 9
-	},
 /turf/open/floor/carpet/blue,
 /area/ruin/smoking_room/room)
 "X" = (

_maps/RandomRuins/SpaceRuins/garbagetruck4.dmm

@@ -78,7 +78,7 @@
 /turf/open/floor/plating,
 /area/ruin/space/has_grav/garbagetruck/toystore)
 "hH" = (
-/obj/structure/spider/solid,
+/obj/structure/spider/stickyweb/sealed/tough,
 /obj/item/book/manual/wiki/cytology,
 /obj/effect/decal/cleanable/plastic,
 /turf/open/floor/plating,
@@ -122,7 +122,7 @@
 /area/ruin/space/has_grav/garbagetruck/toystore)
 "lm" = (
 /obj/structure/spider/stickyweb,
-/obj/structure/spider/sticky,
+/obj/structure/spider/stickyweb/very_sticky,
 /turf/open/floor/plating,
 /area/ruin/space/has_grav/garbagetruck/toystore)
 "mf" = (
@@ -182,7 +182,7 @@
 /turf/open/floor/plating,
 /area/ruin/space/has_grav/garbagetruck/toystore)
 "qX" = (
-/obj/structure/spider/sticky,
+/obj/structure/spider/stickyweb/very_sticky,
 /obj/item/food/badrecipe/moldy,
 /obj/structure/spider/stickyweb,
 /obj/item/food/spidereggs{
@@ -255,7 +255,7 @@
 /turf/open/floor/plating,
 /area/ruin/space/has_grav/garbagetruck/toystore)
 "ts" = (
-/obj/structure/spider/solid,
+/obj/structure/spider/stickyweb/sealed/tough,
 /obj/structure/spider/stickyweb,
 /obj/structure/closet/crate/trashcart/filled,
 /turf/open/floor/plating,
@@ -841,7 +841,7 @@
 /turf/open/floor/plating,
 /area/ruin/space/has_grav/garbagetruck/toystore)
 "XI" = (
-/obj/structure/spider/solid,
+/obj/structure/spider/stickyweb/sealed/tough,
 /obj/item/food/badrecipe/moldy/bacteria,
 /turf/open/floor/plating,
 /area/ruin/space/has_grav/garbagetruck/toystore)

_maps/RandomRuins/SpaceRuins/meatderelict.dmm

@@ -733,7 +733,7 @@
 /turf/open/indestructible/white,
 /area/ruin/space/has_grav/powered/biooutpost)
 "oQ" = (
-/obj/machinery/puzzle_button/meatderelict{
+/obj/machinery/puzzle/button/meatderelict{
 	pixel_y = 32;
 	queue_size = 4
 	},
@@ -1669,7 +1669,7 @@
 "FI" = (
 /obj/item/instrument/piano_synth/headphones,
 /obj/structure/table,
-/obj/machinery/puzzle_button/directional/north{
+/obj/machinery/puzzle/button/directional/north{
 	used = 1
 	},
 /obj/effect/turf_decal/tile/neutral/opposingcorners,
@@ -1820,7 +1820,7 @@
 /turf/open/floor/iron/dark/textured_large,
 /area/ruin/space/has_grav/powered/biooutpost/vault)
 "Jt" = (
-/obj/machinery/puzzle_button/directional/north{
+/obj/machinery/puzzle/button/directional/north{
 	id = "md_tosci";
 	name = "shield power panel"
 	},
@@ -1889,7 +1889,7 @@
 /turf/open/indestructible/white,
 /area/ruin/space/has_grav/powered/biooutpost)
 "KC" = (
-/obj/machinery/puzzle_button/directional/north{
+/obj/machinery/puzzle/button/directional/north{
 	id = "md_toeng";
 	queue_size = 4
 	},
@@ -2138,7 +2138,7 @@
 	id = "md_armory"
 	},
 /obj/effect/turf_decal/stripes/full,
-/obj/machinery/puzzle_keycardpad/directional/south{
+/obj/machinery/puzzle/keycardpad/directional/south{
 	id = "md_armory";
 	name = "armory authentication pad";
 	queue_size = 5