Merge conflicts, procs instead of macros, mood signals.

_maps/RandomRuins/IceRuins/icemoon_surface_hotsprings.dmm

@@ -0,0 +1,160 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/open/floor/plating/asteroid/snow/icemoon,
+/area/icemoon/surface/outdoors)
+"b" = (
+/turf/closed/mineral/random/snow/no_caves,
+/area/icemoon/surface/outdoors)
+"c" = (
+/turf/open/water/cursed_spring,
+/area/icemoon/surface/outdoors)
+"d" = (
+/obj/item/paper/crumpled{
+	info = "When one falls into this hot spring, they shall forever be turned into..."
+	},
+/turf/open/floor/plating/asteroid/snow/icemoon,
+/area/icemoon/surface/outdoors)
+
+(1,1,1) = {"
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+"}
+(2,1,1) = {"
+b
+b
+b
+a
+a
+a
+a
+a
+b
+b
+b
+"}
+(3,1,1) = {"
+b
+b
+a
+a
+a
+a
+a
+a
+a
+b
+b
+"}
+(4,1,1) = {"
+b
+a
+a
+a
+c
+c
+c
+a
+a
+a
+b
+"}
+(5,1,1) = {"
+b
+a
+a
+c
+c
+c
+c
+c
+a
+a
+b
+"}
+(6,1,1) = {"
+b
+a
+a
+c
+c
+c
+c
+c
+a
+a
+b
+"}
+(7,1,1) = {"
+b
+a
+a
+c
+c
+c
+c
+c
+a
+a
+b
+"}
+(8,1,1) = {"
+b
+a
+a
+a
+c
+c
+c
+a
+a
+a
+b
+"}
+(9,1,1) = {"
+b
+b
+a
+a
+a
+d
+a
+a
+a
+b
+b
+"}
+(10,1,1) = {"
+b
+b
+b
+a
+a
+a
+a
+a
+b
+b
+b
+"}
+(11,1,1) = {"
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+"}

_maps/RandomRuins/IceRuins/icemoon_surface_lust.dmm

@@ -0,0 +1,172 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/closed/mineral/random/snow/no_caves,
+/area/icemoon/surface/outdoors)
+"b" = (
+/obj/structure/sign/poster/contraband/lusty_xenomorph,
+/turf/closed/indestructible/abductor,
+/area/icemoon/surface/outdoors)
+"c" = (
+/turf/open/floor/mineral/diamond,
+/area/icemoon/surface/outdoors)
+"d" = (
+/obj/item/reagent_containers/food/drinks/trophy/gold_cup,
+/turf/open/floor/mineral/diamond,
+/area/icemoon/surface/outdoors)
+"e" = (
+/obj/item/greentext{
+	light_color = "#64C864";
+	light_range = 1
+	},
+/turf/open/floor/mineral/diamond,
+/area/icemoon/surface/outdoors)
+"f" = (
+/obj/structure/sign/poster/contraband/lusty_xenomorph,
+/obj/structure/falsewall/abductor,
+/obj/structure/fans/tiny,
+/turf/open/floor/mineral/diamond,
+/area/icemoon/surface/outdoors)
+
+(1,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(2,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(3,1,1) = {"
+a
+a
+a
+a
+b
+b
+b
+a
+a
+a
+a
+"}
+(4,1,1) = {"
+a
+a
+a
+b
+c
+c
+c
+b
+a
+a
+a
+"}
+(5,1,1) = {"
+a
+a
+b
+c
+c
+d
+c
+c
+b
+a
+a
+"}
+(6,1,1) = {"
+a
+a
+b
+c
+d
+e
+d
+c
+f
+a
+a
+"}
+(7,1,1) = {"
+a
+a
+b
+c
+c
+d
+c
+c
+b
+a
+a
+"}
+(8,1,1) = {"
+a
+a
+a
+b
+c
+c
+c
+b
+a
+a
+a
+"}
+(9,1,1) = {"
+a
+a
+a
+a
+b
+b
+b
+a
+a
+a
+a
+"}
+(10,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(11,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}

_maps/RandomRuins/IceRuins/icemoon_surface_mining_site.dmm

@@ -0,0 +1,886 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/closed/mineral/random/snow/no_caves,
+/area/icemoon/surface/outdoors)
+"b" = (
+/turf/closed/wall/mineral/wood/nonmetal,
+/area/ruin/unpowered)
+"c" = (
+/obj/structure/closet/toolcloset,
+/obj/item/wrench,
+/obj/item/screwdriver,
+/obj/item/crowbar,
+/obj/item/weldingtool/largetank,
+/obj/item/wirecutters,
+/obj/item/radio/off,
+/turf/open/floor/wood,
+/area/ruin/unpowered)
+"d" = (
+/turf/open/openspace/icemoon,
+/area/icemoon/surface/outdoors)
+"e" = (
+/obj/item/clothing/suit/hooded/explorer,
+/obj/item/clothing/mask/gas/explorer,
+/obj/item/clothing/gloves/color/black,
+/obj/item/storage/backpack/explorer,
+/obj/item/flashlight/lantern,
+/obj/item/storage/bag/ore,
+/obj/structure/closet,
+/obj/item/clothing/shoes/winterboots/ice_boots,
+/turf/open/floor/wood,
+/area/ruin/unpowered)
+"f" = (
+/turf/open/floor/wood,
+/area/ruin/unpowered)
+"g" = (
+/obj/structure/fireplace,
+/turf/open/floor/wood,
+/area/ruin/unpowered)
+"h" = (
+/obj/structure/flora/rock/icy,
+/turf/closed/mineral/random/snow/no_caves,
+/area/icemoon/surface/outdoors)
+"i" = (
+/turf/template_noop,
+/area/template_noop)
+"j" = (
+/obj/structure/sink/kitchen,
+/turf/open/floor/wood,
+/area/ruin/unpowered)
+"k" = (
+/obj/structure/closet/crate/freezer,
+/turf/open/floor/wood,
+/area/ruin/unpowered)
+"l" = (
+/obj/machinery/vending/dinnerware,
+/turf/open/floor/wood,
+/area/ruin/unpowered)
+"m" = (
+/obj/structure/barricade/wooden/crude/snow,
+/obj/structure/mineral_door/wood,
+/turf/open/floor/wood,
+/area/ruin/unpowered)
+"n" = (
+/turf/closed/mineral/random/snow/no_caves,
+/area/ruin/unpowered)
+"o" = (
+/obj/item/reagent_containers/food/drinks/beer,
+/turf/open/floor/wood,
+/area/ruin/unpowered)
+"p" = (
+/obj/machinery/light/broken{
+	dir = 4
+	},
+/turf/open/floor/wood,
+/area/ruin/unpowered)
+"q" = (
+/obj/structure/table/wood,
+/obj/item/pen,
+/obj/machinery/light/broken{
+	dir = 8
+	},
+/obj/item/paper/crumpled/bloody{
+	info = "help...";
+	text = ""
+	},
+/turf/open/floor/wood,
+/area/ruin/unpowered)
+"r" = (
+/obj/item/chair/wood,
+/obj/effect/decal/cleanable/blood/splatter,
+/obj/effect/mob_spawn/human/miner/explorer,
+/obj/effect/decal/cleanable/blood/drip,
+/turf/open/floor/wood,
+/area/ruin/unpowered)
+"s" = (
+/obj/effect/decal/cleanable/trail_holder,
+/turf/open/floor/wood,
+/area/ruin/unpowered)
+"u" = (
+/obj/structure/ladder,
+/turf/open/floor/wood,
+/area/ruin/unpowered)
+
+(1,1,1) = {"
+i
+i
+i
+i
+i
+i
+i
+i
+i
+i
+i
+i
+i
+i
+i
+i
+i
+i
+i
+i
+i
+i
+i
+i
+i
+"}
+(2,1,1) = {"
+i
+i
+i
+i
+i
+i
+i
+i
+d
+d
+d
+d
+d
+d
+d
+d
+i
+i
+i
+i
+i
+i
+i
+i
+i
+"}
+(3,1,1) = {"
+i
+i
+i
+i
+i
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+i
+i
+i
+i
+i
+i
+"}
+(4,1,1) = {"
+i
+i
+i
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+i
+i
+i
+i
+i
+"}
+(5,1,1) = {"
+i
+i
+i
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+i
+i
+i
+i
+"}
+(6,1,1) = {"
+i
+i
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+i
+i
+i
+"}
+(7,1,1) = {"
+i
+i
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+i
+i
+i
+"}
+(8,1,1) = {"
+i
+i
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+i
+i
+i
+"}
+(9,1,1) = {"
+i
+d
+d
+d
+d
+d
+d
+d
+d
+b
+b
+b
+b
+b
+b
+b
+d
+d
+d
+d
+d
+d
+d
+i
+i
+"}
+(10,1,1) = {"
+i
+d
+d
+d
+d
+d
+d
+d
+b
+b
+b
+b
+b
+b
+b
+b
+b
+d
+d
+d
+d
+d
+d
+i
+i
+"}
+(11,1,1) = {"
+i
+d
+d
+d
+d
+d
+d
+d
+b
+b
+c
+f
+f
+o
+q
+b
+b
+d
+d
+d
+d
+d
+d
+d
+i
+"}
+(12,1,1) = {"
+i
+d
+d
+d
+d
+d
+d
+d
+b
+b
+e
+f
+f
+f
+r
+b
+b
+d
+d
+d
+d
+d
+d
+d
+i
+"}
+(13,1,1) = {"
+i
+d
+d
+d
+d
+d
+d
+d
+b
+b
+f
+f
+f
+f
+s
+b
+b
+d
+d
+d
+d
+d
+d
+d
+i
+"}
+(14,1,1) = {"
+i
+d
+d
+d
+d
+d
+d
+d
+b
+b
+g
+f
+f
+f
+s
+b
+b
+d
+d
+d
+d
+d
+d
+d
+i
+"}
+(15,1,1) = {"
+i
+d
+d
+d
+d
+d
+d
+d
+b
+b
+f
+f
+f
+f
+s
+b
+b
+d
+d
+d
+d
+d
+d
+d
+i
+"}
+(16,1,1) = {"
+i
+d
+d
+d
+d
+d
+d
+d
+b
+b
+j
+f
+f
+f
+s
+b
+b
+d
+d
+d
+d
+d
+d
+d
+i
+"}
+(17,1,1) = {"
+i
+d
+d
+d
+d
+d
+d
+d
+b
+b
+k
+f
+f
+f
+s
+b
+b
+d
+d
+d
+d
+d
+d
+d
+i
+"}
+(18,1,1) = {"
+i
+d
+d
+d
+d
+d
+d
+d
+b
+b
+l
+f
+f
+f
+u
+b
+b
+d
+d
+d
+d
+d
+d
+d
+i
+"}
+(19,1,1) = {"
+i
+d
+d
+d
+d
+d
+d
+d
+b
+b
+b
+f
+f
+p
+b
+b
+b
+d
+d
+d
+d
+d
+d
+d
+i
+"}
+(20,1,1) = {"
+i
+i
+d
+d
+d
+d
+d
+d
+d
+b
+b
+b
+f
+b
+b
+b
+d
+d
+d
+d
+d
+d
+d
+d
+i
+"}
+(21,1,1) = {"
+i
+i
+d
+d
+d
+d
+d
+d
+d
+d
+d
+b
+f
+b
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+i
+"}
+(22,1,1) = {"
+i
+i
+d
+d
+d
+d
+d
+d
+d
+d
+d
+b
+f
+b
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+i
+"}
+(23,1,1) = {"
+i
+i
+d
+d
+d
+d
+d
+d
+d
+d
+d
+b
+f
+b
+d
+d
+d
+d
+d
+d
+d
+d
+d
+i
+i
+"}
+(24,1,1) = {"
+i
+i
+d
+d
+d
+d
+d
+d
+d
+d
+d
+b
+m
+b
+d
+d
+d
+d
+d
+d
+d
+d
+d
+i
+i
+"}
+(25,1,1) = {"
+i
+i
+i
+d
+d
+d
+d
+d
+d
+d
+a
+h
+n
+h
+a
+d
+d
+d
+d
+d
+d
+d
+i
+i
+i
+"}
+(26,1,1) = {"
+i
+i
+i
+d
+d
+d
+d
+d
+d
+a
+a
+a
+h
+a
+a
+a
+d
+d
+d
+d
+d
+d
+i
+i
+i
+"}
+(27,1,1) = {"
+i
+i
+i
+i
+d
+d
+d
+d
+a
+a
+a
+a
+a
+a
+a
+a
+a
+d
+d
+d
+d
+i
+i
+i
+i
+"}
+(28,1,1) = {"
+i
+i
+i
+i
+i
+d
+d
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+d
+d
+i
+i
+i
+i
+i
+"}
+(29,1,1) = {"
+i
+i
+i
+i
+i
+i
+i
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+i
+i
+i
+i
+i
+i
+i
+"}

_maps/RandomRuins/IceRuins/icemoon_underground_bathhouse.dmm

@@ -0,0 +1,178 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/template_noop,
+/area/template_noop)
+"b" = (
+/turf/closed/wall/ice,
+/area/ruin/powered/bathhouse)
+"c" = (
+/obj/machinery/shower{
+	pixel_y = 16
+	},
+/obj/structure/curtain,
+/turf/open/floor/plasteel/white,
+/area/ruin/powered/bathhouse)
+"d" = (
+/turf/closed/mineral/random/snow/no_caves,
+/area/icemoon/underground/explored)
+"e" = (
+/obj/structure/mirror{
+	pixel_y = 28
+	},
+/obj/structure/sink{
+	pixel_y = 20
+	},
+/turf/open/floor/plasteel/white,
+/area/ruin/powered/bathhouse)
+"f" = (
+/obj/structure/table/greyscale,
+/obj/item/bikehorn/rubberducky,
+/turf/open/floor/plasteel/white,
+/area/ruin/powered/bathhouse)
+"g" = (
+/turf/open/floor/plasteel/white,
+/area/ruin/powered/bathhouse)
+"h" = (
+/obj/item/soap,
+/turf/open/floor/plasteel/white,
+/area/ruin/powered/bathhouse)
+"i" = (
+/obj/machinery/door/airlock/freezer{
+	name = "bath house airlock"
+	},
+/turf/open/floor/plasteel/white,
+/area/ruin/powered/bathhouse)
+"j" = (
+/turf/closed/wall/mineral/wood,
+/area/ruin/powered/bathhouse)
+"k" = (
+/turf/open/floor/wood,
+/area/ruin/powered/bathhouse)
+"l" = (
+/obj/structure/table/wood,
+/obj/item/reagent_containers/food/snacks/meatballspaghetti,
+/turf/open/floor/wood,
+/area/ruin/powered/bathhouse)
+"m" = (
+/obj/structure/bookcase/random,
+/turf/open/floor/wood,
+/area/ruin/powered/bathhouse)
+"n" = (
+/turf/open/floor/plating/asteroid/snow/ice/icemoon,
+/area/icemoon/underground/explored)
+"o" = (
+/obj/structure/bed,
+/obj/item/bedsheet,
+/turf/open/floor/wood,
+/area/ruin/powered/bathhouse)
+
+(1,1,1) = {"
+b
+b
+b
+b
+b
+d
+a
+a
+"}
+(2,1,1) = {"
+b
+c
+g
+g
+b
+j
+j
+j
+"}
+(3,1,1) = {"
+b
+b
+g
+g
+i
+k
+k
+j
+"}
+(4,1,1) = {"
+b
+c
+g
+g
+b
+l
+k
+j
+"}
+(5,1,1) = {"
+b
+b
+g
+g
+b
+m
+o
+j
+"}
+(6,1,1) = {"
+b
+c
+g
+g
+b
+j
+j
+j
+"}
+(7,1,1) = {"
+b
+b
+g
+h
+b
+n
+n
+d
+"}
+(8,1,1) = {"
+b
+e
+g
+g
+b
+n
+n
+d
+"}
+(9,1,1) = {"
+b
+e
+g
+g
+i
+n
+n
+d
+"}
+(10,1,1) = {"
+b
+f
+g
+g
+b
+n
+d
+a
+"}
+(11,1,1) = {"
+b
+b
+b
+b
+b
+d
+a
+a
+"}

_maps/RandomRuins/IceRuins/icemoon_underground_library.dmm

@@ -0,0 +1,806 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"aa" = (
+/turf/template_noop,
+/area/template_noop)
+"ab" = (
+/obj/structure/table/wood/fancy/black,
+/obj/item/documents/syndicate/mining,
+/obj/effect/decal/cleanable/cobweb,
+/turf/open/floor/plasteel/cult,
+/area/ruin/unpowered/buried_library)
+"ac" = (
+/turf/closed/wall/mineral/wood,
+/area/ruin/unpowered/buried_library)
+"ad" = (
+/turf/closed/mineral/random/snow/no_caves,
+/area/icemoon/underground/explored)
+"ae" = (
+/turf/open/floor/wood,
+/area/ruin/unpowered/buried_library)
+"af" = (
+/obj/item/stack/sheet/mineral/wood,
+/turf/open/floor/wood,
+/area/ruin/unpowered/buried_library)
+"ag" = (
+/obj/item/feather,
+/turf/open/floor/wood,
+/area/ruin/unpowered/buried_library)
+"ah" = (
+/obj/structure/bookcase/random,
+/turf/open/floor/wood,
+/area/ruin/unpowered/buried_library)
+"ai" = (
+/obj/structure/table/wood/fancy/black,
+/obj/item/paper/crumpled/fluff/stations/lavaland/library/diary2,
+/obj/effect/decal/cleanable/cobweb/cobweb2,
+/turf/open/floor/plasteel/cult,
+/area/ruin/unpowered/buried_library)
+"ak" = (
+/turf/closed/mineral/random/snow/no_caves,
+/area/ruin/unpowered/buried_library)
+"al" = (
+/turf/closed/wall/mineral/iron,
+/area/ruin/unpowered/buried_library)
+"am" = (
+/obj/structure/table/wood/fancy/black,
+/obj/item/book_of_babel,
+/turf/open/floor/plasteel/cult,
+/area/ruin/unpowered/buried_library)
+"ao" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood,
+/area/ruin/unpowered/buried_library)
+"ap" = (
+/obj/item/stack/sheet/mineral/wood,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood,
+/area/ruin/unpowered/buried_library)
+"aq" = (
+/obj/structure/fluff/paper{
+	dir = 1
+	},
+/turf/open/floor/wood,
+/area/ruin/unpowered/buried_library)
+"ar" = (
+/turf/open/floor/plasteel/cult,
+/area/ruin/unpowered/buried_library)
+"as" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/paper/fluff/ruins/oldstation/protosing,
+/turf/closed/mineral/random/snow/no_caves,
+/area/ruin/unpowered/buried_library)
+"at" = (
+/obj/structure/fluff/paper,
+/turf/open/floor/wood,
+/area/ruin/unpowered/buried_library)
+"av" = (
+/obj/structure/bookcase/random,
+/turf/closed/mineral/random/snow/no_caves,
+/area/ruin/unpowered/buried_library)
+"aw" = (
+/turf/open/floor/plating,
+/area/ruin/unpowered/buried_library)
+"ax" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/closed/mineral/random/snow/no_caves,
+/area/ruin/unpowered/buried_library)
+"ay" = (
+/obj/machinery/door/keycard/library,
+/turf/open/floor/plasteel/cult,
+/area/ruin/unpowered/buried_library)
+"az" = (
+/obj/item/paper/crumpled/fluff/stations/lavaland/library/diary,
+/turf/open/floor/wood,
+/area/ruin/unpowered/buried_library)
+"aA" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating,
+/area/ruin/unpowered/buried_library)
+"aC" = (
+/obj/item/feather,
+/turf/closed/mineral/random/snow/no_caves,
+/area/ruin/unpowered/buried_library)
+"aD" = (
+/turf/open/floor/carpet/black,
+/area/ruin/unpowered/buried_library)
+"aE" = (
+/obj/item/stack/sheet/mineral/wood,
+/obj/item/book/manual/random,
+/turf/open/floor/wood,
+/area/ruin/unpowered/buried_library)
+"aF" = (
+/obj/item/book/manual/random,
+/obj/effect/decal/cleanable/dirt,
+/turf/closed/mineral/random/snow/no_caves,
+/area/ruin/unpowered/buried_library)
+"aG" = (
+/obj/structure/table/bronze,
+/obj/item/stack/ore/slag,
+/turf/open/floor/carpet/black,
+/area/ruin/unpowered/buried_library)
+"aH" = (
+/obj/structure/table/bronze,
+/obj/item/statuebust,
+/turf/open/floor/carpet/black,
+/area/ruin/unpowered/buried_library)
+"aI" = (
+/obj/effect/mob_spawn/human/skeleton,
+/obj/item/clothing/head/rice_hat,
+/turf/open/floor/plasteel/cult,
+/area/ruin/unpowered/buried_library)
+"aJ" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/cult,
+/area/ruin/unpowered/buried_library)
+"aK" = (
+/obj/item/feather,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/cult,
+/area/ruin/unpowered/buried_library)
+"aL" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/fluff/paper/stack,
+/turf/open/floor/wood,
+/area/ruin/unpowered/buried_library)
+"aM" = (
+/obj/item/stack/sheet/mineral/wood,
+/obj/item/book/manual/random,
+/turf/closed/mineral/random/snow/no_caves,
+/area/ruin/unpowered/buried_library)
+"aN" = (
+/obj/structure/statue/sandstone/venus,
+/turf/open/floor/carpet/black,
+/area/ruin/unpowered/buried_library)
+"aO" = (
+/mob/living/simple_animal/pet/fox,
+/turf/open/floor/wood,
+/area/ruin/unpowered/buried_library)
+"aP" = (
+/obj/item/keycard/library,
+/turf/closed/mineral/random/snow/no_caves,
+/area/ruin/unpowered/buried_library)
+"aQ" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/paper/fluff/awaymissions/moonoutpost19/research/larva_autopsy,
+/turf/open/floor/wood,
+/area/ruin/unpowered/buried_library)
+"aR" = (
+/obj/structure/fluff/paper/stack,
+/turf/open/floor/wood,
+/area/ruin/unpowered/buried_library)
+"aS" = (
+/obj/structure/table/wood/fancy/black,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/paper/secretrecipe,
+/obj/item/flashlight/lantern/jade{
+	on = 1
+	},
+/turf/open/floor/plasteel/cult,
+/area/ruin/unpowered/buried_library)
+"aT" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/fluff/paper,
+/turf/open/floor/wood,
+/area/ruin/unpowered/buried_library)
+"aV" = (
+/obj/item/stack/sheet/mineral/wood,
+/obj/structure/fluff/paper/stack,
+/turf/open/floor/wood,
+/area/ruin/unpowered/buried_library)
+"aW" = (
+/obj/structure/fluff/paper/stack,
+/turf/open/floor/plasteel/cult,
+/area/ruin/unpowered/buried_library)
+"aX" = (
+/obj/structure/table/bronze,
+/obj/item/statuebust,
+/turf/open/floor/plating,
+/area/ruin/unpowered/buried_library)
+"aY" = (
+/obj/structure/table_frame/wood,
+/turf/open/floor/plating,
+/area/ruin/unpowered/buried_library)
+"aZ" = (
+/obj/structure/fluff/paper/stack,
+/obj/structure/fluff/paper,
+/turf/open/floor/wood,
+/area/ruin/unpowered/buried_library)
+"ba" = (
+/obj/structure/barricade/wooden/snowed,
+/turf/closed/mineral/random/snow/no_caves,
+/area/ruin/unpowered/buried_library)
+"bc" = (
+/obj/item/feather,
+/obj/structure/fluff/paper,
+/obj/structure/fluff/paper{
+	dir = 1
+	},
+/turf/open/floor/wood,
+/area/ruin/unpowered/buried_library)
+"bd" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/fluff/paper{
+	dir = 1
+	},
+/turf/open/floor/wood,
+/area/ruin/unpowered/buried_library)
+"be" = (
+/obj/structure/fluff/paper{
+	dir = 5
+	},
+/turf/open/floor/wood,
+/area/ruin/unpowered/buried_library)
+"bf" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/fluff/paper{
+	dir = 4
+	},
+/turf/open/floor/wood,
+/area/ruin/unpowered/buried_library)
+"bg" = (
+/obj/item/paper/fluff/ruins/oldstation/protogun,
+/turf/closed/mineral/random/snow/no_caves,
+/area/ruin/unpowered/buried_library)
+"bh" = (
+/obj/effect/decal/cleanable/dirt,
+/mob/living/simple_animal/pet/fox,
+/turf/open/floor/wood,
+/area/ruin/unpowered/buried_library)
+"bi" = (
+/obj/structure/fluff/paper,
+/turf/closed/mineral/random/snow/no_caves,
+/area/ruin/unpowered/buried_library)
+"bj" = (
+/obj/item/book/manual/random,
+/turf/closed/mineral/random/snow/no_caves,
+/area/ruin/unpowered/buried_library)
+"bk" = (
+/obj/structure/fluff/paper{
+	dir = 10
+	},
+/turf/open/floor/wood,
+/area/ruin/unpowered/buried_library)
+"bl" = (
+/obj/item/storage/box/fountainpens,
+/turf/closed/mineral/random/snow/no_caves,
+/area/ruin/unpowered/buried_library)
+"bm" = (
+/obj/structure/fluff/paper/stack,
+/turf/closed/mineral/random/snow/no_caves,
+/area/ruin/unpowered/buried_library)
+"bn" = (
+/obj/item/book/manual/random,
+/obj/item/stack/sheet/mineral/wood,
+/turf/closed/mineral/random/snow/no_caves,
+/area/ruin/unpowered/buried_library)
+"bo" = (
+/obj/item/stack/sheet/mineral/wood,
+/turf/closed/mineral/random/snow/no_caves,
+/area/ruin/unpowered/buried_library)
+"bp" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/fluff/paper,
+/turf/closed/mineral/random/snow/no_caves,
+/area/ruin/unpowered/buried_library)
+"bq" = (
+/obj/structure/mineral_door/wood,
+/obj/structure/barricade/wooden/crude/snow,
+/turf/open/floor/wood,
+/area/ruin/unpowered/buried_library)
+"br" = (
+/obj/structure/girder,
+/turf/closed/mineral/random/snow/no_caves,
+/area/ruin/unpowered/buried_library)
+"bt" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/template_noop,
+/area/template_noop)
+"bu" = (
+/obj/item/stack/sheet/mineral/wood,
+/turf/closed/mineral/random/snow/no_caves,
+/area/icemoon/underground/explored)
+"bw" = (
+/turf/open/floor/wood,
+/area/icemoon/underground/explored)
+"by" = (
+/obj/item/statuebust,
+/turf/open/floor/carpet/black,
+/area/ruin/unpowered/buried_library)
+"bz" = (
+/obj/item/flashlight/lantern/jade{
+	on = 1
+	},
+/turf/open/floor/plating,
+/area/ruin/unpowered/buried_library)
+"bA" = (
+/obj/structure/fluff/paper/stack,
+/turf/open/floor/plating,
+/area/ruin/unpowered/buried_library)
+"bB" = (
+/obj/structure/fluff/paper/stack,
+/turf/open/floor/carpet/black,
+/area/ruin/unpowered/buried_library)
+"bC" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/fluff/paper{
+	dir = 1
+	},
+/mob/living/simple_animal/pet/fox,
+/turf/open/floor/wood,
+/area/ruin/unpowered/buried_library)
+
+(1,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+bt
+aa
+"}
+(2,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+ak
+ak
+ak
+ak
+ak
+ac
+ba
+ac
+ac
+ac
+ad
+ad
+aa
+"}
+(3,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+ak
+ak
+ak
+ak
+bo
+ak
+ak
+ak
+bm
+ae
+af
+bk
+ac
+ad
+ad
+aa
+"}
+(4,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+ak
+ak
+aR
+ak
+ak
+ae
+bj
+av
+ak
+ah
+aL
+ah
+aT
+ac
+ad
+aa
+aa
+"}
+(5,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+ak
+ak
+ak
+aC
+ae
+aQ
+ah
+ak
+av
+bg
+ah
+aT
+ah
+ak
+ac
+ad
+ad
+aa
+"}
+(6,1,1) = {"
+aa
+aa
+aa
+aa
+ad
+ac
+ak
+ae
+ak
+aM
+aO
+ah
+bm
+ah
+aA
+ah
+ao
+ah
+aq
+ac
+ad
+ad
+ad
+"}
+(7,1,1) = {"
+aa
+aa
+aa
+aa
+ad
+ac
+ak
+bm
+ak
+ao
+aR
+ao
+aA
+ao
+ae
+ah
+aZ
+ah
+bC
+ac
+ad
+ad
+ad
+"}
+(8,1,1) = {"
+aa
+aa
+aa
+aa
+ad
+ak
+ak
+av
+aA
+ak
+aG
+aD
+aX
+ak
+ao
+ae
+ao
+ah
+ae
+ac
+br
+ad
+ad
+"}
+(9,1,1) = {"
+aa
+aa
+aa
+aa
+ad
+ac
+as
+av
+aF
+aD
+aD
+bz
+aD
+bB
+ak
+ae
+ao
+ae
+ao
+ac
+ax
+bw
+ad
+"}
+(10,1,1) = {"
+aa
+aa
+aa
+ad
+ad
+ac
+ap
+ax
+ak
+aD
+aD
+aN
+ak
+aw
+ak
+ao
+af
+aR
+ae
+bq
+ae
+bu
+ad
+"}
+(11,1,1) = {"
+aa
+al
+al
+al
+al
+al
+ae
+ah
+aR
+aD
+ak
+aD
+aD
+by
+ao
+aw
+ao
+ae
+bm
+ac
+ae
+ad
+ad
+"}
+(12,1,1) = {"
+ad
+al
+ab
+aI
+ar
+al
+aR
+aE
+af
+aD
+aH
+bA
+aY
+aD
+ak
+ae
+bm
+ah
+ag
+br
+ac
+ad
+ad
+"}
+(13,1,1) = {"
+ad
+al
+am
+aJ
+aW
+ay
+ae
+ah
+ao
+ae
+ao
+ae
+af
+ax
+bi
+ah
+ak
+ah
+bp
+ac
+ad
+ad
+ad
+"}
+(14,1,1) = {"
+ad
+al
+aS
+aW
+aK
+al
+at
+ah
+ak
+ah
+bh
+ah
+az
+ah
+ak
+ah
+ak
+bn
+aT
+ac
+ad
+aa
+aa
+"}
+(15,1,1) = {"
+ad
+al
+al
+ai
+ar
+al
+bc
+ah
+aL
+ah
+aA
+ah
+ao
+ah
+ak
+ak
+bl
+ak
+ak
+ak
+ad
+aa
+aa
+"}
+(16,1,1) = {"
+ad
+ad
+al
+al
+al
+al
+bd
+ah
+ao
+ah
+ao
+aV
+ak
+ah
+ax
+ak
+bm
+bo
+ak
+br
+bu
+aa
+aa
+"}
+(17,1,1) = {"
+aa
+ad
+ad
+ad
+ad
+ac
+be
+bf
+ae
+aP
+ae
+aR
+ae
+ax
+ak
+bj
+ak
+ad
+ad
+ad
+aa
+aa
+aa
+"}
+(18,1,1) = {"
+aa
+aa
+aa
+aa
+ad
+ac
+ac
+ac
+ac
+ac
+ac
+ba
+ac
+ac
+br
+ad
+aa
+ad
+aa
+aa
+aa
+aa
+aa
+"}
+(19,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+ad
+ad
+ad
+ad
+ad
+ad
+aa
+ad
+ad
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}

_maps/RandomRuins/IceRuins/icemoon_underground_mining_site.dmm

@@ -0,0 +1,818 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/open/floor/plating/ice/icemoon,
+/area/icemoon/underground/explored)
+"c" = (
+/obj/structure/ladder,
+/turf/open/floor/plating/ice/icemoon,
+/area/icemoon/underground/explored)
+"d" = (
+/turf/template_noop,
+/area/template_noop)
+"f" = (
+/obj/item/flashlight/lantern{
+	on = 1
+	},
+/turf/open/floor/plating/ice/icemoon,
+/area/icemoon/underground/explored)
+"g" = (
+/obj/item/clothing/suit/hooded/explorer,
+/obj/effect/decal/cleanable/blood/gibs/up,
+/turf/open/floor/plating/ice/icemoon,
+/area/icemoon/underground/explored)
+"h" = (
+/obj/item/clothing/shoes/winterboots/ice_boots,
+/turf/open/floor/plating/ice/icemoon,
+/area/icemoon/underground/explored)
+"i" = (
+/obj/item/kitchen/knife/combat/survival,
+/turf/open/floor/plating/ice/icemoon,
+/area/icemoon/underground/explored)
+"T" = (
+/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner,
+/turf/open/floor/plating/ice/icemoon,
+/area/icemoon/underground/explored)
+
+(1,1,1) = {"
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+"}
+(2,1,1) = {"
+d
+d
+d
+d
+d
+d
+d
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+d
+d
+d
+d
+d
+d
+d
+"}
+(3,1,1) = {"
+d
+d
+d
+d
+d
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+d
+d
+d
+d
+d
+d
+"}
+(4,1,1) = {"
+d
+d
+d
+d
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+d
+d
+d
+d
+d
+"}
+(5,1,1) = {"
+d
+d
+d
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+d
+d
+d
+d
+"}
+(6,1,1) = {"
+d
+d
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+d
+d
+d
+"}
+(7,1,1) = {"
+d
+d
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+d
+d
+"}
+(8,1,1) = {"
+d
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+d
+d
+"}
+(9,1,1) = {"
+d
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+d
+"}
+(10,1,1) = {"
+d
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+d
+"}
+(11,1,1) = {"
+d
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+d
+"}
+(12,1,1) = {"
+d
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+d
+"}
+(13,1,1) = {"
+d
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+d
+"}
+(14,1,1) = {"
+d
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+T
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+d
+"}
+(15,1,1) = {"
+d
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+d
+"}
+(16,1,1) = {"
+d
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+d
+"}
+(17,1,1) = {"
+d
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+d
+"}
+(18,1,1) = {"
+d
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+c
+a
+a
+a
+a
+a
+a
+a
+a
+a
+d
+"}
+(19,1,1) = {"
+d
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+d
+"}
+(20,1,1) = {"
+d
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+d
+"}
+(21,1,1) = {"
+d
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+d
+"}
+(22,1,1) = {"
+d
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+d
+"}
+(23,1,1) = {"
+d
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+d
+d
+"}
+(24,1,1) = {"
+d
+d
+a
+a
+a
+a
+f
+i
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+d
+d
+d
+"}
+(25,1,1) = {"
+d
+d
+d
+a
+a
+a
+a
+g
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+d
+d
+d
+d
+"}
+(26,1,1) = {"
+d
+d
+d
+d
+a
+a
+a
+h
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+d
+d
+d
+d
+d
+"}
+(27,1,1) = {"
+d
+d
+d
+d
+d
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+d
+d
+d
+d
+d
+d
+"}
+(28,1,1) = {"
+d
+d
+d
+d
+d
+d
+d
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+d
+d
+d
+d
+d
+d
+d
+"}
+(29,1,1) = {"
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+"}

_maps/RandomRuins/IceRuins/icemoon_underground_puzzle.dmm

@@ -0,0 +1,47 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/template_noop,
+/area/icemoon/underground/explored)
+"b" = (
+/turf/open/floor/plating/asteroid/snow/icemoon,
+/area/icemoon/underground/explored)
+"c" = (
+/obj/effect/sliding_puzzle/lavaland,
+/turf/open/floor/plating/asteroid/snow/icemoon,
+/area/icemoon/underground/explored)
+
+(1,1,1) = {"
+a
+a
+a
+a
+a
+"}
+(2,1,1) = {"
+a
+b
+b
+b
+a
+"}
+(3,1,1) = {"
+a
+b
+c
+b
+a
+"}
+(4,1,1) = {"
+a
+b
+b
+b
+a
+"}
+(5,1,1) = {"
+a
+a
+a
+a
+a
+"}

_maps/RandomRuins/IceRuins/icemoon_underground_wrath.dmm

@@ -0,0 +1,267 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/open/floor/plating/asteroid/snow/icemoon,
+/area/icemoon/underground/explored)
+"b" = (
+/turf/closed/mineral/random/snow/no_caves,
+/area/icemoon/underground/explored)
+"e" = (
+/obj/structure/spawner/nether,
+/turf/open/floor/plating/asteroid/snow/icemoon,
+/area/icemoon/underground/explored)
+
+(1,1,1) = {"
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+"}
+(2,1,1) = {"
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+"}
+(3,1,1) = {"
+b
+b
+b
+b
+b
+a
+a
+a
+a
+a
+b
+b
+b
+b
+b
+"}
+(4,1,1) = {"
+b
+b
+b
+a
+a
+a
+a
+a
+a
+a
+a
+a
+b
+b
+b
+"}
+(5,1,1) = {"
+b
+b
+b
+a
+a
+a
+a
+a
+a
+a
+a
+a
+b
+b
+b
+"}
+(6,1,1) = {"
+b
+b
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+b
+b
+"}
+(7,1,1) = {"
+b
+b
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+b
+b
+"}
+(8,1,1) = {"
+b
+b
+a
+a
+a
+a
+a
+e
+a
+a
+a
+a
+a
+b
+b
+"}
+(9,1,1) = {"
+b
+b
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+b
+b
+"}
+(10,1,1) = {"
+b
+b
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+b
+b
+"}
+(11,1,1) = {"
+b
+b
+b
+a
+a
+a
+a
+a
+a
+a
+a
+a
+b
+b
+b
+"}
+(12,1,1) = {"
+b
+b
+b
+a
+a
+a
+a
+a
+a
+a
+a
+a
+b
+b
+b
+"}
+(13,1,1) = {"
+b
+b
+b
+b
+b
+a
+a
+a
+a
+a
+b
+b
+b
+b
+b
+"}
+(14,1,1) = {"
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+"}
+(15,1,1) = {"
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+"}

_maps/icebox.json

@@ -0,0 +1,49 @@
+{
+   "map_name":"Ice Box Station",
+   "map_path":"map_files/IceBoxStation",
+   "map_file":[
+      "IcemoonUnderground_Below.dmm",
+      "IcemoonUnderground_Above.dmm",
+      "IceBoxStation.dmm"
+   ],
+   "station_ruin_budget":0,
+   "space_ruin_levels":0,
+   "space_empty_levels":0,
+   "shuttles":{
+      "cargo":"cargo_box",
+      "ferry":"ferry_fancy",
+      "whiteship":"whiteship_box",
+      "emergency":"emergency_box"
+   },
+   "traits":[
+      {
+         "Up":1,
+		 "Mining":true,
+		 "Station":false,
+         "Linkage":null,
+         "Gravity":true,
+         "Ice Ruins Underground":true,
+         "Baseturf":"/turf/open/lava/plasma/ice_moon"
+      },
+      {
+         "Down":-1,
+         "Up":1,
+		 "Mining":true,
+		 "Station":false,
+         "Linkage":null,
+         "Gravity":true,
+         "Ice Ruins Underground":true,
+         "Baseturf":"/turf/open/openspace/icemoon"
+      },
+      {
+         "Down":-1,
+         "Mining":true,
+         "Linkage":null,
+         "Gravity":true,
+         "Ice Ruins":true,
+         "Weather_Snowstorm":true,
+         "Baseturf":"/turf/open/floor/plating/asteroid/snow/icemoon"
+      }
+   ],
+   "minetype":"none"
+} 

_maps/iceboxstation.dm

@@ -0,0 +1 @@
+#define FORCE_MAP "_maps/icebox.json"

_maps/map_files/CogStation/CogStation.dmm

@@ -10400,7 +10400,6 @@
 /obj/machinery/requests_console{
 	department = "AI";
 	departmentType = 5;
-	pixel_x = 0;
 	pixel_y = 28
 	},
 /obj/machinery/door/window/eastright{
@@ -42089,18 +42088,14 @@
 /turf/open/floor/plasteel/white,
 /area/medical/virology)
 "bMD" = (
-/obj/structure/flora/tree/palm{
-	pixel_x = 0
-	},
+/obj/structure/flora/tree/palm,
 /obj/machinery/light{
 	dir = 8
 	},
 /turf/open/floor/grass,
 /area/medical/virology)
 "bME" = (
-/obj/structure/flora/tree/palm{
-	pixel_x = 0
-	},
+/obj/structure/flora/tree/palm,
 /obj/machinery/light{
 	dir = 4;
 	light_color = "#c1caff"
@@ -42181,9 +42176,7 @@
 /turf/open/space/basic,
 /area/space/nearstation)
 "bML" = (
-/obj/structure/flora/tree/palm{
-	pixel_x = 0
-	},
+/obj/structure/flora/tree/palm,
 /turf/open/floor/grass,
 /area/medical/virology)
 "bMM" = (
@@ -71649,8 +71642,7 @@
 /obj/machinery/atmospherics/pipe/simple/orange/hidden,
 /obj/machinery/flasher{
 	id = "ID";
-	pixel_x = 24;
-	pixel_y = 0
+	pixel_x = 24
 	},
 /turf/open/floor/plasteel/dark,
 /area/ai_monitored/turret_protected/ai)

_maps/shuttles/infiltrator_basic.dmm

@@ -505,9 +505,7 @@
 /turf/open/floor/plasteel/dark,
 /area/shuttle/syndicate/airlock)
 "bd" = (
-/obj/structure/sign/warning/vacuum/external{
-	layer = 4
-	},
+/obj/structure/sign/warning/vacuum/external,
 /turf/closed/wall/r_wall/syndicate,
 /area/shuttle/syndicate/airlock)
 "be" = (
@@ -808,6 +806,10 @@
 "bQ" = (
 /obj/structure/closet/syndicate/personal,
 /obj/effect/turf_decal/bot_white,
+/obj/item/pickaxe/drill/diamonddrill,
+/obj/item/pickaxe/drill/diamonddrill,
+/obj/item/pickaxe/drill/diamonddrill,
+/obj/item/gun/energy/plasmacutter,
 /turf/open/floor/plasteel/dark,
 /area/shuttle/syndicate/armory)
 "bR" = (
@@ -848,6 +850,10 @@
 "bX" = (
 /obj/structure/closet/syndicate/nuclear,
 /obj/effect/turf_decal/bot_white,
+/obj/item/pickaxe/drill/diamonddrill,
+/obj/item/pickaxe/drill/diamonddrill,
+/obj/item/pickaxe/drill/diamonddrill,
+/obj/item/gun/energy/plasmacutter,
 /turf/open/floor/plasteel/dark,
 /area/shuttle/syndicate/armory)
 "bY" = (

_maps/shuttles/pirate_default.dmm

@@ -943,6 +943,9 @@
 /obj/item/grenade/smokebomb{
 	pixel_x = 5
 	},
+/obj/item/pickaxe/drill/diamonddrill,
+/obj/item/pickaxe/drill/diamonddrill,
+/obj/item/pickaxe/drill/diamonddrill,
 /turf/open/floor/pod/light,
 /area/shuttle/pirate)
 "ep" = (

code/__DEFINES/atmospherics.dm

@@ -161,10 +161,14 @@
 #define ATMOS_TANK_O2				"o2=100000;TEMP=293.15"
 #define ATMOS_TANK_N2				"n2=100000;TEMP=293.15"
 #define ATMOS_TANK_AIRMIX			"o2=2644;n2=10580;TEMP=293.15"
+
 //LAVALAND
 #define LAVALAND_EQUIPMENT_EFFECT_PRESSURE 50 //what pressure you have to be under to increase the effect of equipment meant for lavaland
 #define LAVALAND_DEFAULT_ATMOS "o2=14;n2=23;TEMP=300"
 
+//SNOSTATION
+#define ICEMOON_DEFAULT_ATMOS "o2=17;n2=63;TEMP=180"
+
 //ATMOSIA GAS MONITOR TAGS
 #define ATMOS_GAS_MONITOR_INPUT_O2 "o2_in"
 #define ATMOS_GAS_MONITOR_OUTPUT_O2 "o2_out"
@@ -255,10 +259,10 @@
 
 //HELPERS
 #define PIPING_LAYER_SHIFT(T, PipingLayer) \
-	if(T.dir & NORTH || T.dir & SOUTH) {									\
+	if(T.dir & (NORTH|SOUTH)) {									\
 		T.pixel_x = (PipingLayer - PIPING_LAYER_DEFAULT) * PIPING_LAYER_P_X;\
 	}																		\
-	if(T.dir & WEST || T.dir & EAST) {										\
+	if(T.dir & (WEST|EAST)) {										\
 		T.pixel_y = (PipingLayer - PIPING_LAYER_DEFAULT) * PIPING_LAYER_P_Y;\
 	}
 

code/__DEFINES/construction.dm

@@ -59,8 +59,6 @@
 //let's just pretend fulltile windows being children of border windows is fine
 #define FULLTILE_WINDOW_DIR NORTHEAST
 
-//The amount of materials you get from a sheet of mineral like iron/diamond/glass etc
-#define MINERAL_MATERIAL_AMOUNT 2000
 //The maximum size of a stack object.
 #define MAX_STACK_SIZE 50
 //maximum amount of cable in a coil

code/__DEFINES/dcs/signals.dm

@@ -110,7 +110,8 @@
 #define COMSIG_TURF_MULTIZ_NEW "turf_multiz_new"				//from base of turf/New(): (turf/source, direction)
 
 // /atom/movable signals
-#define COMSIG_MOVABLE_PRE_MOVE "movable_pre_move"				//from base of atom/movable/Moved(): (/atom)
+#define COMSIG_MOVABLE_PRE_MOVE "movable_pre_move"					///from base of atom/movable/Moved(): (/atom)
+	#define COMPONENT_MOVABLE_BLOCK_PRE_MOVE 1
 #define COMSIG_MOVABLE_MOVED "movable_moved"					//from base of atom/movable/Moved(): (/atom, dir)
 #define COMSIG_MOVABLE_CROSS "movable_cross"					//from base of atom/movable/Cross(): (/atom/movable)
 #define COMSIG_MOVABLE_CROSSED "movable_crossed"                //from base of atom/movable/Crossed(): (/atom/movable)
@@ -182,7 +183,28 @@
 //	#define SPEECH_FORCED 7
 #define COMSIG_MOB_ANTAG_ON_GAIN "mob_antag_on_gain"			//from base of /datum/antagonist/on_gain(): (antag_datum)
 
-#define COMSIG_MOB_SPELL_CAN_CAST "mob_spell_can_cast"			//called from base of /obj/effect/proc_holder/spell/can_cast(): (spell)
+#define COMSIG_MOB_SPELL_CAN_CAST "mob_spell_can_cast"			//from base of /obj/effect/proc_holder/spell/can_cast(): (spell)
+
+#define COMSIG_MOB_ACTION_SKILL_MOD "mob_action_skill_mod"		//from base of /datum/skill_holder/action_skills_mod() : (proc args list, list/mod_values)
+	#define ACTION_SKILL_MOD_SKILL 1 //redundancy.
+	#define ACTION_SKILL_MOD_VALUE 2
+	#define ACTION_SKILL_MOD_THRESHOLD 3
+	#define ACTION_SKILL_MOD_IS_MULTI 4
+	//other mod values, kept separate from the args
+	#define MOD_VALUES_SKILL_MOD 1
+
+#define COMSIG_MOB_ITEM_ACTION_SKILLS_MOD "mob_item_action_skills_mod"	//from base of /datum/skill_holder/item_action_skills_mod() : (proc args list, mod_values)
+	#define ITEM_SKILLS_MOD_ITEM 1 //redundancy
+	#define ITEM_SKILLS_MOD_VALUE 2
+	#define ITEM_SKILLS_MOD_FLAGS 3
+	#define ITEM_SKILLS_MOD_BAD_FLAGS 4
+	#define ITEM_SKILLS_MOD_IS_MULTI 5
+	//other mod values, kept separate from the args
+	#define MOD_VALUES_ITEM_SKILLS_SUM 1
+	#define MOD_VALUES_ITEM_SKILLS_DIV 2
+	#define MOD_VALUES_ITEM_SKILLS_CHECKED 3
+
+#define COMSIG_MOB_SKILL_GET_AFFINITY "mob_skill_get_affinity"	//from base of /datum/skill_holder/get_skill_affinity(): (skill_path, list/return_value)
 
 // /mob/living signals
 #define COMSIG_LIVING_REGENERATE_LIMBS "living_regenerate_limbs"	//from base of /mob/living/regenerate_limbs(): (noheal, excluded_limbs)

code/__DEFINES/inventory.dm

@@ -132,7 +132,7 @@
 #define FEMALE_UNIFORM_FULL			1
 #define FEMALE_UNIFORM_TOP			2
 
-//flags for outfits that have mutantrace variants: These are hard sprited too.
+//flags for outfits that have mutant race variants: Most of these require additional sprites to work.
 #define STYLE_DIGITIGRADE		(1<<0) //jumpsuits, suits and shoes
 #define STYLE_MUZZLE			(1<<1) //hats or masks
 #define STYLE_SNEK_TAURIC		(1<<2) //taur-friendly suits
@@ -140,6 +140,9 @@
 #define STYLE_HOOF_TAURIC		(1<<4)
 #define STYLE_ALL_TAURIC		(STYLE_SNEK_TAURIC|STYLE_PAW_TAURIC|STYLE_HOOF_TAURIC)
 #define STYLE_NO_ANTHRO_ICON	(1<<5) //When digis fit the default sprite fine and need no copypasted states. This is the case of skirts and winter coats, for example.
+#define USE_SNEK_CLIP_MASK		(1<<6)
+#define USE_QUADRUPED_CLIP_MASK	(1<<7)
+#define USE_TAUR_CLIP_MASK		(USE_SNEK_CLIP_MASK|USE_QUADRUPED_CLIP_MASK)
 
 //digitigrade legs settings.
 #define NOT_DIGITIGRADE				0

code/__DEFINES/is_helpers.dm

@@ -174,7 +174,10 @@ GLOBAL_LIST_INIT(clawfootmob, typecacheof(list(
 	/mob/living/simple_animal/pet/fox,
 	/mob/living/simple_animal/chicken,
 	/mob/living/simple_animal/hostile/bear,
-	/mob/living/simple_animal/hostile/jungle/mega_arachnid
+	/mob/living/simple_animal/hostile/jungle/mega_arachnid,
+	/mob/living/simple_animal/hostile/asteroid/ice_whelp,
+	/mob/living/simple_animal/hostile/asteroid/wolf,
+	/mob/living/simple_animal/hostile/asteroid/polarbear
 	)))
 
 GLOBAL_LIST_INIT(barefootmob, typecacheof(list(

code/__DEFINES/layers_planes.dm

@@ -1,6 +1,8 @@
 //Defines for atom layers and planes
 //KEEP THESE IN A NICE ACSCENDING ORDER, PLEASE
 
+#define PLANE_VOID -100
+
 #define CLICKCATCHER_PLANE -99
 
 #define PLANE_SPACE -95

code/__DEFINES/mapping/maploader.dm

@@ -0,0 +1,3 @@
+//map template annihilate_bounds
+#define MAP_TEMPLATE_ANNIHILATE_PRELOAD 1		//annihilate bounds before starting loading
+#define MAP_TEMPLATE_ANNIHILATE_LOADING 2		//"sweeping" delete during loading

code/__DEFINES/maps.dm

@@ -38,8 +38,15 @@ require only minor tweaks.
 #define ZTRAIT_VR "Virtual Reality"
 #define ZTRAIT_SPACE_RUINS "Space Ruins"
 #define ZTRAIT_LAVA_RUINS "Lava Ruins"
+#define ZTRAIT_ICE_RUINS "Ice Ruins"
+#define ZTRAIT_ICE_RUINS_UNDERGROUND "Ice Ruins Underground"
 #define ZTRAIT_ISOLATED_RUINS "Isolated Ruins" //Placing ruins on z levels with this trait will use turf reservation instead of usual placement.
 
+//boolean - weather types that occur on the level
+#define ZTRAIT_SNOWSTORM "Weather_Snowstorm"
+#define ZTRAIT_ASHSTORM "Weather_Ashstorm"
+#define ZTRAIT_ACIDRAIN "Weather_Acidrain"
+
 // number - bombcap is multiplied by this before being applied to bombs
 #define ZTRAIT_BOMBCAP_MULTIPLIER "Bombcap Multiplier"
 
@@ -68,6 +75,7 @@ require only minor tweaks.
 #define ZTRAITS_SPACE list(ZTRAIT_LINKAGE = CROSSLINKED, ZTRAIT_SPACE_RUINS = TRUE)
 #define ZTRAITS_LAVALAND list(\
     ZTRAIT_MINING = TRUE, \
+	ZTRAIT_ASHSTORM = TRUE, \
     ZTRAIT_LAVA_RUINS = TRUE, \
     ZTRAIT_BOMBCAP_MULTIPLIER = 5, \
     ZTRAIT_BASETURF = /turf/open/lava/smooth/lava_land_surface)

code/__DEFINES/material/worth.dm

@@ -0,0 +1,2 @@
+/// cm3 of material matter per sheet
+#define MINERAL_MATERIAL_AMOUNT 2000

code/__DEFINES/misc.dm

@@ -35,15 +35,15 @@ Will print: "/mob/living/carbon/human/death" (you can optionally embed it in a s
 #define BODY_ADJ_LAYER			27		//certain mutantrace features (snout, body markings) that must appear above the body parts
 #define GENITALS_FRONT_LAYER	26		//Draws some genitalia above clothes and the TAUR body if need be.
 #define BODY_LAYER				25		//underwear, undershirts, socks, eyes, lips(makeup)
-#define FRONT_MUTATIONS_LAYER	24		//mutations that should appear above body, body_adj and bodyparts layer (e.g. laser eyes)
-#define DAMAGE_LAYER			23		//damage indicators (cuts and burns)
-#define UNIFORM_LAYER			22
-#define ID_LAYER				21
-#define HANDS_PART_LAYER		20
-#define SHOES_LAYER				19
-#define GLOVES_LAYER			18
-#define EARS_LAYER				17
-#define BODY_TAUR_LAYER			16
+#define BODY_ADJ_UPPER_LAYER	24
+#define FRONT_MUTATIONS_LAYER	23		//mutations that should appear above body, body_adj and bodyparts layer (e.g. laser eyes)
+#define DAMAGE_LAYER			22		//damage indicators (cuts and burns)
+#define UNIFORM_LAYER			21
+#define ID_LAYER				20
+#define HANDS_PART_LAYER		19
+#define SHOES_LAYER				18
+#define GLOVES_LAYER			17
+#define EARS_LAYER				16
 #define SUIT_LAYER				15
 #define GENITALS_EXPOSED_LAYER	14
 #define GLASSES_LAYER			13

code/__DEFINES/mobs.dm

@@ -138,6 +138,7 @@
 #define MOOD_LEVEL_SAD4 -25
 
 //Sanity levels for humans
+#define SANITY_AMAZING 150
 #define SANITY_GREAT 125
 #define SANITY_NEUTRAL 100
 #define SANITY_DISTURBED 75
@@ -265,6 +266,7 @@
 #define WIZARD_AGE_MIN		30	//youngest a wizard can be
 #define APPRENTICE_AGE_MIN	29	//youngest an apprentice can be
 #define SHOES_SLOWDOWN		0	//How much shoes slow you down by default. Negative values speed you up
+#define SHOES_SPEED_SLIGHT  SHOES_SLOWDOWN - 1 // slightest speed boost to movement
 #define POCKET_STRIP_DELAY			40	//time taken (in deciseconds) to search somebody's pockets
 #define DOOR_CRUSH_DAMAGE	15	//the amount of damage that airlocks deal when they crush you
 
@@ -288,10 +290,8 @@
 
 #define HUMAN_FIRE_STACK_ICON_NUM	3
 
-#define PULL_PRONE_SLOWDOWN 0.6
-#define FIREMAN_CARRY_SLOWDOWN 0
-#define PIGGYBACK_CARRY_SLOWDOWN 1
-//slowdown when in softcrit. Note that crawling slowdown will also apply at the same time!
-#define SOFTCRIT_ADD_SLOWDOWN 2
-//slowdown when crawling
-#define CRAWLING_ADD_SLOWDOWN 4
+#define GRAB_PIXEL_SHIFT_PASSIVE 6
+#define GRAB_PIXEL_SHIFT_AGGRESSIVE 12
+#define GRAB_PIXEL_SHIFT_NECK 16
+
+#define SLEEP_CHECK_DEATH(X) sleep(X); if(QDELETED(src) || stat == DEAD) return;

code/__DEFINES/mobs/slowdowns.dm

@@ -0,0 +1,10 @@
+/// How much someone is slowed from pulling a prone human
+#define PULL_PRONE_SLOWDOWN 0.6
+/// How much someone is slowed from fireman carrying a human
+#define FIREMAN_CARRY_SLOWDOWN 0
+/// How much someone is slowed by piggybacking a human
+#define PIGGYBACK_CARRY_SLOWDOWN 1
+/// slowdown when in softcrit. Note that crawling slowdown will also apply at the same time!
+#define SOFTCRIT_ADD_SLOWDOWN 2
+/// slowdown when crawling
+#define CRAWLING_ADD_SLOWDOWN 4

code/__DEFINES/obj_flags.dm

@@ -38,11 +38,12 @@
 #define BLOCK_GAS_SMOKE_EFFECT	(1<<2)	//blocks the effect that chemical clouds would have on a mob --glasses, mask and helmets ONLY!
 #define ALLOWINTERNALS		  	(1<<3)	//mask allows internals
 #define NOSLIP                  (1<<4)	//prevents from slipping on wet floors, in space etc
-#define THICKMATERIAL			(1<<5)	//prevents syringes, parapens and hypos if the external suit or helmet (if targeting head) has this flag. Example: space suits, biosuit, bombsuits, thick suits that cover your body.
-#define VOICEBOX_TOGGLABLE 		(1<<6)	//The voicebox in this clothing can be toggled.
-#define VOICEBOX_DISABLED 		(1<<7)	//The voicebox is currently turned off.
-#define IGNORE_HAT_TOSS			(1<<8)	//Hats with negative effects when worn (i.e the tinfoil hat).
-#define SCAN_REAGENTS			(1<<9)	// Allows helmets and glasses to scan reagents.
+#define NOSLIP_ICE				(1<<5)	 //prevents from slipping on frozen floors
+#define THICKMATERIAL			(1<<6)	//prevents syringes, parapens and hypos if the external suit or helmet (if targeting head) has this flag. Example: space suits, biosuit, bombsuits, thick suits that cover your body.
+#define VOICEBOX_TOGGLABLE 		(1<<7)	//The voicebox in this clothing can be toggled.
+#define VOICEBOX_DISABLED 		(1<<8)	//The voicebox is currently turned off.
+#define IGNORE_HAT_TOSS			(1<<9)	//Hats with negative effects when worn (i.e the tinfoil hat).
+#define SCAN_REAGENTS			(1<<10)	// Allows helmets and glasses to scan reagents.
 
 // Flags for the organ_flags var on /obj/item/organ
 

code/__DEFINES/radio.dm

@@ -65,6 +65,7 @@
 #define FREQ_ENGINEERING 1357  // Engineering comms frequency, orange
 #define FREQ_SECURITY 1359  // Security comms frequency, red
 
+#define FREQ_HOLOGRID_SOLUTION 1433
 #define FREQ_STATUS_DISPLAYS 1435
 #define FREQ_ATMOS_ALARMS 1437  // air alarms <-> alert computers
 #define FREQ_ATMOS_CONTROL 1439  // air alarms <-> vents and scrubbers

code/__DEFINES/research/stock_parts.dm

@@ -0,0 +1,5 @@
+// the clamps are just sanity checks.
+/// Efficiency scaling for stock part level to material usage. All code concerning lathing and production from raw material sheet should be using this.
+#define STANDARD_PART_LEVEL_LATHE_COEFFICIENT(level)		clamp(1 - (level * 0.1), 0, 1)
+/// Efficiency scaling for stock part level to ore factor. All code concerning lathing and production from raw ores to raw material sheets should be using this.
+#define STANDARD_PART_LEVEL_ORE_COEFFICIENT(level)			clamp(1 + (level * 0.125), 1, 10)

code/__DEFINES/skills/defines.dm

@@ -29,6 +29,8 @@
 #define DEF_SKILL_GAIN					1
 #define SKILL_GAIN_SURGERY_PER_STEP		0.25
 
+#define SKILL_AFFINITY_MOOD_BONUS 		1.25
+
 ///Items skill_flags and other defines
 #define SKILL_USE_TOOL			(1<<0)
 #define SKILL_TRAINING_TOOL		(1<<1)
@@ -39,6 +41,8 @@
 #define SKILL_STAMINA_COST		(1<<6) //Influences the stamina cost from weapon usage.
 #define SKILL_THROW_STAM_COST	(1<<7)
 #define SKILL_COMBAT_MODE		(1<<8) //The user must have combat mode on.
+#define SKILL_USE_MOOD			(1<<9) //Is the skill negatively affected by bad mood.
+#define SKILL_TRAIN_MOOD		(1<<10) //Is this skill training affected by good mood.
 
 ///competency_threshold index defines
 #define THRESHOLD_COMPETENT	1

code/__DEFINES/skills/helpers.dm

@@ -1,41 +1,3 @@
-/**
-  *Generic delay calculation macro for various delayed actions.
-  *The skill to check must be an instance, not a path or list.
-  */
-#define SKILL_MODIFIER(to_check, holder, target, threshold) \
-	var/___value;\
-	switch(to_check.progression_type){\
-		if(SKILL_PROGRESSION_LEVEL){\
-			___value = LAZYACCESS(holder.skill_levels, to_check.type)\
-		} else {\
-			___value = LAZYACCESS(holder.skills, to_check.type)\
-		}\
-	}\
-	target /= (1+(___value-to_check.competency_thresholds[threshold])*to_check.competency_mults[threshold])
-
-/// This is the one that accepts typepaths and lists. if flags are enabled, an associative value check will be done.
-#define LIST_SKILL_MODIFIER(list, holder, target, threshold, flags, bad_flags) \
-	var/___sum = 0;\
-	var/___divisor = 0;\
-	for(var/_S in list){\
-		if((flags && !(list[_S] & (flags))) || (bad_flags && list[_S] & (bad_flags))){\
-			continue\
-		}\
-		var/___value;\
-		var/datum/skill/___S = GLOB.skill_datums[_S];\
-		switch(___S.progression_type){\
-			if(SKILL_PROGRESSION_LEVEL){\
-				___value = LAZYACCESS(holder.skill_levels, ___S.type)\
-			} else {\
-				___value = LAZYACCESS(holder.skills, ___S.type)\
-			}\
-		}\
-		___sum += (1+(___value - ___S.competency_thresholds[threshold])*___S.competency_mults[threshold]);\
-		___divisor++\
-	}\
-	if(___divisor){\
-		target /= (___sum/___divisor)\
-	}
 
 //How experience levels are calculated.
 #define XP_LEVEL(std, multi, lvl) (std*((multi**lvl)/(multi-1))-std/(multi-1)) //don't use 1 as multi, you'll get division by zero errors

code/__DEFINES/status_effects.dm

@@ -34,6 +34,8 @@
 
 #define STATUS_EFFECT_HIPPOCRATIC_OATH /datum/status_effect/hippocraticOath //Gives you an aura of healing as well as regrowing the Rod of Asclepius if lost
 
+#define STATUS_EFFECT_REGENERATIVE_CORE /datum/status_effect/regenerative_core	//removes damage slowdown while giving a slow regenerating effect
+
 /////////////
 // DEBUFFS //
 /////////////
@@ -78,7 +80,7 @@
 
 #define STATUS_EFFECT_CRUSHERMARK /datum/status_effect/crusher_mark //if struck with a proto-kinetic crusher, takes a ton of damage
 
-#define STATUS_EFFECT_SAWBLEED /datum/status_effect/saw_bleed //if the bleed builds up enough, takes a ton of damage
+#define STATUS_EFFECT_SAWBLEED /datum/status_effect/stacking/saw_bleed //if the bleed builds up enough, takes a ton of damage
 
 #define STATUS_EFFECT_NECKSLICE /datum/status_effect/neck_slice //Creates the flavor messages for the neck-slice
 

code/__DEFINES/traits.dm

@@ -78,6 +78,7 @@
 #define TRAIT_MONKEYLIKE		"monkeylike" //sets IsAdvancedToolUser to FALSE
 #define TRAIT_PACIFISM			"pacifism"
 #define TRAIT_IGNORESLOWDOWN	"ignoreslow"
+#define TRAIT_IGNOREDAMAGESLOWDOWN "ignoredamageslowdown"
 #define TRAIT_DEATHCOMA			"deathcoma" //Causes death-like unconsciousness
 #define TRAIT_FAKEDEATH			"fakedeath" //Makes the owner appear as dead to most forms of medical examination
 #define TRAIT_DISFIGURED		"disfigured"
@@ -187,7 +188,7 @@
 #define TRAIT_NO_INTERNALS		"no-internals"
 #define TRAIT_NO_ALCOHOL		"alcohol_intolerance"
 #define TRAIT_MUTATION_STASIS			"mutation_stasis" //Prevents processed genetics mutations from processing.
-#define TRAIT_FAST_PUMP				"fast_pump"	
+#define TRAIT_FAST_PUMP				"fast_pump"
 
 // mobility flag traits
 // IN THE FUTURE, IT WOULD BE NICE TO DO SOMETHING SIMILAR TO https://github.com/tgstation/tgstation/pull/48923/files (ofcourse not nearly the same because I have my.. thoughts on it)

code/__HELPERS/areas.dm

@@ -58,6 +58,11 @@ GLOBAL_LIST_INIT(typecache_powerfailure_safe_areas, typecacheof(/area/engine/eng
 	else if(isarea(areatype))
 		var/area/areatemp = areatype
 		areatype = areatemp.type
+	else if(islist(areatype))
+		var/list/turfs = list()
+		for(var/A in areatype)
+			turfs += get_area_turfs(A)
+		return turfs
 	else if(!ispath(areatype))
 		return null
 

code/__HELPERS/mobs.dm

@@ -163,9 +163,11 @@
 		"tail_lizard"		= pick(GLOB.tails_list_lizard),
 		"tail_human"		= "None",
 		"wings"				= "None",
+		"wings_color"		= "FFF",
 		"deco_wings"		= "None",
 		"snout"				= pick(GLOB.snouts_list),
-		"horns"				= pick(GLOB.horns_list),
+		"horns"				= "None",
+		"horns_color"		= "85615a",
 		"ears"				= "None",
 		"frills"			= pick(GLOB.frills_list),
 		"spines"			= pick(GLOB.spines_list),
@@ -174,7 +176,7 @@
 		"caps"				= pick(GLOB.caps_list),
 		"insect_wings"		= pick(GLOB.insect_wings_list),
 		"insect_fluff"		= "None",
-		"insect_markings"     = pick(GLOB.insect_markings_list),
+		"insect_markings"	= pick(GLOB.insect_markings_list),
 		"taur"				= "None",
 		"mam_body_markings" = snowflake_markings_list.len ? pick(snowflake_markings_list) : "None",
 		"mam_ears" 			= snowflake_ears_list ? pick(snowflake_ears_list) : "None",

code/__HELPERS/unsorted.dm

@@ -434,6 +434,29 @@ Turf and target are separate in case you want to teleport some distance from a t
 
 	return locate(x,y,A.z)
 
+/**
+  * Get ranged target turf, but with direct targets as opposed to directions
+  *
+  * Starts at atom A and gets the exact angle between A and target
+  * Moves from A with that angle, Range amount of times, until it stops, bound to map size
+  * Arguments:
+  * * A - Initial Firer / Position
+  * * target - Target to aim towards
+  * * range - Distance of returned target turf from A
+  * * offset - Angle offset, 180 input would make the returned target turf be in the opposite direction
+  */
+/proc/get_ranged_target_turf_direct(atom/A, atom/target, range, offset)
+	var/angle = arctan(target.x - A.x, target.y - A.y)
+	if(offset)
+		angle += offset
+	var/turf/T = get_turf(A)
+	for(var/i in 1 to range)
+		var/turf/check = locate(A.x + cos(angle) * i, A.y + sin(angle) * i, A.z)
+		if(!check)
+			break
+		T = check
+
+	return T
 
 // returns turf relative to A offset in dx and dy tiles
 // bound to map limits

code/_globalvars/bitfields.dm

@@ -266,6 +266,16 @@ GLOBAL_LIST_INIT(bitfields, list(
 		"STORAGE_LIMIT_COMBINED_W_CLASS" = STORAGE_LIMIT_COMBINED_W_CLASS,
 		"STORAGE_LIMIT_VOLUME" = STORAGE_LIMIT_VOLUME
 	),
+	"mutantrace_variation" = list(
+		"STYLE_DIGITIGRADE" = STYLE_DIGITIGRADE,
+		"STYLE_MUZZLE" = STYLE_MUZZLE,
+		"STYLE_SNEK_TAURIC" = STYLE_SNEK_TAURIC,
+		"STYLE_PAW_TAURIC" = STYLE_PAW_TAURIC,
+		"STYLE_HOOF_TAURIC" = STYLE_HOOF_TAURIC,
+		"STYLE_NO_ANTHRO_ICON" = STYLE_NO_ANTHRO_ICON,
+		"USE_SNEK_CLIP_MASK" = USE_SNEK_CLIP_MASK,
+		"USE_QUADRUPED_CLIP_MASK" = USE_QUADRUPED_CLIP_MASK
+	),
 	"vis_flags" = list(
 		"VIS_INHERIT_ICON" = VIS_INHERIT_ICON,
 		"VIS_INHERIT_ICON_STATE" = VIS_INHERIT_ICON_STATE,

code/_globalvars/lists/flavor_misc.dm

@@ -137,8 +137,8 @@ GLOBAL_LIST_INIT(jumpsuitlist, list(PREF_SUIT, PREF_SKIRT))
 #define UPLINK_PEN		"Pen" //like a real spy!
 GLOBAL_LIST_INIT(uplink_spawn_loc_list, list(UPLINK_PDA, UPLINK_RADIO, UPLINK_PEN))
 
-	//Female Uniforms
-GLOBAL_LIST_EMPTY(female_clothing_icons)
+//List of cached alpha masked icons.
+GLOBAL_LIST_EMPTY(alpha_masked_worn_icons)
 
 	//radical shit
 GLOBAL_LIST_INIT(hit_appends, list("-OOF", "-ACK", "-UGH", "-HRNK", "-HURGH", "-GLORF"))

code/_onclick/hud/_defines.dm

@@ -162,7 +162,7 @@
 #define ui_ghost_orbit "SOUTH:6,CENTER-1:24"
 #define ui_ghost_reenter_corpse "SOUTH:6,CENTER:24"
 #define ui_ghost_teleport "SOUTH:6,CENTER+1:24"
-#define ui_ghost_pai "SOUTH: 6, CENTER+2:24"
+#define ui_ghost_spawners "SOUTH: 6, CENTER+2:24"
 
 
 //UI position overrides for 1:1 screen layout. (default is 7:5)

code/_onclick/hud/ghost.dm

@@ -36,13 +36,13 @@
 	var/mob/dead/observer/G = usr
 	G.dead_tele()
 
-/obj/screen/ghost/pai
-	name = "pAI Candidate"
-	icon_state = "pai"
+/obj/screen/ghost/spawners
+	name = "Ghost role spawners"
+	icon_state = "spawners"
 
-/obj/screen/ghost/pai/Click()
+/obj/screen/ghost/spawners/Click()
 	var/mob/dead/observer/G = usr
-	G.register_pai()
+	G.open_spawners_menu()
 
 /datum/hud/ghost/New(mob/owner)
 	..()
@@ -68,8 +68,8 @@
 	using.hud = src
 	static_inventory += using
 
-	using = new /obj/screen/ghost/pai()
-	using.screen_loc = ui_ghost_pai
+	using = new /obj/screen/ghost/spawners()
+	using.screen_loc = ui_ghost_spawners
 	using.hud = src
 	static_inventory += using
 

code/_onclick/item_attack.dm

@@ -118,7 +118,7 @@
 		bad_flag |= SKILL_COMBAT_MODE //blacklist combat skills.
 	if(I.used_skills && user.mind)
 		if(totitemdamage)
-			LIST_SKILL_MODIFIER(I.used_skills, user.mind.skill_holder, totitemdamage, I.skill_difficulty, SKILL_ATTACK_OBJ, bad_flag)
+			totitemdamage = user.mind.skill_holder.item_action_skills_mod(I, totitemdamage, I.skill_difficulty, SKILL_ATTACK_OBJ, bad_flag)
 		for(var/skill in I.used_skills)
 			if(!(I.used_skills[skill] & SKILL_TRAIN_ATTACK_OBJ))
 				continue
@@ -163,7 +163,7 @@
 	if(!user.mind || !I.used_skills)
 		return
 	if(.)
-		LIST_SKILL_MODIFIER(I.used_skills, user.mind.skill_holder, ., I.skill_difficulty, SKILL_ATTACK_MOB, bad_flag)
+		. = user.mind.skill_holder.item_action_skills_mod(., I.skill_difficulty, SKILL_ATTACK_MOB, bad_flag)
 	for(var/skill in I.used_skills)
 		if(!(I.used_skills[skill] & SKILL_TRAIN_ATTACK_MOB))
 			continue
@@ -216,7 +216,7 @@
 		. *= STAM_COST_NO_COMBAT_MULT
 		bad_flag |= SKILL_COMBAT_MODE
 	if(used_skills && user.mind)
-		LIST_SKILL_MODIFIER(used_skills, user.mind.skill_holder, ., skill_difficulty, flags, bad_flag)
+		. = user.mind.skill_holder.item_action_skills_mod(., skill_difficulty, flags, bad_flag, FALSE)
 
 /// How long this staggers for. 0 and negatives supported.
 /obj/item/proc/melee_stagger_duration(force_override)

code/controllers/configuration/entries/game_options.dm

@@ -348,6 +348,11 @@
 	config_entry_value = 16
 	min_val = 0
 
+/datum/config_entry/number/icemoon_budget
+	config_entry_value = 90
+	integer = FALSE
+	min_val = 0
+
 /datum/config_entry/number/station_space_budget
 	config_entry_value = 10
 	min_val = 0

code/controllers/subsystem/mapping.dm

@@ -16,6 +16,8 @@ SUBSYSTEM_DEF(mapping)
 	var/list/ruins_templates = list()
 	var/list/space_ruins_templates = list()
 	var/list/lava_ruins_templates = list()
+	var/list/ice_ruins_templates = list()
+	var/list/ice_ruins_underground_templates = list()
 	var/list/station_ruins_templates = list()
 	var/datum/space_level/isolated_ruins_z //Created on demand during ruin loading.
 
@@ -102,19 +104,32 @@ SUBSYSTEM_DEF(mapping)
 	loading_ruins = TRUE
 	var/list/lava_ruins = levels_by_trait(ZTRAIT_LAVA_RUINS)
 	if (lava_ruins.len)
-		seedRuins(lava_ruins, CONFIG_GET(number/lavaland_budget), /area/lavaland/surface/outdoors/unexplored, lava_ruins_templates)
+		seedRuins(lava_ruins, CONFIG_GET(number/lavaland_budget), list(/area/lavaland/surface/outdoors/unexplored), lava_ruins_templates)
 		for (var/lava_z in lava_ruins)
 			spawn_rivers(lava_z)
 
+	var/list/ice_ruins = levels_by_trait(ZTRAIT_ICE_RUINS)
+	if (ice_ruins.len)
+		// needs to be whitelisted for underground too so place_below ruins work
+		seedRuins(ice_ruins, CONFIG_GET(number/icemoon_budget), list(/area/icemoon/surface/outdoors/unexplored, /area/icemoon/underground/unexplored), ice_ruins_templates)
+		for (var/ice_z in ice_ruins)
+			spawn_rivers(ice_z, 4, /turf/open/openspace/icemoon, /area/icemoon/surface/outdoors/unexplored/rivers)
+
+	var/list/ice_ruins_underground = levels_by_trait(ZTRAIT_ICE_RUINS_UNDERGROUND)
+	if (ice_ruins_underground.len)
+		seedRuins(ice_ruins_underground, CONFIG_GET(number/icemoon_budget), list(/area/icemoon/underground/unexplored), ice_ruins_underground_templates)
+		for (var/ice_z in ice_ruins_underground)
+			spawn_rivers(ice_z, 4, level_trait(ice_z, ZTRAIT_BASETURF), /area/icemoon/underground/unexplored/rivers)
+
 	// Generate deep space ruins
 	var/list/space_ruins = levels_by_trait(ZTRAIT_SPACE_RUINS)
 	if (space_ruins.len)
-		seedRuins(space_ruins, CONFIG_GET(number/space_budget), /area/space, space_ruins_templates)
+		seedRuins(space_ruins, CONFIG_GET(number/space_budget), list(/area/space), space_ruins_templates)
 
 	// Generate station space ruins
 	var/list/station_ruins = levels_by_trait(ZTRAIT_STATION)
 	if (station_ruins.len)
-		seedRuins(station_ruins, CONFIG_GET(number/station_space_budget), /area/space/station_ruins, station_ruins_templates)
+		seedRuins(station_ruins, (SSmapping.config.station_ruin_budget < 0) ? CONFIG_GET(number/station_space_budget) : SSmapping.config.station_ruin_budget, list(/area/space/station_ruins), station_ruins_templates)
 	SSmapping.seedStation()
 	loading_ruins = FALSE
 #endif
@@ -182,6 +197,8 @@ SUBSYSTEM_DEF(mapping)
 	ruins_templates = SSmapping.ruins_templates
 	space_ruins_templates = SSmapping.space_ruins_templates
 	lava_ruins_templates = SSmapping.lava_ruins_templates
+	ice_ruins_templates = SSmapping.ice_ruins_templates
+	ice_ruins_underground_templates = SSmapping.ice_ruins_underground_templates
 	station_ruins_templates = SSmapping.station_ruins_templates
 	shuttle_templates = SSmapping.shuttle_templates
 	shelter_templates = SSmapping.shelter_templates
@@ -196,7 +213,7 @@ SUBSYSTEM_DEF(mapping)
 
 	z_list = SSmapping.z_list
 
-/datum/controller/subsystem/mapping/proc/LoadGroup(list/errorList, name, path, files, list/traits, list/default_traits, silent = FALSE)
+/datum/controller/subsystem/mapping/proc/LoadGroup(list/errorList, name, path, files, list/traits, list/default_traits, silent = FALSE, orientation = SOUTH)
 	. = list()
 	var/start_time = REALTIMEOFDAY
 
@@ -236,7 +253,7 @@ SUBSYSTEM_DEF(mapping)
 	// load the maps
 	for (var/P in parsed_maps)
 		var/datum/parsed_map/pm = P
-		if (!pm.load(1, 1, start_z + parsed_maps[P], no_changeturf = TRUE))
+		if (!pm.load(1, 1, start_z + parsed_maps[P], no_changeturf = TRUE, orientation = orientation))
 			errorList |= pm.original_path
 	if(!silent)
 		INIT_ANNOUNCE("Loaded [name] in [(REALTIMEOFDAY - start_time)/10]s!")
@@ -252,7 +269,7 @@ SUBSYSTEM_DEF(mapping)
 	// load the station
 	station_start = world.maxz + 1
 	INIT_ANNOUNCE("Loading [config.map_name]...")
-	LoadGroup(FailedZs, "Station", config.map_path, config.map_file, config.traits, ZTRAITS_STATION)
+	LoadGroup(FailedZs, "Station", config.map_path, config.map_file, config.traits, ZTRAITS_STATION, FALSE, config.orientation)
 
 	if(SSdbcore.Connect())
 		var/datum/DBQuery/query_round_map_name = SSdbcore.NewQuery("UPDATE [format_table_name("round")] SET map_name = '[config.map_name]' WHERE id = [GLOB.round_id]")
@@ -268,7 +285,7 @@ SUBSYSTEM_DEF(mapping)
 	// load mining
 	if(config.minetype == "lavaland")
 		LoadGroup(FailedZs, "Lavaland", "map_files/Mining", "Lavaland.dmm", default_traits = ZTRAITS_LAVALAND)
-	else if (!isnull(config.minetype))
+	else if (!isnull(config.minetype) && config.minetype != "none")
 		INIT_ANNOUNCE("WARNING: An unknown minetype '[config.minetype]' was set! This is being ignored! Update the maploader code!")
 #endif
 
@@ -372,6 +389,7 @@ GLOBAL_LIST_EMPTY(the_station_areas)
 	// Still supporting bans by filename
 	var/list/banned = generateMapList("[global.config.directory]/lavaruinblacklist.txt")
 	banned += generateMapList("[global.config.directory]/spaceruinblacklist.txt")
+	banned += generateMapList("[global.config.directory]/iceruinblacklist.txt")
 	banned += generateMapList("[global.config.directory]/stationruinblacklist.txt")
 
 	for(var/item in sortList(subtypesof(/datum/map_template/ruin), /proc/cmp_ruincost_priority))
@@ -389,6 +407,10 @@ GLOBAL_LIST_EMPTY(the_station_areas)
 
 		if(istype(R, /datum/map_template/ruin/lavaland))
 			lava_ruins_templates[R.name] = R
+		else if(istype(R, /datum/map_template/ruin/icemoon/underground))
+			ice_ruins_underground_templates[R.name] = R
+		else if(istype(R, /datum/map_template/ruin/icemoon))
+			ice_ruins_templates[R.name] = R
 		else if(istype(R, /datum/map_template/ruin/space))
 			space_ruins_templates[R.name] = R
 		else if(istype(R, /datum/map_template/ruin/station))

code/controllers/subsystem/processing/projectiles.dm

@@ -3,7 +3,6 @@ PROCESSING_SUBSYSTEM_DEF(projectiles)
 	wait = 1
 	stat_tag = "PP"
 	flags = SS_NO_INIT|SS_TICKER
-	var/global_max_tick_moves = 10
 	var/global_pixel_speed = 2
 	var/global_iterations_per_move = 16
 

code/datums/components/crafting/recipes/recipes_misc.dm

@@ -413,15 +413,6 @@
 	subcategory = CAT_MISCELLANEOUS
 	category = CAT_MISC
 
-/datum/crafting_recipe/paperwork
-	name = "Filed Paper Work"
-	result =  /obj/item/folder/paperwork_correct
-	time = 10 //Takes time for people to file and complete paper work!
-	tools = list(/obj/item/pen)
-	reqs = list(/obj/item/folder/paperwork = 1)
-	subcategory = CAT_MISCELLANEOUS
-	category = CAT_MISC
-
 /datum/crafting_recipe/coconut_bong
 	name = "Coconut Bong"
 	result = /obj/item/bong/coconut

code/datums/components/knockback.dm

@@ -1,13 +1,18 @@
 /datum/component/knockback
+	/// distance the atom will be thrown
 	var/throw_distance
+	/// whether this can throw anchored targets (tables, etc)
 	var/throw_anchored
+	/// whether this is a gentle throw (default false means people thrown into walls are stunned / take damage)
+	var/throw_gentle
 
-/datum/component/knockback/Initialize(throw_distance=1)
+/datum/component/knockback/Initialize(throw_distance=1, throw_gentle=FALSE)
 	if(!isitem(parent) && !ishostile(parent) && !isgun(parent) && !ismachinery(parent) && !isstructure(parent))
 		return COMPONENT_INCOMPATIBLE
 
 	src.throw_distance = throw_distance
 	src.throw_anchored = throw_anchored
+	src.throw_gentle = throw_gentle
 
 /datum/component/knockback/RegisterWithParent()
 	. = ..()
@@ -22,17 +27,29 @@
 	. = ..()
 	UnregisterSignal(parent, list(COMSIG_ITEM_AFTERATTACK, COMSIG_HOSTILE_ATTACKINGTARGET, COMSIG_PROJECTILE_ON_HIT))
 
+/// triggered after an item attacks something
 /datum/component/knockback/proc/item_afterattack(obj/item/source, atom/target, mob/user, proximity_flag, click_parameters)
 	if(!proximity_flag)
 		return
 	do_knockback(target, user, get_dir(source, target))
 
+/// triggered after a hostile simplemob attacks something
 /datum/component/knockback/proc/hostile_attackingtarget(mob/living/simple_animal/hostile/attacker, atom/target)
 	do_knockback(target, attacker, get_dir(attacker, target))
 
+/// triggered after a projectile hits something
 /datum/component/knockback/proc/projectile_hit(atom/fired_from, atom/movable/firer, atom/target, Angle)
 	do_knockback(target, null, angle2dir(Angle))
 
+
+/**
+  * Throw a target in a direction
+  *
+  * Arguments:
+  * * target - Target atom to throw
+  * * thrower - Thing that caused this atom to be thrown
+  * * throw_dir - Direction to throw the atom
+  */
 /datum/component/knockback/proc/do_knockback(atom/target, mob/thrower, throw_dir)
 	if(!ismovable(target) || throw_dir == null)
 		return
@@ -43,4 +60,4 @@
 		throw_dir = turn(throw_dir, 180)
 		throw_distance *= -1
 	var/atom/throw_target = get_edge_target_turf(throwee, throw_dir)
-	throwee.safe_throw_at(throw_target, throw_distance, 1, thrower)
+	throwee.safe_throw_at(throw_target, throw_distance, 1, thrower)		//, gentle = throw_gentle)

code/datums/components/mood.dm

@@ -1,5 +1,6 @@
 #define MINOR_INSANITY_PEN 5
 #define MAJOR_INSANITY_PEN 10
+#define MOOD_INSANITY_MALUS 0.0054 // per point of sanity below SANITY_DISTURBED, a 40% debuff to skills at rock bottom depression.
 
 /datum/component/mood
 	var/mood //Real happiness
@@ -22,7 +23,6 @@
 	RegisterSignal(parent, COMSIG_CLEAR_MOOD_EVENT, .proc/clear_event)
 	RegisterSignal(parent, COMSIG_MODIFY_SANITY, .proc/modify_sanity)
 	RegisterSignal(parent, COMSIG_LIVING_REVIVE, .proc/on_revive)
-
 	RegisterSignal(parent, COMSIG_MOB_HUD_CREATED, .proc/modify_hud)
 	var/mob/living/owner = parent
 	if(owner.hud_used)
@@ -150,7 +150,7 @@
 		if(8)
 			setSanity(sanity+0.25, maximum=SANITY_GREAT)
 		if(9)
-			setSanity(sanity+0.4, maximum=SANITY_GREAT)
+			setSanity(sanity+0.4, maximum=SANITY_AMAZING)
 
 	HandleNutrition(owner)
 
@@ -166,6 +166,7 @@
 	else if(sanity > maximum && amount > sanity - 0.5)
 		amount = sanity - 0.5
 
+	var/old_sanity = sanity
 	// Disturbed stops you from getting any more sane
 	if(HAS_TRAIT(master, TRAIT_UNSTABLE))
 		sanity = min(amount,sanity)
@@ -197,6 +198,12 @@
 			setInsanityEffect(0)
 			master.remove_movespeed_modifier(MOVESPEED_ID_SANITY)
 			sanity_level = 1
+
+	if(old_sanity > 1 && sanity == 1)
+		RegisterSignal(master, COMSIG_MOB_SKILL_GET_AFFINITY, .proc/on_get_skill_affinity)
+	else if(old_sanity == 1 && sanity < 1)
+		UnregisterSignal(master, COMSIG_MOB_SKILL_GET_AFFINITY)
+
 	//update_mood_icon()
 
 /datum/component/mood/proc/setInsanityEffect(newval)//More code so that the previous proc works
@@ -205,8 +212,13 @@
 	//var/mob/living/master = parent
 	//master.crit_threshold = (master.crit_threshold - insanity_effect) + newval
 	insanity_effect = newval
+	if(insanity_effect)
+		RegisterSignal(parent, COMSIG_MOB_ACTION_SKILL_MOD, .proc/on_mob_action_skill_mod)
+		RegisterSignal(parent, COMSIG_MOB_ITEM_ACTION_SKILLS_MOD, .proc/on_item_action_skills_mod)
+	else
+		UnregisterSignal(parent, list(COMSIG_MOB_ACTION_SKILL_MOD, COMSIG_MOB_ITEM_ACTION_SKILLS_MOD))
 
-/datum/component/mood/proc/modify_sanity(datum/source, amount, minimum = -INFINITY, maximum = INFINITY)
+/datum/component/mood/proc/modify_sanity(datum/source, amount, minimum = SANITY_INSANE, maximum = SANITY_AMAZING)
 	setSanity(sanity + amount, minimum, maximum)
 
 /datum/component/mood/proc/add_event(datum/source, category, type, param) //Category will override any events in the same category, should be unique unless the event is based on the same thing like hunger.
@@ -288,5 +300,39 @@
 	remove_temp_moods()
 	setSanity(initial(sanity))
 
+/datum/component/mood/proc/on_mob_action_skill_mod(mob/source, list/skill_args, list/mod_values)
+	var/datum/skill/S = GLOB.skill_datums[skill_args[ACTION_SKILL_MOD_SKILL]]
+	if(!(S.skill_flags & SKILL_USE_MOOD))
+		return
+	var/debuff = 1 - (SANITY_DISTURBED - sanity) * MOOD_INSANITY_MALUS
+	mod_values[MOD_VALUES_SKILL_MOD] *= skill_args[ACTION_SKILL_MOD_IS_MULTI] ? debuff : 1/debuff
+
+/datum/component/mood/proc/on_item_action_skills_mod(mob/source, list/skill_args, list/mod_values)
+	if(skill_args[ITEM_SKILLS_MOD_BAD_FLAGS] & SKILL_USE_MOOD)
+		return
+	var/divisor = mod_values[MOD_VALUES_ITEM_SKILLS_DIV]
+	if(!divisor)
+		return
+	var/obj/item/I = skill_args[ITEM_SKILLS_MOD_ITEM]
+	var/list/L = mod_values[MOD_VALUES_ITEM_SKILLS_CHECKED]
+	var/skills_len = length(L)
+	var/affected_skills = skills_len
+	for(var/k in L)
+		var/datum/skill/S = k
+		var/our_flags = I.used_skills[S.type]|S.skill_flags
+		if(!(our_flags & SKILL_USE_MOOD))
+			affected_skills--
+	if(!affected_skills)
+		return
+	var/debuff = 1 - (SANITY_DISTURBED - sanity) * MOOD_INSANITY_MALUS * (affected_skills/skills_len)
+	mod_values[MOD_VALUES_ITEM_SKILLS_SUM] *= skill_args[ITEM_SKILLS_MOD_IS_MULTI] ? debuff : 1/debuff
+
+/datum/component/mood/proc/on_get_skill_affinity(mob/source, skill_path, list/return_value)
+	var/datum/skill/S = GLOB.skill_datums[skill_path]
+	if(!S || !(S.skill_flags & SKILL_TRAIN_MOOD))
+		return
+	return_value[1] *= SKILL_AFFINITY_MOOD_BONUS
+
 #undef MINOR_INSANITY_PEN
 #undef MAJOR_INSANITY_PEN
+#undef MOOD_INSANITY_MALUS

code/datums/components/riding.dm

@@ -20,6 +20,8 @@
 	var/ride_check_ridden_incapacitated = FALSE
 	var/list/offhands = list() // keyed list containing all the current riding offsets associated by mob
 
+	var/del_on_unbuckle_all = FALSE
+
 /datum/component/riding/Initialize()
 	if(!ismovable(parent))
 		return COMPONENT_INCOMPATIBLE
@@ -28,8 +30,11 @@
 	RegisterSignal(parent, COMSIG_MOVABLE_MOVED, .proc/vehicle_moved)
 
 /datum/component/riding/proc/vehicle_mob_unbuckle(datum/source, mob/living/M, force = FALSE)
+	var/atom/movable/AM = parent
 	restore_position(M)
 	unequip_buckle_inhands(M)
+	if(del_on_unbuckle_all && !AM.has_buckled_mobs())
+		qdel(src)
 
 /datum/component/riding/proc/vehicle_mob_buckle(datum/source, mob/living/M, force = FALSE)
 	handle_vehicle_offsets()
@@ -194,6 +199,7 @@
 
 ///////Yes, I said humans. No, this won't end well...//////////
 /datum/component/riding/human
+	del_on_unbuckle_all = TRUE
 	var/fireman_carrying = FALSE
 
 /datum/component/riding/human/Initialize()
@@ -261,6 +267,7 @@
 	user.visible_message("<span class='warning'>[AM] pushes [user] off of [AM.p_them()]!</span>")
 
 /datum/component/riding/cyborg
+	del_on_unbuckle_all = TRUE
 
 /datum/component/riding/cyborg/Initialize()
 	. = ..()

code/datums/elements/dusts_on_leaving_area.dm

@@ -1,28 +1,20 @@
 /datum/element/dusts_on_leaving_area
 	element_flags = ELEMENT_DETACH | ELEMENT_BESPOKE
 	id_arg_index = 2
-	var/list/attached_mobs = list()
 	var/list/area_types = list()
 
 /datum/element/dusts_on_leaving_area/Attach(datum/target,types)
 	. = ..()
 	if(!ismob(target))
 		return ELEMENT_INCOMPATIBLE
-	attached_mobs += target
 	area_types = types
-	START_PROCESSING(SSprocessing,src)
+	RegisterSignal(target,COMSIG_ENTER_AREA,.proc/check_dust)
 
 /datum/element/dusts_on_leaving_area/Detach(mob/M)
 	. = ..()
-	if(M in attached_mobs)
-		attached_mobs -= M
-	if(!attached_mobs.len)
-		STOP_PROCESSING(SSprocessing,src)
+	UnregisterSignal(M,COMSIG_ENTER_AREA)
 
-/datum/element/dusts_on_leaving_area/process()
-	for(var/m in attached_mobs)
-		var/mob/M = m
-		var/area/A = get_area(M)
-		if(!(A.type in area_types))
-			M.dust(force = TRUE)
-			Detach(M)
+/datum/element/dusts_on_leaving_area/proc/check_dust(datum/source, area/A)
+	var/mob/M = source
+	if(istype(M) && !(A.type in area_types))
+		M.dust(force = TRUE)

code/datums/elements/snail_crawl.dm

@@ -0,0 +1,31 @@
+/datum/element/snailcrawl
+	element_flags = ELEMENT_DETACH
+
+/datum/element/snailcrawl/Attach(datum/target)
+	. = ..()
+	if(!ismovable(target))
+		return ELEMENT_INCOMPATIBLE
+	var/P
+	if(iscarbon(target))
+		P = .proc/snail_crawl
+	else
+		P = .proc/lubricate
+	RegisterSignal(target, COMSIG_MOVABLE_MOVED, P)
+
+/datum/element/snailcrawl/Detach(mob/living/carbon/target)
+	. = ..()
+	UnregisterSignal(target, COMSIG_MOVABLE_MOVED)
+	if(istype(target))
+		target.remove_movespeed_modifier(/datum/movespeed_modifier/snail_crawl)
+
+/datum/element/snailcrawl/proc/snail_crawl(mob/living/carbon/snail)
+	if(snail.resting && !snail.buckled && lubricate(snail))
+		snail.add_movespeed_modifier(/datum/movespeed_modifier/snail_crawl)
+	else
+		snail.remove_movespeed_modifier(/datum/movespeed_modifier/snail_crawl)
+
+/datum/element/snailcrawl/proc/lubricate(atom/movable/snail)
+	var/turf/open/OT = get_turf(snail)
+	if(istype(OT))
+		OT.MakeSlippery(TURF_WET_LUBE, 20)
+		return TRUE

code/datums/ruins/icemoon.dm

@@ -0,0 +1,112 @@
+// Hey! Listen! Update \config\iceruinblacklist.txt with your new ruins!
+
+/datum/map_template/ruin/icemoon
+	prefix = "_maps/RandomRuins/IceRuins/"
+	allow_duplicates = FALSE
+	cost = 5
+
+// above ground only
+
+/datum/map_template/ruin/icemoon/lust
+	name = "Ruin of Lust"
+	id = "lust"
+	description = "Not exactly what you expected."
+	suffix = "icemoon_surface_lust.dmm"
+
+/datum/map_template/ruin/icemoon/asteroid
+	name = "Asteroid Site"
+	id = "asteroidsite"
+	description = "Surprised to see us here?"
+	suffix = "icemoon_surface_asteroid.dmm"
+
+/datum/map_template/ruin/icemoon/hotsprings
+	name = "Hot Springs"
+	id = "hotsprings"
+	description = "Just relax and take a dip, nothing will go wrong, I swear!"
+	suffix = "icemoon_surface_hotsprings.dmm"
+
+/datum/map_template/ruin/icemoon/engioutpost
+	name = "Engineer Outpost"
+	id = "engioutpost"
+	description = "Blown up by an unfortunate accident."
+	suffix = "icemoon_surface_engioutpost.dmm"
+
+/datum/map_template/ruin/icemoon/fountain
+	name = "Fountain Hall"
+	id = "fountain"
+	description = "The fountain has a warning on the side. DANGER: May have undeclared side effects that only become obvious when implemented."
+	prefix = "_maps/RandomRuins/AnywhereRuins/"
+	suffix = "fountain_hall.dmm"
+
+// above and below ground together
+
+/datum/map_template/ruin/icemoon/mining_site
+	name = "Mining Site"
+	id = "miningsite"
+	description = "Ruins of a site where people once mined with primitive tools for ore."
+	suffix = "icemoon_surface_mining_site.dmm"
+	always_place = TRUE
+	always_spawn_with = list(/datum/map_template/ruin/icemoon/underground/mining_site_below = PLACE_BELOW)
+
+/datum/map_template/ruin/icemoon/underground/mining_site_below
+	name = "Mining Site Underground"
+	id = "miningsite-underground"
+	description = "Who knew ladders could be so useful?"
+	suffix = "icemoon_underground_mining_site.dmm"
+	unpickable = TRUE
+
+// below ground only
+
+/datum/map_template/ruin/icemoon/underground
+	name = "underground ruin"
+
+/datum/map_template/ruin/icemoon/underground/abandonedvillage
+	name = "Abandoned Village"
+	id = "abandonedvillage"
+	description = "Who knows what lies within?"
+	suffix = "icemoon_underground_abandoned_village.dmm"
+
+/datum/map_template/ruin/icemoon/underground/library
+	name = "Buried Library"
+	id = "buriedlibrary"
+	description = "A once grand library, now lost to the confines of the Ice Moon."
+	suffix = "icemoon_underground_library.dmm"
+
+/datum/map_template/ruin/icemoon/underground/wrath
+	name = "Ruin of Wrath"
+	id = "wrath"
+	description = "You'll fight and fight and just keep fighting."
+	suffix = "icemoon_underground_wrath.dmm"
+
+/datum/map_template/ruin/icemoon/underground/lavaland
+	name = "Lavaland Site"
+	id = "lavalandsite"
+	description = "I guess we never really left you huh?"
+	suffix = "icemoon_underground_lavaland.dmm"
+
+/datum/map_template/ruin/icemoon/underground/puzzle
+	name = "Ancient Puzzle"
+	id = "puzzle"
+	description = "Mystery to be solved."
+	suffix = "icemoon_underground_puzzle.dmm"
+
+/datum/map_template/ruin/icemoon/underground/bathhouse
+	name = "Bath House"
+	id = "bathhouse"
+	description = "A taste of paradise, locked in the hell of the Ice Moon."
+	suffix = "icemoon_underground_bathhouse.dmm"
+
+/datum/map_template/ruin/icemoon/underground/wendigo_cave
+	name = "Wendigo Cave"
+	id = "wendigocave"
+	description = "Into the jaws of the beast."
+	suffix = "icemoon_underground_wendigo_cave.dmm"
+
+/datum/map_template/ruin/icemoon/underground/free_golem
+	name = "Free Golem Ship"
+	id = "golem-ship"
+	description = "Lumbering humanoids, made out of precious metals, move inside this ship. They frequently leave to mine more minerals, which they somehow turn into more of them. \
+	Seem very intent on research and individual liberty, and also geology-based naming?"
+	prefix = "_maps/RandomRuins/AnywhereRuins/"
+	suffix = "golem_ship.dmm"
+	allow_duplicates = FALSE

code/datums/ruins/lavaland.dm

@@ -67,7 +67,8 @@
 	description = "Lumbering humanoids, made out of precious metals, move inside this ship. They frequently leave to mine more minerals, which they somehow turn into more of them. \
 	Seem very intent on research and individual liberty, and also geology based naming?"
 	cost = 20
-	suffix = "lavaland_surface_golem_ship.dmm"
+	prefix = "_maps/RandomRuins/AnywhereRuins/"
+	suffix = "golem_ship.dmm"
 	allow_duplicates = FALSE
 
 /datum/map_template/ruin/lavaland/animal_hospital
@@ -175,7 +176,8 @@
 	name = "Fountain Hall"
 	id = "fountain"
 	description = "The fountain has a warning on the side. DANGER: May have undeclared side effects that only become obvious when implemented."
-	suffix = "lavaland_surface_fountain_hall.dmm"
+	prefix = "_maps/RandomRuins/AnywhereRuins/"
+	suffix = "fountain_hall.dmm"
 	cost = 5
 	allow_duplicates = FALSE
 

code/datums/shuttles.dm

@@ -23,14 +23,14 @@
 	mappath = "[prefix][shuttle_id].dmm"
 	. = ..()
 
-/datum/map_template/shuttle/preload_size(path, cache)
+/datum/map_template/shuttle/preload_size(path = mappath, force_cache = FALSE)
 	. = ..(path, TRUE) // Done this way because we still want to know if someone actualy wanted to cache the map
 	if(!cached_map)
 		return
 
 	discover_port_offset()
 
-	if(!cache)
+	if(!cached_map)
 		cached_map = null
 
 /datum/map_template/shuttle/proc/discover_port_offset()
@@ -53,12 +53,11 @@
 				++xcrd
 			--ycrd
 
-/datum/map_template/shuttle/load(turf/T, centered, register=TRUE)
+/datum/map_template/shuttle/load(turf/T, centered = FALSE, orientation = SOUTH, annihilate = default_annihilate, force_cache = FALSE, rotate_placement_to_orientation = FALSE, register = TRUE)
 	. = ..()
 	if(!.)
 		return
-	var/list/turfs = block(	locate(.[MAP_MINX], .[MAP_MINY], .[MAP_MINZ]),
-							locate(.[MAP_MAXX], .[MAP_MAXY], .[MAP_MAXZ]))
+	var/list/turfs = get_last_loaded_turf_block()
 	for(var/i in 1 to turfs.len)
 		var/turf/place = turfs[i]
 		if(istype(place, /turf/open/space)) // This assumes all shuttles are loaded in a single spot then moved to their real destination.

code/datums/skills/_skill.dm

@@ -37,6 +37,8 @@ GLOBAL_LIST_INIT_TYPED(skill_datums, /datum/skill, init_skill_datums())
 	var/list/competency_thresholds = list(0, 0, 0)
 	/// Multiplier of the difference of the holder skill value and the selected threshold.
 	var/list/competency_mults = list(0, 0, 0)
+	/// In which way this skil can affect or be affected through actions.
+	var/skill_flags = SKILL_USE_MOOD|SKILL_TRAIN_MOOD
 
 /**
   * Ensures what someone's setting as a value for this skill is valid.

code/datums/skills/_skill_holder.dm

@@ -39,12 +39,16 @@
   * Grabs our affinity for a skill. !!This is a multiplier!!
   */
 /datum/skill_holder/proc/get_skill_affinity(skill)
+	. = 1
 	if(!ispath(skill, /datum/skill))
 		CRASH("Invalid get_skill_affinity call. Use skill typepaths.")	//until a time when we somehow need text ids for dynamic skills, I'm enforcing this.
 	var/affinity = LAZYACCESS(skill_affinities, skill)
-	if(isnull(affinity))
-		return 1
-	return affinity
+	if(!isnull(affinity))
+		. = affinity
+	var/list/wrapped = list(.)
+	SEND_SIGNAL(owner.current, COMSIG_MOB_SKILL_GET_AFFINITY, skill, wrapped)
+	. = wrapped[1]
+
 
 /**
   * Sets the value of a skill.
@@ -89,6 +93,70 @@
 			return
 	boost_skill_value_to(skill, target_value, silent)
 
+/**
+  * Generic value modifier proc that uses one skill.
+  * Args:
+  * * value : the value to modify, may be a delay, damage, probability.
+  * * threshold : The difficulty of the action, in short. Refer to __DEFINES/skills/defines.dm for the defines.
+  * * modifier_is_multiplier : wheter the modifier is a multiplier or a divisor.
+  */
+/datum/skill_holder/proc/action_skills_mod(skill, value, threshold, modifier_is_multiplier = TRUE)
+	var/mod
+	var/datum/skill/S = GLOB.skill_datums[skill]
+	if(!S)
+		return
+	switch(S.progression_type)
+		if(SKILL_PROGRESSION_LEVEL)
+			mod = LAZYACCESS(skill_levels, S.type)
+		else
+			mod = LAZYACCESS(skills, S.type)
+	mod = (1+(mod-S.competency_thresholds[threshold])*S.competency_mults[threshold])
+
+	var/list/comsig_values = list(mod)
+	SEND_SIGNAL(owner.current, COMSIG_MOB_ACTION_SKILL_MOD, args, comsig_values)
+	mod = comsig_values[MOD_VALUES_SKILL_MOD]
+
+	. = modifier_is_multiplier ? value*mod : value/mod
+
+/**
+  * Generic value modifier proc that uses several skills, intended for items.
+  * Args:
+  * * item/I : the item used in this action. its used_skills list variable contains the skills exercised with it.
+  * * value : the value to modify, may be a delay, damage, probability.
+  * * flags : the required flags that each skill (either in I.used_skills or the skill datum skill_flags) must have to influence
+  * * 			the value.
+  * * bad_flags : the opposite of the above, skills that must not be present to impact the value.
+  * * modifier_is_multiplier : wheter the modifier is a multiplier or a divisor.
+  */
+/datum/skill_holder/proc/item_action_skills_mod(obj/item/I, value, flags = NONE, bad_flags = NONE, modifier_is_multiplier = TRUE)
+	. = value
+	var/sum = 0
+	var/divisor = 0
+	var/list/checked_skills
+	for(var/k in I.used_skills)
+		var/datum/skill/S = GLOB.skill_datums[k]
+		if(!S)
+			continue
+		var/our_flags = (I.used_skills[k]|S.skill_flags)
+		if((flags && !(our_flags & flags)) || (bad_flags && our_flags & bad_flags))
+			continue
+		var/mod
+		switch(S.progression_type)
+			if(SKILL_PROGRESSION_LEVEL)
+				mod = LAZYACCESS(skill_levels, S.type)
+			else
+				mod = LAZYACCESS(skills, S.type)
+		sum += 1+(mod - S.competency_thresholds[I.skill_difficulty])*S.competency_mults[I.skill_difficulty]
+		LAZYADD(checked_skills, S)
+
+	var/list/comsig_values = list(sum, divisor, checked_skills)
+	SEND_SIGNAL(owner.current, COMSIG_MOB_ITEM_ACTION_SKILLS_MOD, args, comsig_values)
+	sum = comsig_values[MOD_VALUES_ITEM_SKILLS_SUM]
+	divisor = comsig_values[MOD_VALUES_ITEM_SKILLS_DIV]
+
+	if(divisor)
+		. = modifier_is_multiplier ? value*(sum/divisor) : value/(sum/divisor)
+
 /**
   * Generates a HTML readout of our skills.
   * Port to tgui-next when?

code/datums/skills/engineering.dm

@@ -2,3 +2,4 @@
 	name = "Wiring"
 	desc = "How proficient and knowledged you are at wiring beyond laying cables on the floor."
 	competency_thresholds = list(JOB_SKILL_BASIC, JOB_SKILL_EXPERT, JOB_SKILL_MASTER)
+	skill_flags = SKILL_USE_MOOD|SKILL_TRAIN_MOOD|SKILL_USE_TOOL|SKILL_TRAINING_TOOL

code/datums/status_effects/buffs.dm

@@ -550,3 +550,30 @@
 			else if(isanimal(L))
 				var/mob/living/simple_animal/SM = L
 				SM.adjustHealth(-3.5, forced = TRUE)
+
+/obj/screen/alert/status_effect/regenerative_core
+	name = "Reinforcing Tendrils"
+	desc = "You can move faster than your broken body could normally handle!"
+	icon_state = "regenerative_core"
+	name = "Regenerative Core Tendrils"
+
+/datum/status_effect/regenerative_core
+	id = "Regenerative Core"
+	duration = 1 MINUTES
+	status_type = STATUS_EFFECT_REPLACE
+	alert_type = /obj/screen/alert/status_effect/regenerative_core
+
+/datum/status_effect/regenerative_core/on_apply()
+	. = ..()
+	ADD_TRAIT(owner, TRAIT_IGNOREDAMAGESLOWDOWN, "regenerative_core")
+	owner.adjustBruteLoss(-25)
+	if(!AmBloodsucker(owner))	//use your coffin you lazy bastard
+		owner.adjustFireLoss(-25)
+	owner.remove_CC()
+	owner.bodytemperature = BODYTEMP_NORMAL
+	return TRUE
+
+/datum/status_effect/regenerative_core/on_remove()
+	. = ..()
+	REMOVE_TRAIT(owner, TRAIT_IGNOREDAMAGESLOWDOWN, "regenerative_core")
+	owner.updatehealth()

code/datums/status_effects/debuffs.dm

@@ -391,78 +391,34 @@
 	owner.underlays -= marked_underlay //if this is being called, we should have an owner at this point.
 	..()
 
-/datum/status_effect/saw_bleed
+/datum/status_effect/stacking/saw_bleed
 	id = "saw_bleed"
-	duration = -1 //removed under specific conditions
 	tick_interval = 6
-	alert_type = null
-	var/mutable_appearance/bleed_overlay
-	var/mutable_appearance/bleed_underlay
-	var/bleed_amount = 3
-	var/bleed_buildup = 3
-	var/delay_before_decay = 5
+	delay_before_decay = 5
+	stack_threshold = 10
+	max_stacks = 10
+	overlay_file = 'icons/effects/bleed.dmi'
+	underlay_file = 'icons/effects/bleed.dmi'
+	overlay_state = "bleed"
+	underlay_state = "bleed"
 	var/bleed_damage = 200
-	var/needs_to_bleed = FALSE
 
-/datum/status_effect/saw_bleed/Destroy()
-	if(owner)
-		owner.cut_overlay(bleed_overlay)
-		owner.underlays -= bleed_underlay
-	QDEL_NULL(bleed_overlay)
-	return ..()
+/datum/status_effect/stacking/saw_bleed/fadeout_effect()
+	new /obj/effect/temp_visual/bleed(get_turf(owner))
 
-/datum/status_effect/saw_bleed/on_apply()
-	if(owner.stat == DEAD)
-		return FALSE
-	bleed_overlay = mutable_appearance('icons/effects/bleed.dmi', "bleed[bleed_amount]")
-	bleed_underlay = mutable_appearance('icons/effects/bleed.dmi', "bleed[bleed_amount]")
-	var/icon/I = icon(owner.icon, owner.icon_state, owner.dir)
-	var/icon_height = I.Height()
-	bleed_overlay.pixel_x = -owner.pixel_x
-	bleed_overlay.pixel_y = FLOOR(icon_height * 0.25, 1)
-	bleed_overlay.transform = matrix() * (icon_height/world.icon_size) //scale the bleed overlay's size based on the target's icon size
-	bleed_underlay.pixel_x = -owner.pixel_x
-	bleed_underlay.transform = matrix() * (icon_height/world.icon_size) * 3
-	bleed_underlay.alpha = 40
-	owner.add_overlay(bleed_overlay)
-	owner.underlays += bleed_underlay
-	return ..()
+/datum/status_effect/stacking/saw_bleed/threshold_cross_effect()
+	owner.adjustBruteLoss(bleed_damage)
+	var/turf/T = get_turf(owner)
+	new /obj/effect/temp_visual/bleed/explode(T)
+	for(var/d in GLOB.alldirs)
+		new /obj/effect/temp_visual/dir_setting/bloodsplatter(T, d)
+	playsound(T, "desceration", 100, TRUE, -1)
 
-/datum/status_effect/saw_bleed/tick()
-	if(owner.stat == DEAD)
-		qdel(src)
-	else
-		add_bleed(-1)
-
-/datum/status_effect/saw_bleed/proc/add_bleed(amount)
-	owner.cut_overlay(bleed_overlay)
-	owner.underlays -= bleed_underlay
-	bleed_amount += amount
-	if(bleed_amount)
-		if(bleed_amount >= 10)
-			needs_to_bleed = TRUE
-			qdel(src)
-		else
-			if(amount > 0)
-				tick_interval += delay_before_decay
-			bleed_overlay.icon_state = "bleed[bleed_amount]"
-			bleed_underlay.icon_state = "bleed[bleed_amount]"
-			owner.add_overlay(bleed_overlay)
-			owner.underlays += bleed_underlay
-	else
-		qdel(src)
-
-/datum/status_effect/saw_bleed/on_remove()
-	. = ..()
-	if(needs_to_bleed)
-		var/turf/T = get_turf(owner)
-		new /obj/effect/temp_visual/bleed/explode(T)
-		for(var/d in GLOB.alldirs)
-			new /obj/effect/temp_visual/dir_setting/bloodsplatter(T, d)
-		playsound(T, "desceration", 200, 1, -1)
-		owner.adjustBruteLoss(bleed_damage)
-	else
-		new /obj/effect/temp_visual/bleed(get_turf(owner))
+/datum/status_effect/stacking/saw_bleed/bloodletting
+	id = "bloodletting"
+	stack_threshold = 7
+	max_stacks = 7
+	bleed_damage = 20
 
 /datum/status_effect/neck_slice
 	id = "neck_slice"

code/datums/status_effects/status_effect.dm

@@ -7,7 +7,6 @@
 	var/duration = -1 //How long the status effect lasts in DECISECONDS. Enter -1 for an effect that never ends unless removed through some means.
 	var/tick_interval = 10 //How many deciseconds between ticks, approximately. Leave at 10 for every second.
 	var/mob/living/owner //The mob affected by the status effect.
-	var/status_type = STATUS_EFFECT_UNIQUE //How many of the effect can be on one mob, and what happens when you try to add another
 	var/on_remove_on_mob_delete = FALSE //if we call on_remove() when the mob is deleted
 	var/examine_text //If defined, this text will appear when the mob is examined - to use he, she etc. use "SUBJECTPRONOUN" and replace it in the examines themselves
 	var/alert_type = /obj/screen/alert/status_effect //the alert thrown by the status effect, contains name and description
@@ -16,6 +15,8 @@
 	/// If this is TRUE, the user will have sprint forcefully disabled while this is active.
 	var/blocks_sprint = FALSE
 	var/obj/screen/alert/status_effect/linked_alert = null //the alert itself, if it exists
+	/// How many of the effect can be on one mob, and what happens when you try to add another
+	var/status_type = STATUS_EFFECT_UNIQUE
 
 /datum/status_effect/New(list/arguments)
 	on_creation(arglist(arguments))
@@ -67,6 +68,9 @@
 
 /datum/status_effect/proc/tick() //Called every tick.
 
+/datum/status_effect/proc/before_remove() //! Called before being removed; returning FALSE will cancel removal
+	return TRUE
+
 /datum/status_effect/proc/on_remove() //Called whenever the buff expires or is removed; do note that at the point this is called, it is out of the owner's status_effects but owner is not yet null
 	SHOULD_CALL_PARENT(TRUE)
 	REMOVE_TRAIT(owner, TRAIT_COMBAT_MODE_LOCKED, src)
@@ -123,12 +127,13 @@
 	S1 = new effect(arguments)
 	. = S1
 
-/mob/living/proc/remove_status_effect(effect) //removes all of a given status effect from this mob, returning TRUE if at least one was removed
+/mob/living/proc/remove_status_effect(effect, ...) //removes all of a given status effect from this mob, returning TRUE if at least one was removed
 	. = FALSE
+	var/list/arguments = args.Copy(2)
 	if(status_effects)
 		var/datum/status_effect/S1 = effect
 		for(var/datum/status_effect/S in status_effects)
-			if(initial(S1.id) == S.id)
+			if(initial(S1.id) == S.id && S.before_remove(arguments))
 				qdel(S)
 				. = TRUE
 
@@ -147,3 +152,129 @@
 		for(var/datum/status_effect/S in status_effects)
 			if(initial(S1.id) == S.id)
 				. += S
+
+//////////////////////
+// STACKING EFFECTS //
+//////////////////////
+
+/datum/status_effect/stacking
+	id = "stacking_base"
+	duration = -1 //removed under specific conditions
+	alert_type = null
+	var/stacks = 0 //how many stacks are accumulated, also is # of stacks that target will have when first applied
+	var/delay_before_decay //deciseconds until ticks start occuring, which removes stacks (first stack will be removed at this time plus tick_interval)
+	tick_interval = 10 //deciseconds between decays once decay starts
+	var/stack_decay = 1 //how many stacks are lost per tick (decay trigger)
+	var/stack_threshold //special effects trigger when stacks reach this amount
+	var/max_stacks //stacks cannot exceed this amount
+	var/consumed_on_threshold = TRUE //if status should be removed once threshold is crossed
+	var/threshold_crossed = FALSE //set to true once the threshold is crossed, false once it falls back below
+	var/overlay_file
+	var/underlay_file
+	var/overlay_state // states in .dmi must be given a name followed by a number which corresponds to a number of stacks. put the state name without the number in these state vars
+	var/underlay_state // the number is concatonated onto the string based on the number of stacks to get the correct state name
+	var/mutable_appearance/status_overlay
+	var/mutable_appearance/status_underlay
+
+/datum/status_effect/stacking/proc/threshold_cross_effect() //what happens when threshold is crossed
+
+/datum/status_effect/stacking/proc/stacks_consumed_effect() //runs if status is deleted due to threshold being crossed
+
+/datum/status_effect/stacking/proc/fadeout_effect() //runs if status is deleted due to being under one stack
+
+/datum/status_effect/stacking/proc/stack_decay_effect() //runs every time tick() causes stacks to decay
+
+/datum/status_effect/stacking/proc/on_threshold_cross()
+	threshold_cross_effect()
+	if(consumed_on_threshold)
+		stacks_consumed_effect()
+		qdel(src)
+
+/datum/status_effect/stacking/proc/on_threshold_drop()
+
+/datum/status_effect/stacking/proc/can_have_status()
+	return owner.stat != DEAD
+
+/datum/status_effect/stacking/proc/can_gain_stacks()
+	return owner.stat != DEAD
+
+/datum/status_effect/stacking/tick()
+	if(!can_have_status())
+		qdel(src)
+	else
+		add_stacks(-stack_decay)
+		stack_decay_effect()
+
+/datum/status_effect/stacking/proc/add_stacks(stacks_added)
+	if(stacks_added > 0 && !can_gain_stacks())
+		return FALSE
+	owner.cut_overlay(status_overlay)
+	owner.underlays -= status_underlay
+	stacks += stacks_added
+	if(stacks > 0)
+		if(stacks >= stack_threshold && !threshold_crossed) //threshold_crossed check prevents threshold effect from occuring if changing from above threshold to still above threshold
+			threshold_crossed = TRUE
+			on_threshold_cross()
+			if(consumed_on_threshold)
+				return
+		else if(stacks < stack_threshold && threshold_crossed)
+			threshold_crossed = FALSE //resets threshold effect if we fall below threshold so threshold effect can trigger again
+			on_threshold_drop()
+		if(stacks_added > 0)
+			tick_interval += delay_before_decay //refreshes time until decay
+		stacks = min(stacks, max_stacks)
+		status_overlay.icon_state = "[overlay_state][stacks]"
+		status_underlay.icon_state = "[underlay_state][stacks]"
+		owner.add_overlay(status_overlay)
+		owner.underlays += status_underlay
+	else
+		fadeout_effect()
+		qdel(src) //deletes status if stacks fall under one
+
+/datum/status_effect/stacking/on_creation(mob/living/new_owner, stacks_to_apply)
+	. = ..()
+	if(.)
+		add_stacks(stacks_to_apply)
+
+/datum/status_effect/stacking/on_apply()
+	if(!can_have_status())
+		return FALSE
+	status_overlay = mutable_appearance(overlay_file, "[overlay_state][stacks]")
+	status_underlay = mutable_appearance(underlay_file, "[underlay_state][stacks]")
+	var/icon/I = icon(owner.icon, owner.icon_state, owner.dir)
+	var/icon_height = I.Height()
+	status_overlay.pixel_x = -owner.pixel_x
+	status_overlay.pixel_y = FLOOR(icon_height * 0.25, 1)
+	status_overlay.transform = matrix() * (icon_height/world.icon_size) //scale the status's overlay size based on the target's icon size
+	status_underlay.pixel_x = -owner.pixel_x
+	status_underlay.transform = matrix() * (icon_height/world.icon_size) * 3
+	status_underlay.alpha = 40
+	owner.add_overlay(status_overlay)
+	owner.underlays += status_underlay
+	return ..()
+
+/datum/status_effect/stacking/Destroy()
+	if(owner)
+		owner.cut_overlay(status_overlay)
+		owner.underlays -= status_underlay
+	QDEL_NULL(status_overlay)
+	return ..()
+
+/// Status effect from multiple sources, when all sources are removed, so is the effect
+/datum/status_effect/grouped
+	status_type = STATUS_EFFECT_MULTIPLE //! Adds itself to sources and destroys itself if one exists already, there are never multiple
+	var/list/sources = list()
+
+/datum/status_effect/grouped/on_creation(mob/living/new_owner, source)
+	var/datum/status_effect/grouped/existing = new_owner.has_status_effect(type)
+	if(existing)
+		existing.sources |= source
+		qdel(src)
+		return FALSE
+	else
+		sources |= source
+		return ..()
+
+/datum/status_effect/grouped/before_remove(source)
+	sources -= source
+	return !length(sources)

code/datums/weather/weather.dm

@@ -1,49 +1,96 @@
-//The effects of weather occur across an entire z-level. For instance, lavaland has periodic ash storms that scorch most unprotected creatures.
+/**
+  * Causes weather to occur on a z level in certain area types
+  *
+  * The effects of weather occur across an entire z-level. For instance, lavaland has periodic ash storms that scorch most unprotected creatures.
+  * Weather always occurs on different z levels at different times, regardless of weather type.
+  * Can have custom durations, targets, and can automatically protect indoor areas.
+  *
+  */
 
 /datum/weather
+	/// name of weather
 	var/name = "space wind"
+	/// description of weather
 	var/desc = "Heavy gusts of wind blanket the area, periodically knocking down anyone caught in the open."
 
-	var/telegraph_message = "<span class='warning'>The wind begins to pick up.</span>" //The message displayed in chat to foreshadow the weather's beginning
-	var/telegraph_duration = 300 //In deciseconds, how long from the beginning of the telegraph until the weather begins
-	var/telegraph_sound //The sound file played to everyone on an affected z-level
-	var/telegraph_overlay //The overlay applied to all tiles on the z-level
+	/// The message displayed in chat to foreshadow the weather's beginning
+	var/telegraph_message = "<span class='warning'>The wind begins to pick up.</span>"
 
-	var/weather_message = "<span class='userdanger'>The wind begins to blow ferociously!</span>" //Displayed in chat once the weather begins in earnest
-	var/weather_duration = 1200 //In deciseconds, how long the weather lasts once it begins
-	var/weather_duration_lower = 1200 //See above - this is the lowest possible duration
-	var/weather_duration_upper = 1500 //See above - this is the highest possible duration
+	/// In deciseconds, how long from the beginning of the telegraph until the weather begins
+	var/telegraph_duration = 300
+	/// The sound file played to everyone on an affected z-level
+	var/telegraph_sound
+	/// The overlay applied to all tiles on the z-level
+	var/telegraph_overlay
+	/// Displayed in chat once the weather begins in earnest
+	var/weather_message = "<span class='userdanger'>The wind begins to blow ferociously!</span>"
+	///In deciseconds, how long the weather lasts once it begins
+	var/weather_duration = 1200
+	///See above - this is the lowest possible duration
+	var/weather_duration_lower = 1200
+	///See above - this is the highest possible duration
+	var/weather_duration_upper = 1500
+	/// Looping sound while weather is occuring
 	var/weather_sound
+	/// Area overlay while the weather is occuring
 	var/weather_overlay
+	/// Color to apply to the area while weather is occuring
 	var/weather_color = null
 
-	var/end_message = "<span class='danger'>The wind relents its assault.</span>" //Displayed once the weather is over
-	var/end_duration = 300 //In deciseconds, how long the "wind-down" graphic will appear before vanishing entirely
+	/// Displayed once the weather is over
+	var/end_message = "<span class='danger'>The wind relents its assault.</span>"
+	/// In deciseconds, how long the "wind-down" graphic will appear before vanishing entirely
+	var/end_duration = 300
+	/// Sound that plays while weather is ending
 	var/end_sound
+	/// Area overlay while weather is ending
 	var/end_overlay
 
-	var/area_type = /area/space //Types of area to affect
-	var/list/impacted_areas = list() //Areas to be affected by the weather, calculated when the weather begins
-	var/list/protected_areas = list()//Areas that are protected and excluded from the affected areas.
-	var/impacted_z_levels // The list of z-levels that this weather is actively affecting
+	/// Types of area to affect
+	var/area_type = /area/space
+	/// TRUE value protects areas with outdoors marked as false, regardless of area type
+	var/protect_indoors = FALSE
+	/// Areas to be affected by the weather, calculated when the weather begins
+	var/list/impacted_areas = list()
 
-	var/overlay_layer = AREA_LAYER //Since it's above everything else, this is the layer used by default. TURF_LAYER is below mobs and walls if you need to use that.
-	var/aesthetic = FALSE //If the weather has no purpose other than looks
-	var/immunity_type = "storm" //Used by mobs to prevent them from being affected by the weather
+	/// Areas that are protected and excluded from the affected areas.
+	var/list/protected_areas = list()
+	/// The list of z-levels that this weather is actively affecting
+	var/impacted_z_levels
 
-	var/stage = END_STAGE //The stage of the weather, from 1-4
+	/// Since it's above everything else, this is the layer used by default. TURF_LAYER is below mobs and walls if you need to use that. 
+	var/overlay_layer = AREA_LAYER 
+	/// Plane for the overlay
+	var/overlay_plane = BLACKNESS_PLANE
+	/// If the weather has no purpose but aesthetics. 
+	var/aesthetic = FALSE
+	/// Used by mobs to prevent them from being affected by the weather 
+	var/immunity_type = "storm"
 
-	// These are read by the weather subsystem and used to determine when and where to run the weather.
-	var/probability = 0 // Weight amongst other eligible weather. If zero, will never happen randomly.
-	var/target_trait = ZTRAIT_STATION // The z-level trait to affect when run randomly or when not overridden.
+	/// The stage of the weather, from 1-4
+	var/stage = END_STAGE
 
+	/// Weight amongst other eligible weather. if zero, will never happen randomly.
+	var/probability = 0
+	/// The z-level trait to affect when run randomly or when not overridden.
+	var/target_trait = ZTRAIT_STATION
+
+	/// Whether a barometer can predict when the weather will happen
 	var/barometer_predictable = FALSE
-	var/next_hit_time = 0 //For barometers to know when the next storm will hit
+	/// For barometers to know when the next storm will hit
+	var/next_hit_time = 0
 
 /datum/weather/New(z_levels)
 	..()
 	impacted_z_levels = z_levels
 
+/**
+  * Telegraphs the beginning of the weather on the impacted z levels
+  *
+  * Sends sounds and details to mobs in the area
+  * Calculates duration and hit areas, and makes a callback for the actual weather to start
+  *
+  */
 /datum/weather/proc/telegraph()
 	if(stage == STARTUP_STAGE)
 		return
@@ -58,6 +105,8 @@
 		affectareas -= get_areas(V)
 	for(var/V in affectareas)
 		var/area/A = V
+		if(protect_indoors && !A.outdoors)
+			continue
 		if(A.z in impacted_z_levels)
 			impacted_areas |= A
 	weather_duration = rand(weather_duration_lower, weather_duration_upper)
@@ -72,6 +121,13 @@
 				SEND_SOUND(M, sound(telegraph_sound))
 	addtimer(CALLBACK(src, .proc/start), telegraph_duration)
 
+/**
+  * Starts the actual weather and effects from it
+  *
+  * Updates area overlays and sends sounds and messages to mobs to notify them
+  * Begins dealing effects from weather to mobs in the area
+  *
+  */
 /datum/weather/proc/start()
 	if(stage >= MAIN_STAGE)
 		return
@@ -86,6 +142,13 @@
 				SEND_SOUND(M, sound(weather_sound))
 	addtimer(CALLBACK(src, .proc/wind_down), weather_duration)
 
+/**
+  * Weather enters the winding down phase, stops effects
+  *
+  * Updates areas to be in the winding down phase
+  * Sends sounds and messages to mobs to notify them
+  *
+  */
 /datum/weather/proc/wind_down()
 	if(stage >= WIND_DOWN_STAGE)
 		return
@@ -100,6 +163,13 @@
 				SEND_SOUND(M, sound(end_sound))
 	addtimer(CALLBACK(src, .proc/end), end_duration)
 
+/**
+  * Fully ends the weather
+  *
+  * Effects no longer occur and area overlays are removed
+  * Removes weather from processing completely
+  *
+  */
 /datum/weather/proc/end()
 	if(stage == END_STAGE)
 		return 1
@@ -115,7 +185,11 @@
 		if(can_weather_act(L))
 			weather_act(L)
 
-/datum/weather/proc/can_weather_act(mob/living/L) //Can this weather impact a mob?
+/**
+  * Returns TRUE if the living mob can be affected by the weather
+  *
+  */
+/datum/weather/proc/can_weather_act(mob/living/L)
 	var/turf/mob_turf = get_turf(L)
 	if(mob_turf && !(mob_turf.z in impacted_z_levels))
 		return
@@ -123,11 +197,19 @@
 		return
 	if(!(get_area(L) in impacted_areas))
 		return
-	return 1
+	return TRUE
 
-/datum/weather/proc/weather_act(mob/living/L) //What effect does this weather have on the hapless mob?
+/**
+  * Affects the mob with whatever the weather does
+  *
+  */
+/datum/weather/proc/weather_act(mob/living/L)
 	return
 
+/**
+  * Updates the overlays on impacted areas
+  *
+  */
 /datum/weather/proc/update_areas()
 	for(var/V in impacted_areas)
 		var/area/N = V

code/datums/weather/weather_types/acid_rain.dm

@@ -17,8 +17,9 @@
 	end_message = "<span class='boldannounce'>The downpour gradually slows to a light shower. It should be safe outside now.</span>"
 	end_sound = 'sound/ambience/acidrain_end.ogg'
 
-	area_type = /area/lavaland/surface/outdoors
-	target_trait = ZTRAIT_MINING
+	area_type = /area
+	protect_indoors = TRUE
+	target_trait = ZTRAIT_ACIDRAIN
 
 	immunity_type = "acid" // temp
 

code/datums/weather/weather_types/ash_storm.dm

@@ -16,8 +16,9 @@
 	end_duration = 300
 	end_overlay = "light_ash"
 
-	area_type = /area/lavaland/surface/outdoors
-	target_trait = ZTRAIT_MINING
+	area_type = /area
+	protect_indoors = TRUE
+	target_trait = ZTRAIT_ASHSTORM
 
 	immunity_type = "ash"
 

code/datums/weather/weather_types/snow_storm.dm

@@ -15,8 +15,9 @@
 	end_duration = 100
 	end_message = "<span class='boldannounce'>The snowfall dies down, it should be safe to go outside again.</span>"
 
-	area_type = /area/awaymission/snowdin/outside
-	target_trait = ZTRAIT_AWAY
+	area_type = /area
+	protect_indoors = TRUE
+	target_trait = ZTRAIT_SNOWSTORM
 
 	immunity_type = "snow"
 

code/datums/wires/airlock.dm

@@ -1,6 +1,7 @@
 /datum/wires/airlock
 	holder_type = /obj/machinery/door/airlock
 	proper_name = "Generic Airlock"
+	req_skill = JOB_SKILL_UNSKILLED //Training wheel, as per request.
 	var/wiretype
 
 /datum/wires/airlock/secure

code/game/area/areas.dm

@@ -11,13 +11,27 @@
 	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
 	invisibility = INVISIBILITY_LIGHTING
 
-	var/map_name // Set in New(); preserves the name set by the map maker, even if renamed by the Blueprints.
+	/// Set in New(); preserves the name set by the map maker, even if renamed by the Blueprints.
+	var/map_name
 
-	var/valid_territory = TRUE // If it's a valid territory for gangs to claim
-	var/blob_allowed = TRUE // Does it count for blobs score? By default, all areas count.
-	var/clockwork_warp_allowed = TRUE // Can servants warp into this area from Reebe?
+	/// If it's valid territory for gangs/cults to summon
+	var/valid_territory = TRUE
+	/// if blobs can spawn there and if it counts towards their score.
+	var/blob_allowed = TRUE
+	/// whether servants can warp into this area from Reebe
+	var/clockwork_warp_allowed = TRUE
+	/// Message to display when the clockwork warp fails
 	var/clockwork_warp_fail = "The structure there is too dense for warping to pierce. (This is normal in high-security areas.)"
 
+	/// If mining tunnel generation is allowed in this area
+	var/tunnel_allowed = FALSE
+	/// If flora are allowed to spawn in this area randomly through tunnel generation
+	var/flora_allowed = FALSE
+	/// if mobs can be spawned by natural random generation
+	var/mob_spawn_allowed = FALSE
+	/// If megafauna can be spawned by natural random generation
+	var/megafauna_spawn_allowed = FALSE
+
 	var/fire = null
 	var/atmos = TRUE
 	var/atmosalm = FALSE
@@ -25,11 +39,14 @@
 	var/lightswitch = TRUE
 
 	var/requires_power = TRUE
-	var/always_unpowered = FALSE	// This gets overridden to 1 for space in area/Initialize().
+	/// This gets overridden to 1 for space in area/Initialize().
+	var/always_unpowered = FALSE
 
-	var/outdoors = FALSE //For space, the asteroid, lavaland, etc. Used with blueprints to determine if we are adding a new area (vs editing a station room)
+	/// For space, the asteroid, lavaland, etc. Used with blueprints to determine if we are adding a new area (vs editing a station room)
+	var/outdoors = FALSE
 
-	var/areasize = 0 //Size of the area in open turfs, only calculated for indoors areas.
+	/// Size of the area in open turfs, only calculated for indoors areas.
+	var/areasize = 0
 
 	var/power_equip = TRUE
 	var/power_light = TRUE
@@ -43,9 +60,12 @@
 	var/static_environ
 
 	var/has_gravity = 0
-	var/noteleport = FALSE			//Are you forbidden from teleporting to the area? (centcom, mobs, wizard, hand teleporter)
-	var/hidden = FALSE 			//Hides area from player Teleport function.
-	var/safe = FALSE 				//Is the area teleport-safe: no space / radiation / aggresive mobs / other dangers
+	/// Are you forbidden from teleporting to the area? (centcom, mobs, wizard, hand teleporter)
+	var/noteleport = FALSE
+	/// Hides area from player Teleport function.
+	var/hidden = FALSE
+	/// Is the area teleport-safe: no space / radiation / aggresive mobs / other dangers
+	var/safe = FALSE 				
 	/// If false, loading multiple maps with this area type will create multiple instances.
 	var/unique = TRUE
 

code/game/area/areas/mining.dm

@@ -3,6 +3,7 @@
 /area/mine
 	icon_state = "mining"
 	has_gravity = STANDARD_GRAVITY
+	flora_allowed = TRUE
 
 /area/mine/explored
 	name = "Mine"
@@ -17,6 +18,7 @@
 	outdoors = TRUE
 	flags_1 = NONE
 	ambientsounds = MINING
+	flora_allowed = FALSE
 
 /area/mine/unexplored
 	name = "Mine"
@@ -31,6 +33,7 @@
 	outdoors = TRUE
 	flags_1 = NONE
 	ambientsounds = MINING
+	tunnel_allowed = TRUE
 
 /area/mine/lobby
 	name = "Mining Station"
@@ -82,6 +85,7 @@
 	icon_state = "mining"
 	has_gravity = STANDARD_GRAVITY
 	flags_1 = NONE
+	flora_allowed = TRUE
 
 /area/lavaland/surface
 	name = "Lavaland"
@@ -114,9 +118,79 @@
 
 /area/lavaland/surface/outdoors/unexplored //monsters and ruins spawn here
 	icon_state = "unexplored"
+	tunnel_allowed = TRUE
+	mob_spawn_allowed = TRUE
 
 /area/lavaland/surface/outdoors/unexplored/danger //megafauna will also spawn here
 	icon_state = "danger"
+	megafauna_spawn_allowed = TRUE
 
 /area/lavaland/surface/outdoors/explored
 	name = "Lavaland Labor Camp"
+	flora_allowed = FALSE
+
+
+
+/**********************Ice Moon Areas**************************/
+
+/area/icemoon
+	icon_state = "mining"
+	has_gravity = STANDARD_GRAVITY
+	flags_1 = NONE
+	flora_allowed = TRUE
+	blob_allowed = FALSE
+
+/area/icemoon/surface
+	name = "Icemoon"
+	icon_state = "explored"
+	always_unpowered = TRUE
+	poweralm = FALSE
+	power_environ = FALSE
+	power_equip = FALSE
+	power_light = FALSE
+	requires_power = TRUE
+	ambientsounds = MINING
+
+/area/icemoon/underground
+	name = "Icemoon Caves"
+	outdoors = TRUE
+	always_unpowered = TRUE
+	requires_power = TRUE
+	poweralm = FALSE
+	power_environ = FALSE
+	power_equip = FALSE
+	power_light = FALSE
+	ambientsounds = MINING
+
+/area/icemoon/underground/unexplored // mobs and megafauna and ruins spawn here
+	name = "Icemoon Caves"
+	icon_state = "unexplored"
+	tunnel_allowed = TRUE
+	mob_spawn_allowed = TRUE
+	megafauna_spawn_allowed = TRUE
+
+/area/icemoon/underground/unexplored/rivers // rivers spawn here
+	icon_state = "danger"
+
+/area/icemoon/underground/explored
+	name = "Icemoon Underground"
+	flora_allowed = FALSE
+
+/area/icemoon/surface/outdoors
+	name = "Icemoon Wastes"
+	outdoors = TRUE
+
+/area/icemoon/surface/outdoors/labor_camp
+	name = "Icemoon Labor Camp"
+	flora_allowed = FALSE
+
+/area/icemoon/surface/outdoors/unexplored //monsters and ruins spawn here
+	icon_state = "unexplored"
+	tunnel_allowed = TRUE
+	mob_spawn_allowed = TRUE
+
+/area/icemoon/surface/outdoors/unexplored/rivers // rivers spawn here
+	icon_state = "danger"
+
+/area/icemoon/surface/outdoors/unexplored/rivers/no_monsters
+	mob_spawn_allowed = FALSE

code/game/area/areas/ruins/icemoon.dm

@@ -0,0 +1,9 @@
+// Icemoon Ruins
+
+/area/ruin/unpowered/buried_library
+	name = "Buried Library"
+	icon_state = "dk_yellow"
+
+/area/ruin/powered/bathhouse
+	name = "Bath House"
+	icon_state = "dk_yellow"

code/game/atoms_movable.dm

@@ -25,6 +25,7 @@
 	var/inertia_move_delay = 5
 	var/pass_flags = 0
 	var/moving_diagonally = 0 //0: not doing a diagonal move. 1 and 2: doing the first/second step of the diagonal move
+	var/atom/movable/moving_from_pull		//attempt to resume grab after moving instead of before.
 	var/list/client_mobs_in_contents // This contains all the client mobs within this container
 	var/list/acted_explosions	//for explosion dodging
 	glide_size = 8
@@ -207,6 +208,7 @@
 	if(!Process_Spacemove(get_dir(pulling.loc, A)))
 		return
 	step(pulling, get_dir(pulling.loc, A))
+	return TRUE
 
 /atom/movable/proc/check_pulling()
 	if(pulling)
@@ -224,6 +226,8 @@
 		if(pulling.anchored || pulling.move_resist > move_force)
 			stop_pulling()
 			return
+	if(pulledby && moving_diagonally != FIRST_DIAG_STEP && get_dist(src, pulledby) > 1)		//separated from our puller and not in the middle of a diagonal move.
+		pulledby.stop_pulling()
 
 /atom/movable/Destroy(force)
 	QDEL_NULL(proximity_monitor)

code/game/atoms_movement.dm

@@ -20,6 +20,9 @@
 	if(!newloc.Enter(src, src.loc))
 		return
 
+	if (SEND_SIGNAL(src, COMSIG_MOVABLE_PRE_MOVE, newloc) & COMPONENT_MOVABLE_BLOCK_PRE_MOVE)
+		return
+
 	// Past this is the point of no return
 	var/atom/oldloc = loc
 	var/area/oldarea = get_area(oldloc)
@@ -51,13 +54,8 @@
 /atom/movable/Move(atom/newloc, direct)
 	var/atom/movable/pullee = pulling
 	var/turf/T = loc
-	if(pulling)
-		if(pullee && get_dist(src, pullee) > 1)
-			stop_pulling()
-
-		if(pullee && pullee.loc != loc && !isturf(pullee.loc) ) //to be removed once all code that changes an object's loc uses forceMove().
-			log_game("DEBUG:[src]'s pull on [pullee] wasn't broken despite [pullee] being in [pullee.loc]. Pull stopped manually.")
-			stop_pulling()
+	if(!moving_from_pull)
+		check_pulling()
 	if(!loc || !newloc)
 		return FALSE
 	var/atom/oldloc = loc
@@ -130,19 +128,16 @@
 		if(has_buckled_mobs() && !handle_buckled_mob_movement(loc,direct)) //movement failed due to buckled mob(s)
 			return FALSE
 
-		if(pulling && pulling == pullee) //we were pulling a thing and didn't lose it during our move.
+		if(pulling && pulling == pullee && pulling != moving_from_pull) //we were pulling a thing and didn't lose it during our move.
 			if(pulling.anchored)
 				stop_pulling()
 			else
 				var/pull_dir = get_dir(src, pulling)
 				//puller and pullee more than one tile away or in diagonal position
 				if(get_dist(src, pulling) > 1 || (moving_diagonally != SECOND_DIAG_STEP && ((pull_dir - 1) & pull_dir)))
+					pulling.moving_from_pull = src
 					pulling.Move(T, get_dir(pulling, T)) //the pullee tries to reach our previous position
-					if(pulling && get_dist(src, pulling) > 1) //the pullee couldn't keep up
-						stop_pulling()
-				if(pulledby && moving_diagonally != FIRST_DIAG_STEP && get_dist(src, pulledby) > 1)//separated from our puller and not in the middle of a diagonal move.
-					pulledby.stop_pulling()
-
+					pulling.moving_from_pull = null
 		Moved(oldloc, direct)
 
 /atom/movable/proc/handle_buckled_mob_movement(newloc,direct)

code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm

@@ -642,6 +642,9 @@
 		for(var/obj/effect/landmark/carpspawn/L in GLOB.landmarks_list)
 			if(isturf(L.loc))
 				spawn_locs += L.loc
+		for(var/obj/effect/landmark/loneopspawn/L in GLOB.landmarks_list)
+			if(isturf(L.loc))
+				spawn_locs += L.loc
 		if(!spawn_locs.len)
 			return FALSE
 		spawn_loc = pick(spawn_locs)

code/game/machinery/autolathe.dm

@@ -62,6 +62,9 @@
 		/datum/material/mythril
 		)
 
+	/// Base print speed
+	var/base_print_speed = 10
+
 /obj/machinery/autolathe/Initialize()
 	AddComponent(/datum/component/material_container, allowed_materials, _show_on_examine=TRUE, _after_insert=CALLBACK(src, .proc/AfterMaterialInsert))
 	. = ..()
@@ -206,7 +209,7 @@
 				busy = TRUE
 				use_power(power)
 				icon_state = "autolathe_n"
-				var/time = is_stack ? 32 : 32*coeff*multiplier
+				var/time = is_stack ? 10 : base_print_speed * coeff * multiplier
 				addtimer(CALLBACK(src, .proc/make_item, power, materials_used, custom_materials, multiplier, coeff, is_stack), time)
 			else
 				to_chat(usr, "<span class=\"alert\">Not enough materials for this operation.</span>")
@@ -254,10 +257,12 @@
 		T += MB.rating*75000
 	var/datum/component/material_container/materials = GetComponent(/datum/component/material_container)
 	materials.max_amount = T
-	T=1.2
+	var/manips = 0
+	var/total_manip_rating = 0
 	for(var/obj/item/stock_parts/manipulator/M in component_parts)
-		T -= M.rating*0.2
-	prod_coeff = min(1,max(0,T)) // Coeff going 1 -> 0,8 -> 0,6 -> 0,4
+		total_manip_rating += M.rating
+		manips++
+	prod_coeff = STANDARD_PART_LEVEL_LATHE_COEFFICIENT(total_manip_rating / (manips? manips : 1))
 
 /obj/machinery/autolathe/examine(mob/user)
 	. += ..()
@@ -440,6 +445,7 @@
 	hackable = FALSE
 	circuit = /obj/item/circuitboard/machine/autolathe/secure
 	stored_research = /datum/techweb/specialized/autounlocking/autolathe/public
+	base_print_speed = 20
 
 /obj/machinery/autolathe/toy
 	name = "autoylathe"

code/game/objects/buckling.dm

@@ -55,8 +55,12 @@
 		M.buckling = null
 		return FALSE
 
-	if(M.pulledby && buckle_prevents_pull)
-		M.pulledby.stop_pulling()
+	if(M.pulledby)
+		if(buckle_prevents_pull)
+			M.pulledby.stop_pulling()
+		else if(isliving(M.pulledby))
+			var/mob/living/L = M.pulledby
+			L.reset_pull_offsets(M, TRUE)
 
 	if(!check_loc && M.loc != loc)
 		M.forceMove(loc)
@@ -137,4 +141,7 @@
 				"<span class='notice'>You unbuckle yourself from [src].</span>",\
 				"<span class='italics'>You hear metal clanking.</span>")
 		add_fingerprint(user)
+	if(isliving(M.pulledby))
+		var/mob/living/L = M.pulledby
+		L.set_pull_offsets(M, L.grab_state)
 	return M

code/game/objects/effects/landmarks.dm

@@ -313,6 +313,11 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player)
 	name = "carpspawn"
 	icon_state = "carp_spawn"
 
+// lone op (optional)
+/obj/effect/landmark/loneopspawn
+	name = "loneop+ninjaspawn"
+	icon_state = "snukeop_spawn"
+
 // observer-start.
 /obj/effect/landmark/observer_start
 	name = "Observer-Start"
@@ -492,7 +497,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player)
 	if(!template)
 		return FALSE
 	testing("Room \"[template_name]\" placed at ([T.x], [T.y], [T.z])")
-	template.load(T, centered = FALSE)
+	template.load(T, centered = FALSE, orientation = dir, rotate_placement_to_orientation = TRUE)
 	template.loaded++
 	GLOB.stationroom_landmarks -= src
 	qdel(src)
@@ -504,7 +509,6 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player)
 	templates = list("Engine SM" = 3, "Engine Singulo" = 3, "Engine Tesla" = 3)
 	icon = 'icons/rooms/box/engine.dmi'
 
-
 /obj/effect/landmark/stationroom/box/engine/New()
 	. = ..()
 	templates = CONFIG_GET(keyed_list/box_random_engine)
@@ -513,3 +517,9 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player)
 /obj/effect/landmark/stationroom/lavaland/station
 	templates = list("Public Mining Base" = 3)
 	icon = 'icons/rooms/Lavaland/Mining.dmi'
+
+// handled in portals.dm, id connected to one-way portal
+/obj/effect/landmark/portal_exit
+	name = "portal exit"
+	icon_state = "portal_exit"
+	var/id

code/game/objects/effects/portals.dm

@@ -29,6 +29,7 @@
 	var/allow_anchored = FALSE
 	var/innate_accuracy_penalty = 0
 	var/last_effect = 0
+	var/force_teleport = FALSE
 
 /obj/effect/portal/anom
 	name = "wormhole"
@@ -162,7 +163,7 @@
 		no_effect = TRUE
 	else
 		last_effect = world.time
-	if(do_teleport(M, real_target, innate_accuracy_penalty, no_effects = no_effect, channel = teleport_channel))
+	if(do_teleport(M, real_target, innate_accuracy_penalty, no_effects = no_effect, channel = teleport_channel, forced = force_teleport))
 		if(istype(M, /obj/item/projectile))
 			var/obj/item/projectile/P = M
 			P.ignore_source_check = TRUE
@@ -183,3 +184,47 @@
 	else
 		real_target = get_turf(linked)
 	return real_target
+
+/obj/effect/portal/permanent
+	name = "permanent portal"
+	desc = "An unwavering portal that will never fade."
+	hardlinked = FALSE // dont qdel my portal nerd
+	force_teleport = TRUE // force teleports because they're a mapmaker tool
+	var/id // var edit or set id in map editor
+
+/obj/effect/portal/permanent/proc/set_linked()
+	if(!id)
+		return
+	for(var/obj/effect/portal/permanent/P in GLOB.portals - src)
+		if(P.id == id)
+			P.linked = src
+			linked = P
+			break
+
+/obj/effect/portal/permanent/teleport(atom/movable/M, force = FALSE)
+	set_linked() // update portal links
+	. = ..()
+
+/obj/effect/portal/permanent/one_way // doesn't have a return portal, can have multiple exits, /obj/effect/landmark/portal_exit to mark them
+	name = "one-way portal"
+	desc = "You get the feeling that this might not be the safest thing you've ever done."
+
+/obj/effect/portal/permanent/one_way/set_linked()
+	if(!id)
+		return
+	var/list/possible_turfs = list()
+	for(var/obj/effect/landmark/portal_exit/PE in GLOB.landmarks_list)
+		if(PE.id == id)
+			var/turf/T = get_turf(PE)
+			if(T)
+				possible_turfs |= T
+	if(possible_turfs.len)
+		hard_target = pick(possible_turfs)
+
+/obj/effect/portal/permanent/one_way/one_use
+	name = "one-use portal"
+	desc = "This is probably the worst decision you'll ever make in your life."
+
+/obj/effect/portal/permanent/one_way/one_use/teleport(atom/movable/M, force = FALSE)
+	. = ..()
+	qdel(src)

code/game/objects/items.dm

@@ -133,7 +133,8 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
 	var/list/juice_results //A reagent list containing blah blah... but when JUICED in a grinder!
 
 	///Skills vars
-	var/list/used_skills //list of skills exercised when using this item. An associated bitfield indicates how the skill is exercised.
+	//list of skill PATHS exercised when using this item. An associated bitfield can be set to indicate additional ways the skill is used by this specific item.
+	var/list/datum/skill/used_skills.
 	var/skill_difficulty = THRESHOLD_COMPETENT //how difficult it's to use this item in general.
 	var/skill_gain = DEF_SKILL_GAIN //base skill value gain from using this item.
 
@@ -801,7 +802,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
 
 	if(delay)
 		if(user.mind && used_skills)
-			LIST_SKILL_MODIFIER(used_skills, user.mind.skill_holder, delay, skill_difficulty, SKILL_USE_TOOL, NONE)
+			delay = user.mind.skill_holder.item_action_skills_mod(src, delay, skill_difficulty, SKILL_USE_TOOL, NONE, FALSE)
 
 		// Create a callback with checks that would be called every tick by do_after.
 		var/datum/callback/tool_check = CALLBACK(src, .proc/tool_check_callback, user, amount, extra_checks)

code/game/objects/items/devices/flashlight.dm

@@ -351,6 +351,12 @@
 	light_color = "#FFAA44"
 	flashlight_power = 0.8
 
+/obj/item/flashlight/lantern/jade
+	name = "jade lantern"
+	desc = "An ornate, green lantern."
+	color = LIGHT_COLOR_GREEN
+	light_color = LIGHT_COLOR_GREEN 
+
 /obj/item/flashlight/slime
 	gender = PLURAL
 	name = "glowing slime extract"

code/game/objects/items/devices/pressureplates.dm

@@ -8,6 +8,7 @@
 	level = 1
 	var/trigger_mob = TRUE
 	var/trigger_item = FALSE
+	var/specific_item = null
 	var/trigger_silent = FALSE
 	var/sound/trigger_sound = 'sound/effects/pressureplate.ogg'
 	var/obj/item/assembly/signaler/sigdev = null
@@ -35,6 +36,8 @@
 	. = ..()
 	if(!can_trigger || !active)
 		return
+	if(trigger_item && !istype(AM, specific_item))
+		return
 	if(trigger_mob && isliving(AM))
 		var/mob/living/L = AM
 		to_chat(L, "<span class='warning'>You feel something click beneath you!</span>")

code/game/objects/items/kitchen.dm

@@ -3,6 +3,7 @@
  *		Fork
  *		Kitchen knives
  *		Ritual Knife
+ *		Bloodletter
  *		Butcher's cleaver
  *		Combat Knife
  *		Rolling Pins
@@ -97,6 +98,28 @@
 	righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi'
 	w_class = WEIGHT_CLASS_NORMAL
 
+/obj/item/kitchen/knife/bloodletter
+	name = "bloodletter"
+	desc = "An occult looking dagger that is cold to the touch. Somehow, the flawless orb on the pommel is made entirely of liquid blood."
+	icon = 'icons/obj/ice_moon/artifacts.dmi'
+	icon_state = "bloodletter"
+	w_class = WEIGHT_CLASS_NORMAL 
+	/// Bleed stacks applied when an organic mob target is hit
+	var/bleed_stacks_per_hit = 3
+	
+/obj/item/kitchen/knife/bloodletter/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
+	. = ..()
+	if(!isliving(target) || !proximity_flag)
+		return
+	var/mob/living/M = target
+	if(!(M.mob_biotypes & MOB_ORGANIC))
+		return
+	var/datum/status_effect/stacking/saw_bleed/bloodletting/B = M.has_status_effect(/datum/status_effect/stacking/saw_bleed/bloodletting)
+	if(!B)
+		M.apply_status_effect(/datum/status_effect/stacking/saw_bleed/bloodletting, bleed_stacks_per_hit)
+	else
+		B.add_stacks(bleed_stacks_per_hit)
+
 /obj/item/kitchen/knife/butcher
 	name = "butcher's cleaver"
 	icon_state = "butch"

code/game/objects/items/miscellaneous.dm

@@ -123,11 +123,3 @@
 	w_class = WEIGHT_CLASS_BULKY
 	attack_verb = list("skubbed")
 
-/obj/item/supermatterspray
-	name = "supermatter spray"
-	desc = "A spray bottle containing some kind of magical spray to fix the SM. \"Do not inhale.\" is written on the side. Unless aimed at the supermatter, it does nothing."
-	icon = 'icons/obj/supermatter.dmi'
-	icon_state = "supermatterspray"
-	w_class = WEIGHT_CLASS_SMALL
-	var/usesleft = 2
-

code/game/objects/items/puzzle_pieces.dm

@@ -0,0 +1,146 @@
+//**************
+//*****Keys*******************
+//**************		**  **
+/obj/item/keycard
+	name = "security keycard"
+	desc = "This feels like it belongs to a door."
+	icon = 'icons/obj/puzzle_small.dmi'
+	icon_state = "keycard"
+	force = 0
+	throwforce = 0
+	w_class = WEIGHT_CLASS_TINY
+	throw_speed = 1
+	throw_range = 7
+	resistance_flags = INDESTRUCTIBLE | FIRE_PROOF | ACID_PROOF | LAVA_PROOF
+	var/puzzle_id = null
+
+//Two test keys for use alongside the two test doors.
+/obj/item/keycard/cheese
+	name = "cheese keycard"
+	desc = "Look, I still don't understand the reference. What the heck is a keyzza?"
+	color = "#f0da12"
+	puzzle_id = "cheese"
+
+/obj/item/keycard/swordfish
+	name = "titanic keycard"
+	desc = "Smells like it was at the bottom of a harbor."
+	color = "#3bbbdb"
+	puzzle_id = "swordfish"
+
+//***************
+//*****Doors*****
+//***************
+
+/obj/machinery/door/keycard
+	name = "locked door"
+	desc = "This door only opens when a keycard is swiped. It looks virtually indestructable."
+	icon = 'icons/obj/doors/puzzledoor/default.dmi'
+	icon_state = "door_closed"
+	explosion_block = 3
+	heat_proof = TRUE
+	max_integrity = 600
+	armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 100, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 100)
+	resistance_flags = INDESTRUCTIBLE | FIRE_PROOF | ACID_PROOF | LAVA_PROOF
+	damage_deflection = 70
+	/// Make sure that the key has the same puzzle_id as the keycard door!
+	var/puzzle_id = null
+	/// Message that occurs when the door is opened
+	var/open_message = "The door beeps, and slides opens."
+
+//Standard Expressions to make keycard doors basically un-cheeseable
+/obj/machinery/door/keycard/Bumped(atom/movable/AM)
+	return !density && ..()
+
+/obj/machinery/door/keycard/emp_act(severity)
+	return
+
+/obj/machinery/door/keycard/ex_act(severity, target)
+	return
+
+/obj/machinery/door/keycard/try_to_activate_door(mob/user)
+	add_fingerprint(user)
+	if(operating)
+		return
+
+/obj/machinery/door/keycard/attackby(obj/item/I, mob/user, params)
+	. = ..()
+	if(istype(I,/obj/item/keycard))
+		var/obj/item/keycard/key = I
+		if((!puzzle_id || puzzle_id == key.puzzle_id)  && density)
+			if(open_message)
+				to_chat(user, "<span class='notice'>[open_message]</span>")
+			open()
+			return
+		else if(puzzle_id != key.puzzle_id)
+			to_chat(user, "<span class='notice'>[src] buzzes. This must not be the right key.</span>")
+			return
+		else
+			to_chat(user, "<span class='notice'>This door doesn't appear to close.</span>")
+			return
+
+//Test doors. Gives admins a few doors to use quickly should they so choose.
+/obj/machinery/door/keycard/cheese
+	name = "blue airlock"
+	desc = "Smells like... pizza?"
+	puzzle_id = "cheese"
+
+/obj/machinery/door/keycard/swordfish
+	name = "blue airlock"
+	desc = "If nautical nonsense be something you wish."
+	puzzle_id = "swordfish"
+
+//*************************
+//***Box Pushing Puzzles***
+//*************************
+//We're working off a subtype of pressureplates, which should work just a BIT better now.
+/obj/structure/holobox
+	name = "holobox"
+	desc = "A hard-light box, containing a secure decryption key."
+	icon = 'icons/obj/puzzle_small.dmi'
+	icon_state = "laserbox"
+	density = TRUE
+	resistance_flags = INDESTRUCTIBLE | FIRE_PROOF | ACID_PROOF | LAVA_PROOF
+
+//Uses the pressure_plate settings for a pretty basic custom pattern that waits for a specific item to trigger. Easy enough to retool for mapping purposes or subtypes.
+/obj/item/pressure_plate/hologrid
+	name = "hologrid"
+	desc = "A high power, electronic input port for a holobox, which can unlock the hologrid's storage compartment. Safe to stand on."
+	icon = 'icons/obj/puzzle_small.dmi'
+	icon_state = "lasergrid"
+	anchored = TRUE
+	trigger_mob = FALSE
+	trigger_item = TRUE
+	specific_item = /obj/structure/holobox
+	removable_signaller = FALSE //Being a pressure plate subtype, this can also use signals.
+	roundstart_signaller_freq = FREQ_HOLOGRID_SOLUTION //Frequency is kept on it's own default channel however.
+	active = TRUE
+	trigger_delay = 10
+	resistance_flags = INDESTRUCTIBLE | FIRE_PROOF | ACID_PROOF | LAVA_PROOF
+	var/reward = /obj/item/reagent_containers/food/snacks/cookie
+	var/claimed = FALSE
+
+/obj/item/pressure_plate/hologrid/examine(mob/user)
+	. = ..()
+	if(claimed)
+		. += "<span class='notice'>This one appears to be spent already.</span>"
+
+/obj/item/pressure_plate/hologrid/trigger()
+	if(!claimed)
+		new reward(loc)
+	flick("lasergrid_a",src)
+	icon_state = "lasergrid_full"
+	claimed = TRUE
+
+/obj/item/pressure_plate/hologrid/Crossed(atom/movable/AM)
+	. = ..()
+	if(trigger_item && istype(AM, specific_item) && !claimed)
+		AM.anchored = TRUE
+		flick("laserbox_burn", AM)
+		trigger()
+		sleep(15)
+		qdel(AM)
+
+// snowflake code until undertile elements
+/obj/item/pressure_plate/hologrid/hide()
+	. = ..()
+	anchored = TRUE

code/game/objects/items/stacks/sheets/leather.dm

@@ -178,6 +178,11 @@ GLOBAL_LIST_INIT(leather_recipes, list ( \
 	icon_state = "sinew"
 	novariants = TRUE
 
+/obj/item/stack/sheet/sinew/wolf
+	name = "wolf sinew"
+	desc = "Long stringy filaments which came from the insides of a wolf."
+	singular_name = "wolf sinew"
+
 
 GLOBAL_LIST_INIT(sinew_recipes, list ( \
 	new/datum/stack_recipe("sinew restraints", /obj/item/restraints/handcuffs/sinew, 1), \
@@ -202,6 +207,11 @@ GLOBAL_LIST_INIT(sinew_recipes, list ( \
 	w_class = WEIGHT_CLASS_NORMAL
 	layer = MOB_LAYER
 
+/obj/item/stack/sheet/animalhide/goliath_hide/polar_bear_hide
+	name = "polar bear hides"
+	desc = "Pieces of a polar bear's fur, these might be able to make your suit a bit more durable to attack from the local fauna."
+	icon_state = "polar_bear_hide"
+	singular_name = "polar bear hide"
 
 /obj/item/stack/sheet/animalhide/ashdrake
 	name = "ash drake hide"

code/game/objects/structures/flora.dm

@@ -350,11 +350,28 @@
 	icon = 'icons/obj/flora/rocks.dmi'
 	resistance_flags = FIRE_PROOF
 	density = TRUE
+	/// Itemstack that is dropped when a rock is mined with a pickaxe
+	var/obj/item/stack/mineResult = /obj/item/stack/ore/glass/basalt
+	/// Amount of the itemstack to drop
+	var/mineAmount = 20
 
 /obj/structure/flora/rock/Initialize()
 	. = ..()
 	icon_state = "[icon_state][rand(1,3)]"
 
+/obj/structure/flora/rock/attackby(obj/item/W, mob/user, params)
+	if(!mineResult || W.tool_behaviour != TOOL_MINING)
+		return ..()
+	if(flags_1 & NODECONSTRUCT_1)
+		return ..()
+	to_chat(user, "<span class='notice'>You start mining...</span>")
+	if(W.use_tool(src, user, 40, volume=50))
+		to_chat(user, "<span class='notice'>You finish mining the rock.</span>")
+		if(mineResult && mineAmount)
+			new mineResult(get_turf(src), mineAmount)
+		SSblackbox.record_feedback("tally", "pick_used_mining", 1, W.type)
+		qdel(src)
+
 /obj/structure/flora/rock/pile
 	icon_state = "lavarocks"
 	desc = "A pile of rocks."

code/game/objects/structures/icemoon/cave_entrance.dm

@@ -0,0 +1,178 @@
+GLOBAL_LIST_INIT(ore_probability, list(/obj/item/stack/ore/uranium = 50,
+						 			   /obj/item/stack/ore/iron = 100,
+						 			   /obj/item/stack/ore/plasma = 75,
+						 			   /obj/item/stack/ore/silver = 50,
+						 			   /obj/item/stack/ore/gold = 50,
+						 			   /obj/item/stack/ore/diamond = 25,
+						 			   /obj/item/stack/ore/bananium = 5,
+						 			   /obj/item/stack/ore/titanium = 75))
+
+/obj/structure/spawner/ice_moon
+	name = "cave entrance"
+	desc = "A hole in the ground, filled with monsters ready to defend it."
+	icon = 'icons/mob/nest.dmi'
+	icon_state = "hole"
+	faction = list("mining")
+	max_mobs = 3
+	max_integrity = 250
+	mob_types = list(/mob/living/simple_animal/hostile/asteroid/wolf)
+	move_resist = INFINITY
+	anchored = TRUE
+
+/obj/structure/spawner/ice_moon/Initialize()
+	. = ..()
+	clear_rock()
+
+/**
+  * Clears rocks around the spawner when it is created
+  *
+  */
+/obj/structure/spawner/ice_moon/proc/clear_rock()
+	for(var/turf/F in RANGE_TURFS(2, src))
+		if(abs(src.x - F.x) + abs(src.y - F.y) > 3)
+			continue
+		if(ismineralturf(F))
+			var/turf/closed/mineral/M = F
+			M.ScrapeAway(null, CHANGETURF_IGNORE_AIR)
+
+/obj/structure/spawner/ice_moon/deconstruct(disassembled)
+	destroy_effect()
+	drop_loot()
+	return ..()
+
+/**
+  * Effects and messages created when the spawner is destroyed
+  *
+  */
+/obj/structure/spawner/ice_moon/proc/destroy_effect()
+	playsound(loc,'sound/effects/explosionfar.ogg', 200, TRUE)
+	visible_message("<span class='boldannounce'>[src] collapses, sealing everything inside!</span>\n<span class='warning'>Ores fall out of the cave as it is destroyed!</span>")
+
+/**
+  * Drops items after the spawner is destroyed
+  *
+  */
+/obj/structure/spawner/ice_moon/proc/drop_loot()
+	for(var/type in GLOB.ore_probability)
+		var/chance = GLOB.ore_probability[type]
+		if(!prob(chance))
+			continue
+		new type(loc, rand(5, 10))
+
+/obj/structure/spawner/ice_moon/polarbear
+	max_mobs = 1
+	spawn_time = 60 SECONDS
+	mob_types = list(/mob/living/simple_animal/hostile/asteroid/polarbear)
+
+/obj/structure/spawner/ice_moon/polarbear/clear_rock()
+	for(var/turf/F in RANGE_TURFS(1, src))
+		if(ismineralturf(F))
+			var/turf/closed/mineral/M = F
+			M.ScrapeAway(null, CHANGETURF_IGNORE_AIR)
+
+/obj/structure/spawner/ice_moon/demonic_portal
+	name = "demonic portal"
+	desc = "A portal that goes to another world, normal creatures couldn't survive there."
+	icon_state = "nether"
+	mob_types = list(/mob/living/simple_animal/hostile/asteroid/ice_demon)
+	light_range = 1
+	light_color = LIGHT_COLOR_RED
+
+/obj/structure/spawner/ice_moon/demonic_portal/clear_rock()
+	for(var/turf/F in RANGE_TURFS(3, src))
+		if(abs(src.x - F.x) + abs(src.y - F.y) > 5)
+			continue
+		if(ismineralturf(F))
+			var/turf/closed/mineral/M = F
+			M.ScrapeAway(null, CHANGETURF_IGNORE_AIR)
+
+/obj/structure/spawner/ice_moon/demonic_portal/destroy_effect()
+	new /obj/effect/collapsing_demonic_portal(loc)
+
+/obj/structure/spawner/ice_moon/demonic_portal/drop_loot()
+	return
+
+/obj/structure/spawner/ice_moon/demonic_portal/ice_whelp
+	mob_types = list(/mob/living/simple_animal/hostile/asteroid/ice_whelp)
+
+/obj/structure/spawner/ice_moon/demonic_portal/snowlegion
+	mob_types = list(/mob/living/simple_animal/hostile/asteroid/hivelord/legion/snow/tendril)
+
+/obj/effect/collapsing_demonic_portal
+	name = "collapsing demonic portal"
+	desc = "It's slowly fading!"
+	layer = TABLE_LAYER
+	icon = 'icons/mob/nest.dmi'
+	icon_state = "nether"
+	anchored = TRUE
+	density = TRUE
+
+/obj/effect/collapsing_demonic_portal/Initialize()
+	. = ..()
+	playsound(loc,'sound/effects/tendril_destroyed.ogg', 200, FALSE, 50, TRUE, TRUE)
+	visible_message("<span class='boldannounce'>[src] begins to collapse, cutting it off from this world!</span>")
+	animate(src, transform = matrix().Scale(0, 1), alpha = 50, time = 5 SECONDS)
+	addtimer(CALLBACK(src, .proc/collapse), 5 SECONDS)
+
+/obj/effect/collapsing_demonic_portal/proc/collapse()
+	visible_message("<span class='warning'>Something slips out of [src]!</span>")
+	var/loot = rand(1, 28)
+	switch(loot)
+		if(1)
+			new /obj/item/clothing/suit/space/hardsuit/cult(loc)
+		if(2)
+			new /obj/item/clothing/glasses/godeye(loc)
+		if(3)
+			new /obj/item/reagent_containers/glass/bottle/potion/flight(loc)
+		if(4)
+			new /obj/item/organ/heart/cursed/wizard(loc)
+		if(5)
+			new /obj/item/jacobs_ladder(loc)
+		if(6)
+			new /obj/item/rod_of_asclepius(loc)
+		if(7)
+			new /obj/item/warp_cube/red(loc)
+		if(8)
+			new /obj/item/wisp_lantern(loc)
+		if(9)
+			new /obj/item/immortality_talisman(loc)
+		if(10)
+			new /obj/item/book/granter/spell/summonitem(loc)
+		if(11)
+			new /obj/item/clothing/neck/necklace/memento_mori(loc)
+		if(12)
+			new /obj/item/borg/upgrade/modkit/lifesteal(loc)
+			new /obj/item/bedsheet/cult(loc)
+		if(13)
+			new /obj/item/disk/design_disk/modkit_disc/mob_and_turf_aoe(loc)
+		if(14)
+			new /obj/item/disk/design_disk/modkit_disc/bounty(loc)
+		if(15)
+			new /obj/item/ship_in_a_bottle(loc)
+			new /obj/item/oar(loc)
+		if(16)
+			new /obj/item/seeds/gatfruit(loc)
+		if(17)
+			new /obj/item/reagent_containers/food/drinks/drinkingglass/filled/nuka_cola(loc)
+		if(18)
+			new /obj/item/assembly/signaler/anomaly/bluespace(loc)
+		if(19)
+			new /obj/item/disk/design_disk/modkit_disc/resonator_blast(loc)
+		if(20)
+			new /obj/item/disk/design_disk/modkit_disc/rapid_repeater(loc)
+		if(21)
+			new /obj/item/slimepotion/transference(loc)
+		if(22)
+			new /obj/item/slime_extract/adamantine(loc)
+		if(23)
+			new /obj/item/weldingtool/abductor(loc)
+		if(24)
+			new /obj/structure/elite_tumor(loc)
+		if(25)
+			new /mob/living/simple_animal/hostile/retaliate/clown/clownhulk(loc)
+		if(26)
+			new /obj/item/clothing/shoes/winterboots/ice_boots(loc)
+		if(27)
+			new /obj/item/book/granter/spell/sacredflame(loc)
+		if(28)
+			new /mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/doom(loc)

code/game/objects/structures/lavaland/geyser.dm

@@ -0,0 +1,86 @@
+//If you look at the "geyser_soup" overlay icon_state, you'll see that the first frame has 25 ticks.
+//That's because the first 18~ ticks are completely skipped for some ungodly weird fucking byond reason
+
+/obj/structure/geyser
+	name = "geyser"
+	icon = 'icons/obj/lavaland/terrain.dmi'
+	icon_state = "geyser"
+	anchored = TRUE
+
+	var/erupting_state = null //set to null to get it greyscaled from "[icon_state]_soup". Not very usable with the whole random thing, but more types can be added if you change the spawn prob
+	var/activated = FALSE //whether we are active and generating chems
+	var/reagent_id = /datum/reagent/fuel/oil
+	var/potency = 2 //how much reagents we add every process (2 seconds)
+	var/max_volume = 500
+	var/start_volume = 50
+
+/obj/structure/geyser/proc/start_chemming()
+	activated = TRUE
+	create_reagents(max_volume, DRAINABLE)
+	reagents.add_reagent(reagent_id, start_volume)
+	START_PROCESSING(SSfluids, src) //It's main function is to be plumbed, so use SSfluids
+	if(erupting_state)
+		icon_state = erupting_state
+	else
+		var/mutable_appearance/I = mutable_appearance('icons/obj/lavaland/terrain.dmi', "[icon_state]_soup")
+		I.color = mix_color_from_reagents(reagents.reagent_list)
+		add_overlay(I)
+
+/obj/structure/geyser/process()
+	if(activated && reagents.total_volume <= reagents.maximum_volume) //this is also evaluated in add_reagent, but from my understanding proc calls are expensive
+		reagents.add_reagent(reagent_id, potency)
+
+/obj/structure/geyser/plunger_act(obj/item/plunger/P, mob/living/user, _reinforced)
+	if(!_reinforced)
+		to_chat(user, "<span class='warning'>The [P.name] isn't strong enough!</span>")
+		return
+	if(activated)
+		to_chat(user, "<span class'warning'>The [name] is already active!</span>")
+		return
+
+	to_chat(user, "<span class='notice'>You start vigorously plunging [src]!</span>")
+	if(do_after(user, 50 * P.plunge_mod, target = src) && !activated)
+		start_chemming()
+
+/obj/structure/geyser/random
+	erupting_state = null
+	var/list/options = list(/datum/reagent/clf3 = 10, /datum/reagent/water/hollowwater = 10, /datum/reagent/medicine/omnizine/protozine = 6, /datum/reagent/wittel = 1)
+
+/obj/structure/geyser/random/Initialize()
+	. = ..()
+	reagent_id = pickweight(options)
+
+/obj/item/plunger
+	name = "plunger"
+	desc = "It's a plunger for plunging."
+	icon = 'icons/obj/watercloset.dmi'
+	icon_state = "plunger"
+
+	slot_flags = ITEM_SLOT_MASK
+
+	var/plunge_mod = 1 //time*plunge_mod = total time we take to plunge an object
+	var/reinforced = FALSE //whether we do heavy duty stuff like geysers
+
+/obj/item/plunger/attack_obj(obj/O, mob/living/user)
+	if(!O.plunger_act(src, user, reinforced))
+		return ..()
+
+/obj/item/plunger/throw_impact(atom/hit_atom, datum/thrownthing/tt)
+	. = ..()
+	if(tt.target_zone != BODY_ZONE_HEAD)
+		return
+	if(iscarbon(hit_atom))
+		var/mob/living/carbon/H = hit_atom
+		if(!H.wear_mask)
+			H.equip_to_slot_if_possible(src, ITEM_SLOT_MASK)
+			H.visible_message("<span class='warning'>The plunger slams into [H]'s face!</span>", "<span class='warning'>The plunger suctions to your face!</span>")
+
+/obj/item/plunger/reinforced
+	name = "reinforced plunger"
+	desc = "It's an M. 7 Reinforced Plunger© for heavy duty plunging."
+	icon_state = "reinforced_plunger"
+
+	reinforced = TRUE
+	plunge_mod = 0.8
+
+	custom_premium_price = 1200

code/game/objects/structures/lavaland/necropolis_tendril.dm

@@ -25,6 +25,9 @@
 /obj/structure/spawner/lavaland/legion
 	mob_types = list(/mob/living/simple_animal/hostile/asteroid/hivelord/legion/tendril)
 
+/obj/structure/spawner/lavaland/icewatcher
+	mob_types = list(/mob/living/simple_animal/hostile/asteroid/basilisk/watcher/icewing)
+
 GLOBAL_LIST_INIT(tendrils, list())
 /obj/structure/spawner/lavaland/Initialize()
 	. = ..()
@@ -94,4 +97,4 @@ GLOBAL_LIST_INIT(tendrils, list())
 	for(var/turf/T in range(2,src))
 		if(!T.density)
 			T.TerraformTurf(/turf/open/chasm/lavaland, /turf/open/chasm/lavaland, flags = CHANGETURF_INHERIT_AIR)
-	qdel(src)
+	qdel(src)

code/game/objects/structures/loom.dm

@@ -38,7 +38,4 @@
 			user.show_message("<span class='notice'>You weave \the [S.name] into a workable fabric.</span>", MSG_VISUAL)
 	return TRUE
 
-/obj/structure/loom/unanchored
-	anchored = FALSE
-
 #undef FABRIC_PER_SHEET

code/game/turfs/closed.dm

@@ -134,6 +134,15 @@
 	icon = 'icons/turf/walls.dmi'
 	icon_state = "icerock"
 
+/turf/closed/indestructible/rock/snow/ice/ore
+	icon = 'icons/turf/walls/icerock_wall.dmi'
+	icon_state = "icerock"
+	smooth = SMOOTH_MORE|SMOOTH_BORDER
+	canSmoothWith = list (/turf/closed)
+	pixel_x = -4
+	pixel_y = -4
+
+
 /turf/closed/indestructible/paper
 	name = "thick paper wall"
 	desc = "A wall layered with impenetrable sheets of paper."

code/game/turfs/open.dm

@@ -110,6 +110,9 @@
 	if(prob(12))
 		icon_state = "necro[rand(2,3)]"
 
+/turf/open/indestructible/necropolis/ice
+	initial_gas_mix = ICEMOON_DEFAULT_ATMOS
+
 /turf/open/indestructible/necropolis/air
 	initial_gas_mix = OPENTURF_DEFAULT_ATMOS
 

code/game/turfs/openspace/openspace.dm

@@ -146,3 +146,13 @@ GLOBAL_DATUM_INIT(openspace_backdrop_one_for_all, /atom/movable/openspace_backdr
 			PlaceOnTop(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR)
 			return TRUE
 	return FALSE
+
+/turf/open/openspace/icemoon
+	name = "ice chasm"
+	baseturfs = /turf/open/openspace/icemoon
+	can_cover_up = FALSE
+	can_build_on = FALSE
+	initial_gas_mix = ICEMOON_DEFAULT_ATMOS
+
+/turf/open/openspace/icemoon/can_zFall(atom/movable/A, levels = 1, turf/target)
+	return TRUE

code/game/turfs/simulated/chasm.dm

@@ -88,6 +88,15 @@
 	light_power = 0.65 //less bright, too
 	light_color = LIGHT_COLOR_LAVA //let's just say you're falling into lava, that makes sense right
 
+// Chasms for Ice moon, with planetary atmos and glow
+/turf/open/chasm/icemoon
+	icon = 'icons/turf/floors/icechasms.dmi'
+	initial_gas_mix = ICEMOON_DEFAULT_ATMOS
+	planetary_atmos = TRUE
+	baseturfs = /turf/open/chasm/icemoon
+	light_range = 1.9
+	light_power = 0.65
+	light_color = LIGHT_COLOR_PURPLE
 
 // Chasms for the jungle, with planetary atmos and a different icon
 /turf/open/chasm/jungle
@@ -115,4 +124,4 @@
 	. = ..()
 	var/turf/T = safepick(get_area_turfs(/area/fabric_of_reality))
 	if(T)
-		set_target(T)
+		set_target(T)

code/game/turfs/simulated/floor.dm

@@ -48,7 +48,9 @@
 					"oldburning","light-on-r","light-on-y","light-on-g","light-on-b", "wood", "carpetsymbol", "carpetstar",
 					"carpetcorner", "carpetside", "carpet", "ironsand1", "ironsand2", "ironsand3", "ironsand4", "ironsand5",
 					"ironsand6", "ironsand7", "ironsand8", "ironsand9", "ironsand10", "ironsand11",
-					"ironsand12", "ironsand13", "ironsand14", "ironsand15")
+					"ironsand12", "ironsand13", "ironsand14", "ironsand15",
+					"snow", "snow0", "snow1", "snow2", "snow3", "snow4", "snow5", "snow6", "snow7", "snow8", "snow9", "snow10", "snow11", "snow12", "snow-ice", "snow_dug",
+					"unsmooth", "smooth", "1-i", "2-i", "3-i", "4-i", "1-n", "2-n", "3-s", "4-s", "1-w", "2-e", "3-w", "4-e", "1-nw", "2-ne", "3-sw", "4-se", "1-f", "2-f", "3-f", "4-f")
 	if(broken || burnt || (icon_state in icons_to_ignore_at_floor_init)) //so damaged/burned tiles or plating icons aren't saved as the default
 		icon_regular_floor = "floor"
 	else