Ports the reworked snowcabin and beach away missions by Jerry Derpinson (the baldy)

_maps/RandomZLevels/away_mission/TheBeach.dmm

@@ -666,7 +666,7 @@
 	pixel_x = 24;
 	specialfunctions = 4
 	},
-/obj/item/bedsheet/red,
+/obj/effect/spawner/lootdrop/bedsheet,
 /turf/open/floor/wood,
 /area/awaymission/beach)
 "bU" = (
@@ -799,9 +799,7 @@
 /turf/open/floor/wood,
 /area/awaymission/beach)
 "cn" = (
-/obj/machinery/vending/boozeomat{
-	desc = "A technological marvel, supposedly able to mix just the mixture you'd like to drink the moment you ask for one. May not work for bartenders that don't have Nanotrasen bank accounts."
-	},
+/obj/machinery/vending/boozeomat,
 /turf/open/floor/wood,
 /area/awaymission/beach)
 "co" = (
@@ -897,9 +895,7 @@
 /area/awaymission/beach)
 "cD" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/rag{
-	pixel_y = 7
-	},
+/obj/item/reagent_containers/rag,
 /turf/open/floor/wood,
 /area/awaymission/beach)
 "cE" = (
@@ -1081,14 +1077,6 @@
 /obj/item/clothing/glasses/heat,
 /turf/open/floor/plating/beach/sand,
 /area/awaymission/beach)
-"iy" = (
-/obj/item/toy/seashell,
-/turf/open/floor/plating/beach/coastline_t,
-/area/awaymission/beach)
-"MD" = (
-/obj/item/toy/seashell,
-/turf/open/floor/plating/beach/sand,
-/area/awaymission/beach)
 
 (1,1,1) = {"
 aa
@@ -4660,9 +4648,9 @@ ac
 aw
 af
 ay
-MD
 ak
-MD
+ak
+ak
 aT
 ao
 aY
@@ -4766,7 +4754,7 @@ ac
 aw
 af
 ay
-MD
+ak
 ak
 ak
 ak
@@ -4875,7 +4863,7 @@ ay
 ak
 ak
 ak
-MD
+ak
 ak
 ak
 ak
@@ -5216,7 +5204,7 @@ aY
 ae
 aw
 ag
-MD
+ak
 aZ
 ak
 ak
@@ -5317,7 +5305,7 @@ ak
 ak
 ak
 ak
-MD
+ak
 aT
 aj
 aj
@@ -5328,7 +5316,7 @@ ak
 ak
 ak
 ak
-MD
+ak
 aT
 ao
 ar
@@ -6294,7 +6282,7 @@ ak
 ak
 ak
 ak
-iy
+ap
 ar
 ac
 ac
@@ -6474,7 +6462,7 @@ ac
 ac
 ad
 ag
-MD
+ak
 ak
 ak
 ak
@@ -6822,7 +6810,7 @@ cl
 bd
 bd
 bd
-cD
+cC
 cH
 ba
 ak
@@ -6929,7 +6917,7 @@ cm
 bd
 bd
 bd
-cC
+cD
 cH
 ba
 ak
@@ -8956,7 +8944,7 @@ ak
 ak
 ak
 ak
-MD
+ak
 ak
 ak
 cu
@@ -10328,7 +10316,7 @@ ac
 ac
 aw
 ag
-MD
+ak
 ak
 ak
 ak
@@ -10436,7 +10424,7 @@ ad
 af
 ay
 ak
-MD
+ak
 ak
 ak
 ak
@@ -10574,7 +10562,7 @@ ak
 ak
 cO
 ak
-iy
+ap
 ar
 ac
 ac
@@ -10787,7 +10775,7 @@ ak
 ak
 ak
 aK
-MD
+ak
 ap
 ar
 ac
@@ -10970,7 +10958,7 @@ ac
 ac
 ax
 ag
-MD
+ak
 ak
 ak
 ak
@@ -11000,7 +10988,7 @@ ak
 ak
 ak
 ak
-MD
+ak
 bo
 aq
 ar
@@ -15007,7 +14995,7 @@ ad
 ag
 al
 ak
-MD
+ak
 ap
 ar
 ab

code/game/turfs/closed.dm

@@ -87,6 +87,11 @@
 	smooth = SMOOTH_TRUE
 	explosion_block = INFINITY
 
+/turf/closed/indestructible/syndicate
+	icon = 'icons/turf/walls/plastitanium_wall.dmi'
+	icon_state = "map-shuttle"
+	smooth = SMOOTH_TRUE
+
 /turf/closed/indestructible/riveted/uranium
 	icon = 'icons/turf/walls/uranium_wall.dmi'
 	icon_state = "uranium"

code/modules/antagonists/abductor/ice_abductor.dm

@@ -0,0 +1,12 @@
+/obj/structure/fluff/iced_abductor ///Unless more non-machine ayy structures made, it will stay in fluff.
+	name = "Mysterious Block of Ice"
+	desc = "A shadowy figure lies in this sturdy-looking block of ice. Who knows where it came from?"
+	icon = 'icons/effects/freeze.dmi'
+	icon_state =  "ice_ayy"
+	density = TRUE
+	deconstructible = FALSE
+
+/obj/structure/fluff/iced_abductor/Destroy()
+	var/turf/T = get_turf(src)
+	new /obj/effect/mob_spawn/human/abductor(T)
+	. = ..() 

code/modules/awaymissions/mission_code/Cabin.dm

@@ -1,20 +1,39 @@
 
 /*Cabin areas*/
-/area/awaymission/snowforest
-	name = "Snow Forest"
-	icon_state = "away"
-	requires_power = FALSE
-	dynamic_lighting = DYNAMIC_LIGHTING_ENABLED
-
 /area/awaymission/cabin
 	name = "Cabin"
 	icon_state = "away2"
 	requires_power = TRUE
 	dynamic_lighting = DYNAMIC_LIGHTING_ENABLED
 
-/area/awaymission/snowforest/lumbermill
+/area/awaymission/cabin/snowforest
+	name = "Snow Forest"
+	icon_state = "away"
+	dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
+
+/area/awaymission/cabin/snowforest/sovietsurface
+	name = "Snow Forest"
+	icon_state = "awaycontent29"
+	requires_power = FALSE
+
+/area/awaymission/cabin/lumbermill
 	name = "Lumbermill"
 	icon_state = "away3"
+	requires_power = FALSE
+	dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
+
+/area/awaymission/cabin/caves/sovietcave
+	name = "Soviet Bunker"
+	icon_state = "awaycontent4"
+
+/area/awaymission/cabin/caves
+	name = "North Snowdin Caves"
+	icon_state = "awaycontent15"
+	dynamic_lighting = DYNAMIC_LIGHTING_FORCED
+
+/area/awaymission/cabin/caves/mountain
+	name = "North Snowdin Mountains"
+	icon_state = "awaycontent24"
 
 /obj/structure/firepit
 	name = "firepit"
@@ -92,7 +111,7 @@
 	egg_type = null
 	speak = list()
 
-/*Cabin's forest*/
+/*Cabin's forest. Removed in the new cabin map since it was buggy and I prefer manual placement.*/
 /datum/mapGenerator/snowy
 	modules = list(/datum/mapGeneratorModule/bottomlayer/snow, \
 	/datum/mapGeneratorModule/snow/pineTrees, \

code/modules/vehicles/atv.dm

@@ -68,7 +68,7 @@
 
 /obj/vehicle/ridden/atv/snowmobile/Moved()
 	. = ..()
-	var/static/list/snow_typecache = typecacheof(list(/turf/open/floor/plating/asteroid/snow/icemoon, /turf/open/floor/plating/snowed/smoothed/icemoon))
+	var/static/list/snow_typecache = typecacheof(list(/turf/open/floor/plating/asteroid/snow/icemoon, /turf/open/floor/plating/snowed/smoothed/icemoon, /turf/open/floor/plating/snowed, /turf/open/floor/plating/asteroid/snow))
 	var/datum/component/riding/E = LoadComponent(/datum/component/riding)
 	if(snow_typecache[loc.type])
 		E.vehicle_move_delay = 1

config/awaymissionconfig.txt

@@ -19,4 +19,4 @@
 #_maps/RandomZLevels/away_mission/caves.dmm
 #_maps/RandomZLevels/away_mission/snowdin.dmm
 #_maps/RandomZLevels/away_mission/research.dmm
-#_maps/RandomZLevels/away_mission/Cabin.dmm
+#_maps/RandomZLevels/away_mission/SnowCabin.dmm

tgstation.dme

@@ -1347,6 +1347,7 @@
 #include "code\modules\antagonists\_common\antag_spawner.dm"
 #include "code\modules\antagonists\_common\antag_team.dm"
 #include "code\modules\antagonists\abductor\abductor.dm"
+#include "code\modules\antagonists\abductor\ice_abductor.dm"
 #include "code\modules\antagonists\abductor\abductee\abductee.dm"
 #include "code\modules\antagonists\abductor\abductee\abductee_objectives.dm"
 #include "code\modules\antagonists\abductor\abductee\trauma.dm"