Merge remote-tracking branch 'cmss13-devs/master' into project/fax_re…

…sponders/main

code/__DEFINES/__game.dm

@@ -187,6 +187,7 @@
 #define DOCK_ATTEMPT_TIMEOUT 20 SECONDS
 #define DROPSHIP_WARMUP_TIME 10 SECONDS
 #define DROPSHIP_DROP_MSG_DELAY 30 SECONDS
+#define DROPSHIP_DROP_FIRE_DELAY 20 SECONDS
 #define DROPSHIP_TRANSIT_DURATION 100 SECONDS
 #define DROPSHIP_CORSAT_DURATION 30 SECONDS
 #define ELEVATOR_TRANSIT_DURATION 5 SECONDS

code/__DEFINES/dcs/signals/atom/signals_area.dm

@@ -0,0 +1,2 @@
+/// From /area/proc/purge_weeds()
+#define COMSIG_AREA_RESIN_DISALLOWED "area_weeds_disallowed"

code/__DEFINES/maps.dm

@@ -120,3 +120,8 @@ require only minor tweaks.
 
 /// A map key that corresponds to being one exclusively for Space.
 #define SPACE_KEY "space"
+
+#define SENTRY_TOP_LEFT "top_left"
+#define SENTRY_TOP_RIGHT "top_right"
+#define SENTRY_BOTTOM_LEFT "bottom_left"
+#define SENTRY_BOTTOM_RIGHT "bottom_right"

code/datums/components/resin_cleanup.dm

@@ -0,0 +1,19 @@
+/**
+ * Handles cleaning up resin when the area requests it
+ */
+/datum/component/resin_cleanup
+
+/datum/component/resin_cleanup/Initialize(...)
+	var/area/parent_area = get_area(parent)
+
+	RegisterSignal(parent_area, COMSIG_AREA_RESIN_DISALLOWED, PROC_REF(cleanup_resin))
+
+/datum/component/resin_cleanup/proc/cleanup_resin()
+	SIGNAL_HANDLER
+
+	if(isturf(parent))
+		var/turf/parent_turf = parent
+		addtimer(CALLBACK(parent_turf, TYPE_PROC_REF(/turf, ScrapeAway)), rand(1 SECONDS, 5 SECONDS))
+		return
+
+	QDEL_IN(parent, rand(1 SECONDS, 5 SECONDS))

code/game/area/BigRed.dm

@@ -20,6 +20,7 @@
 	name = "\improper Garage Workshop"
 	icon_state = "green"
 	ceiling = CEILING_METAL
+	linked_lz = DROPSHIP_LZ1
 
 /area/bigred/ground/ship
 	name = "\improper Crashed Vessel"
@@ -262,6 +263,7 @@
 	sound_environment = SOUND_ENVIRONMENT_ROOM
 	soundscape_playlist = list()
 	minimap_color = MINIMAP_AREA_RESEARCH
+	unoviable_timer = FALSE
 
 /area/bigredv2/caves/lambda/virology
 	name = "\improper Lambda Virology"
@@ -289,6 +291,7 @@
 	ambience_exterior = AMBIENCE_CAVE
 	soundscape_playlist = SCAPE_PL_CAVE
 	base_muffle = MUFFLE_HIGH
+	unoviable_timer = FALSE
 
 // serve for the security checkpoint.
 /area/bigredv2/outside/lambda_cave_cas
@@ -329,7 +332,7 @@
 /area/bigredv2/outside/nw
 	name = "\improper Northwest Colony Grounds"
 	icon_state = "northwest"
-	is_resin_allowed = FALSE
+	linked_lz = DROPSHIP_LZ1
 	soundscape_playlist = SCAPE_PL_DESERT_STORM
 
 /area/bigredv2/outside/nw/ceiling
@@ -348,7 +351,7 @@
 /area/bigredv2/outside/w
 	name = "\improper Western Colony Grounds"
 	icon_state = "west"
-	is_resin_allowed = FALSE
+	linked_lz = DROPSHIP_LZ2
 
 /area/bigredv2/outside/e
 	name = "\improper Eastern Colony Grounds"
@@ -368,7 +371,7 @@
 /area/bigredv2/outside/sw
 	name = "\improper Southwest Colony Grounds"
 	icon_state = "southwest"
-	is_resin_allowed = FALSE
+	linked_lz = DROPSHIP_LZ2
 	soundscape_playlist = SCAPE_PL_DESERT_STORM
 
 /area/bigredv2/caves
@@ -387,14 +390,15 @@
 	name = "\improper Southwest Abandoned Mining Caves"
 	icon_state = "bluenew"
 	color = "purple"
-
+	unoviable_timer = FALSE
 
 /area/bigredv2/caves/eta
 	ceiling = CEILING_UNDERGROUND_METAL_BLOCK_CAS
 	ceiling_muffle = FALSE
 	ambience_exterior = AMBIENCE_ALMAYER
 	sound_environment = SOUND_ENVIRONMENT_ROOM
 	soundscape_playlist = list()
+	unoviable_timer = FALSE
 
 /area/bigredv2/outside/eta
 	name = "\improper Eta Labs Compound"
@@ -422,25 +426,27 @@
 	name = "\improper Cargo"
 	icon_state = "storage"
 	ceiling = CEILING_METAL
-	is_resin_allowed = FALSE
+	linked_lz = DROPSHIP_LZ2
 
 /area/bigredv2/outside/general_store
 	name = "\improper General Store"
 	icon_state = "blueold"
 	ceiling = CEILING_METAL
-
+	linked_lz = DROPSHIP_LZ2
 
 /area/bigredv2/outside/marshal_office
 	name = "\improper Marshal Offices"
 	icon_state = "brig"
 	ceiling = CEILING_METAL
 	minimap_color = MINIMAP_AREA_SEC
+	linked_lz = DROPSHIP_LZ1
 
 /area/bigredv2/outside/medical
 	name = "\improper Hospital"
 	icon_state = "CMO"
 	ceiling = CEILING_METAL
 	minimap_color = MINIMAP_AREA_MEDBAY
+	linked_lz = DROPSHIP_LZ1
 
 /area/bigredv2/outside/admin_building
 	name = "\improper Administration"
@@ -461,6 +467,7 @@
 	ceiling_muffle = FALSE
 	base_muffle = MUFFLE_MEDIUM
 	minimap_color = MINIMAP_AREA_MEDBAY
+	linked_lz = DROPSHIP_LZ1
 
 /area/bigredv2/outside/dorms
 	name = "\improper Dormitories"
@@ -496,14 +503,14 @@
 	name = "\improper Space Port"
 	icon_state = "green"
 	ceiling = CEILING_GLASS
-	is_resin_allowed = FALSE
+	linked_lz = DROPSHIP_LZ1
 	is_landing_zone = TRUE
 
 /area/bigredv2/outside/space_port_lz2
 	name = "\improper Cargo Landing Pad"
 	icon_state = "green"
 	ceiling = CEILING_NONE
-	is_resin_allowed = FALSE
+	linked_lz = DROPSHIP_LZ2
 	is_landing_zone = TRUE
 	minimap_color = MINIMAP_AREA_LZ
 
@@ -512,7 +519,7 @@
 	name = "\improper LZ1 Communications Relay"
 	icon_state = "ass_line"
 	ceiling = CEILING_UNDERGROUND_METAL_ALLOW_CAS
-	is_resin_allowed = FALSE
+	linked_lz = DROPSHIP_LZ1
 	ceiling_muffle = FALSE
 	base_muffle = MUFFLE_LOW
 	is_landing_zone = TRUE
@@ -524,6 +531,7 @@
 /area/bigredv2/outside/telecomm/n_cave
 	name = "\improper North Cave Communications Relay"
 	is_landing_zone = FALSE
+	linked_lz = DROPSHIP_LZ1
 
 /area/bigredv2/outside/telecomm/warehouse
 	name = "\improper Warehouse Communications Relay"
@@ -550,6 +558,11 @@
 	name = "\improper Engineering Complex"
 	icon_state = "engine"
 	ceiling = CEILING_METAL
+	linked_lz = DROPSHIP_LZ2
+
+/area/bigredv2/outside/engineering/reactor
+	name = "\improper Main Reactor"
+	linked_lz = null
 
 /area/bigredv2/outside/storage
 	name = "\improper Storage"
@@ -601,6 +614,7 @@
 	soundscape_playlist = SCAPE_PL_CAVE
 	base_muffle = MUFFLE_HIGH
 	minimap_color = MINIMAP_AREA_RESEARCH_CAVE
+	unoviable_timer = FALSE
 
 /area/bigredv2/caves_se
 	name = "\improper Southeastern Caves"
@@ -611,6 +625,7 @@
 	ambience_exterior = AMBIENCE_CAVE
 	soundscape_playlist = SCAPE_PL_CAVE
 	base_muffle = MUFFLE_HIGH
+	unoviable_timer = FALSE
 
 /area/bigredv2/caves_east
 	name = "\improper Eastern Caves"
@@ -621,6 +636,7 @@
 	ambience_exterior = AMBIENCE_CAVE
 	soundscape_playlist = SCAPE_PL_CAVE
 	base_muffle = MUFFLE_HIGH
+	unoviable_timer = FALSE
 
 /area/bigredv2/caves_north
 	name = "\improper Northern Caves"
@@ -650,21 +666,25 @@
 	name = "\improper Northern Caves Entrance"
 	icon_state = "garden"
 	ceiling = CEILING_UNDERGROUND_ALLOW_CAS
+	linked_lz = DROPSHIP_LZ1
 
 /area/bigredv2/outside/lz1_telecomm_cas
 	name = "\improper Virology Caves Entrance"
 	icon_state = "garden"
 	ceiling = CEILING_UNDERGROUND_ALLOW_CAS
+	linked_lz = DROPSHIP_LZ1
 
 /area/bigredv2/outside/lz2_west_cas
 	name = "\improper Southwestern Caves Entrance"
 	icon_state = "garden"
 	ceiling = CEILING_UNDERGROUND_ALLOW_CAS
+	linked_lz = DROPSHIP_LZ2
 
 /area/bigredv2/outside/lz2_south_cas
 	name = "\improper ETA Lockdown Caves Entrance"
 	icon_state = "garden"
 	ceiling = CEILING_UNDERGROUND_ALLOW_CAS
+	linked_lz = DROPSHIP_LZ2
 
 /area/bigredv2/outside/filtration_cave_cas
 	name = "\improper Filtration Lockdown Caves Entrance"