Returns Ice V2 to rotation for the Holiday Season

code/__DEFINES/__game.dm

@@ -35,6 +35,8 @@ block( \
 #define MAP_SOROKYNE_STRATA "Sorokyne Strata"
 #define MAP_CORSAT "CORSAT" // Highpop only
 #define MAP_KUTJEVO "Kutjevo Refinery"
+#define MAP_ICE_COLONY_V1 "Ice Colony Classic"
+#define MAP_ICE_COLONY_V2 "Ice Colony V2"
 #define MAP_ICE_COLONY_V3 "Shivas Snowball" //Ice Rework, low pop enabled.
 #define MAP_RUNTIME "USS Runtime"
 #define MAP_LV522_CHANCES_CLAIM "LV-522 Chance's Claim" // Highpop Only

code/datums/shuttles.dm

@@ -115,3 +115,21 @@
 
 /datum/map_template/shuttle/trijent_elevator/B
 	elevator_network = "B"
+
+/datum/map_template/shuttle/trijent_elevator/ice_elevator
+	name = "Classic Ice Elevator"
+	shuttle_id = "ice_classic_shuttle"
+
+/datum/map_template/shuttle/trijent_elevator/ice_elevator/lab
+	elevator_network = "lab"
+
+/datum/map_template/shuttle/trijent_elevator/ice_elevator/dorm
+	elevator_network = "dorm"
+
+/datum/map_template/shuttle/trijent_elevator/ice_elevator/arrivals
+	elevator_network = "Arrivals"
+/datum/map_template/shuttle/trijent_elevator/ice_elevator/omicorn
+	elevator_network = "Omicorn"
+
+/datum/map_template/shuttle/trijent_elevator/ice_elevator/requisitions
+	elevator_network = "Requisitions"

code/game/area/IceColony.dm

@@ -124,6 +124,12 @@
 	name = "\improper South Western Valleys"
 	icon_state = "valley_south_west"
 
+/area/ice_colony/exterior/surface/valley/northeast/apc_support
+	always_unpowered = FALSE
+
+/area/ice_colony/exterior/surface/valley/southeast/apc_support
+	always_unpowered = FALSE
+
 //
 // Clearing
 // The Colony Center, so to speak
@@ -791,57 +797,81 @@
 /area/shuttle/elevator1/ground
 	name = "\improper Elevator I"
 	icon_state = "shuttlered"
+	requires_power = TRUE
+	unlimited_power = FALSE
 
 /area/shuttle/elevator1/underground
 	name = "\improper Elevator I"
 	icon_state = "shuttle"
+	requires_power = TRUE
+	unlimited_power = FALSE
 
 /area/shuttle/elevator1/transit
 	name = "\improper Elevator I"
 	icon_state = "shuttle2"
+	requires_power = TRUE
+	unlimited_power = FALSE
 
 /area/shuttle/elevator2/ground
 	name = "\improper Elevator II"
 	icon_state = "shuttle"
+	requires_power = TRUE
+	unlimited_power = FALSE
 
 /area/shuttle/elevator2/underground
 	name = "\improper Elevator II"
 	icon_state = "shuttle2"
+	requires_power = TRUE
+	unlimited_power = FALSE
 
 /area/shuttle/elevator2/transit
 	name = "\improper Elevator II"
 	icon_state = "shuttlered"
+	requires_power = TRUE
+	unlimited_power = FALSE
 
 /area/shuttle/elevator3/ground
 	name = "\improper Elevator III"
 	icon_state = "shuttle"
+	requires_power = TRUE
+	unlimited_power = FALSE
 
 /area/shuttle/elevator3/underground
 	name = "\improper Elevator III"
 	icon_state = "shuttle2"
+	requires_power = TRUE
+	unlimited_power = FALSE
 
 /area/shuttle/elevator3/transit
 	name = "\improper Elevator III"
 	icon_state = "shuttlered"
+	requires_power = TRUE
+	unlimited_power = FALSE
 
 /area/shuttle/elevator4/ground
 	name = "\improper Elevator IV"
 	icon_state = "shuttlered"
+	requires_power = TRUE
+	unlimited_power = FALSE
 
 /area/shuttle/elevator4/underground
 	name = "\improper Elevator IV"
 	icon_state = "shuttle"
+	requires_power = TRUE
+	unlimited_power = FALSE
 
 /area/shuttle/elevator4/transit
 	name = "\improper Elevator IV"
 	icon_state = "shuttle2"
+	requires_power = TRUE
+	unlimited_power = FALSE
 
 /area/ice_colony/landing/console
 	name = "\improper LZ1 'Lazarus'"
 	icon_state = "tcomsatcham"
-	requires_power = 0
+	requires_power = FALSE
 
 /area/ice_colony/landing/console2
 	name = "\improper LZ2 'Underground'"
 	icon_state = "tcomsatcham"
-	requires_power = 0
+	requires_power = FALSE

code/game/machinery/doors/poddoor.dm

@@ -12,6 +12,8 @@
 	layer = PODDOOR_CLOSED_LAYER
 	open_layer = PODDOOR_OPEN_LAYER
 	closed_layer = PODDOOR_CLOSED_LAYER
+	///How many tiles the shutter occupies
+	var/shutter_length = 1
 
 /obj/structure/machinery/door/poddoor/Initialize()
 	. = ..()
@@ -111,6 +113,8 @@
 	operating = FALSE
 
 /obj/structure/machinery/door/poddoor/two_tile/open()
+	if(!density)
+		return
 	if(operating) //doors can still open when emag-disabled
 		return
 
@@ -148,6 +152,8 @@
 	..()
 
 /obj/structure/machinery/door/poddoor/two_tile/close()
+	if(density)
+		return
 	if(operating)
 		return
 	start_closing()
@@ -182,6 +188,7 @@
 /obj/structure/machinery/door/poddoor/two_tile
 	dir = EAST
 	icon = 'icons/obj/structures/doors/1x2blast_hor.dmi'
+	shutter_length = 2
 	var/obj/structure/machinery/door/poddoor/filler_object/f1
 	var/obj/structure/machinery/door/poddoor/filler_object/f2
 
@@ -211,6 +218,7 @@
 
 /obj/structure/machinery/door/poddoor/two_tile/four_tile
 	icon = 'icons/obj/structures/doors/1x4blast_hor.dmi'
+	shutter_length = 4
 	var/obj/structure/machinery/door/poddoor/filler_object/f3
 	var/obj/structure/machinery/door/poddoor/filler_object/f4
 
@@ -263,6 +271,15 @@
 /obj/structure/machinery/door/poddoor/two_tile/four_tile/vertical/secure/open
 	density = FALSE
 
+/obj/structure/machinery/door/poddoor/two_tile/four_tile/pivot/Initialize()
+	. = ..()
+	RegisterSignal(src, COMSIG_ATOM_DIR_CHANGE, PROC_REF(direction_change_move))
+
+/obj/structure/machinery/door/poddoor/two_tile/four_tile/pivot/proc/direction_change_move(source, old_dir, new_dir)
+	if(old_dir == new_dir)
+		return
+	x -= shutter_length - 1
+
 /obj/structure/machinery/door/poddoor/two_tile/secure
 	icon = 'icons/obj/structures/doors/1x2blast_hor.dmi'
 	openspeed = 17

code/modules/cm_marines/equipment/maps.dm

@@ -67,6 +67,12 @@
 	html_link = "images/1/18/Map_icecolony.png"
 	color = "cyan"
 
+/obj/item/map/ice_colony_map/v1
+	html_link = "https://cm-ss13.com/w/images/8/88/Ice_V1.png"
+
+/obj/item/map/ice_colony_map_/v2
+	html_link = "https://cm-ss13.com/w/images/c/cf/Ice_Colony_v2.png"
+
 /obj/item/map/ice_colony_map_v3
 	name = "\improper Shivas Snowball map"
 	desc = "A labelled print out of the anterior scan of the UA colony Shivas Snowball."
@@ -139,6 +145,8 @@ GLOBAL_LIST_INIT_TYPED(map_type_list, /obj/item/map, setup_all_maps())
 	return list(
 		MAP_LV_624 = new /obj/item/map/lazarus_landing_map(),
 		MAP_ICE_COLONY = new /obj/item/map/ice_colony_map(),
+		MAP_ICE_COLONY_V1 = new /obj/item/map/ice_colony_map/v1(),
+		MAP_ICE_COLONY_V2 = new /obj/item/map/ice_colony_map_/v2(),
 		MAP_ICE_COLONY_V3 = new /obj/item/map/ice_colony_map_v3(),
 		MAP_WHISKEY_OUTPOST = new /obj/item/map/whiskey_outpost_map(),
 		MAP_BIG_RED = new /obj/item/map/big_red_map(),

code/modules/shuttle/shuttles/trijent_elevator.dm

@@ -117,3 +117,9 @@
 	id=STAT_TRIJENT_OMEGA
 	airlock_area=/area/shuttle/trijent_shuttle/omega
 	airlock_exit="east"
+
+/obj/docking_port/mobile/trijent_elevator/ice_classic
+	name = "Classic Ice Elevator"
+	id = "ice_classic_shuttle"
+	width = 8
+	height = 5

map_config/maps.txt

@@ -37,10 +37,12 @@ map desert_dam
 	minplayers 130
 endmap
 
+map ice_colony_v1
+	minplayers 130
+endmap
+
 map ice_colony_v2
 	minplayers 130
-	voteweight 0
-	disabled
 endmap
 
 map shivas_snowball

maps/ice_colony_v1.json

@@ -0,0 +1,47 @@
+{
+    "map_name": "Ice Colony Classic",
+    "map_path": "map_files/Ice_Colony_v1",
+    "map_file": "Ice_Colony_v1.dmm",
+    "environment_traits": {
+        "COLD": true
+    },
+    "weather_holder": "/datum/weather_ss_map_holder/sorokyne",
+    "survivor_types": [
+        "/datum/equipment_preset/survivor/corporate/shiva",
+        "/datum/equipment_preset/survivor/doctor/shiva",
+        "/datum/equipment_preset/survivor/scientist/shiva",
+        "/datum/equipment_preset/survivor/engineer/shiva",
+        "/datum/equipment_preset/survivor/security/shiva",
+        "/datum/equipment_preset/survivor/clf/cold",
+        "/datum/equipment_preset/survivor/civilian"
+    ],
+    "defcon_triggers": [
+        3300,
+        2100,
+        1450,
+        580,
+        0.0
+    ],
+    "survivor_message": "You are a survivor of the attack on the ice habitat. You worked or lived on the colony, and managed to avoid the alien attacks... until now.",
+    "map_item_type": "/obj/item/map/ice_colony_map",
+    "announce_text": "An automated distress signal has been received from archaeology site \"Shiva's Snowball\", on border ice world \"Ifrit\". A response team from the ###SHIPNAME### will be dispatched shortly to investigate.",
+    "monkey_types": [
+        "yiren"
+    ],
+    "traits": [{ "Ground": true }],
+    "xvx_hives": {
+        "xeno_hive_alpha": 0,
+        "xeno_hive_bravo": 0,
+        "xeno_hive_charlie": 0,
+        "xeno_hive_delta": 0
+    },
+    "nightmare_path": "maps/Nightmare/maps/Ice_Colony_v1/",
+    "camouflage": "snow",
+    "gamemodes": [
+        "Distress Signal",
+        "Hunter Games",
+        "Hive Wars",
+        "Faction Clash",
+        "Infection"
+    ]
+}

maps/ice_colony_v2.json

@@ -1,5 +1,5 @@
 {
-    "map_name": "Ice Colony",
+    "map_name": "Ice Colony v2",
     "map_path": "map_files/Ice_Colony_v2",
     "map_file": "Ice_Colony_v2.dmm",
     "environment_traits": {
@@ -22,7 +22,7 @@
         0.0
     ],
     "survivor_message": "You are a survivor of the attack on the ice habitat. You worked or lived on the colony, and managed to avoid the alien attacks... until now.",
-    "map_item_type": "/obj/item/map/ice_colony_map",
+    "map_item_type": "/obj/item/map/ice_colony_map/v2",
     "announce_text": "An automated distress signal has been received from archaeology site \"Shiva's Snowball\", on border ice world \"Ifrit\". A response team from the ###SHIPNAME### will be dispatched shortly to investigate.",
     "monkey_types": [
         "yiren"