Merge branch 'master' into ARES_Consequences

code/__DEFINES/__game.dm

@@ -392,6 +392,7 @@ block( \
 #define FIRE_MISSION_WEAPON_REMOVED 8
 #define FIRE_MISSION_WEAPON_UNUSABLE 16
 #define FIRE_MISSION_WEAPON_OUT_OF_AMMO 32
+#define FIRE_MISSION_BAD_DIRECTION 64
 #define FIRE_MISSION_NOT_EXECUTABLE -1
 
 //Defines for firemission state

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

@@ -68,3 +68,12 @@
 
 //from /datum/authority/branch/role/proc/equip_role()
 #define COMSIG_POST_SPAWN_UPDATE "post_spawn_update"
+
+#define COMSIG_CAMERA_MAPNAME_ASSIGNED "camera_manager_mapname_assigned"
+#define COMSIG_CAMERA_REGISTER_UI "camera_manager_register_ui"
+#define COMSIG_CAMERA_UNREGISTER_UI "camera_manager_unregister_ui"
+#define COMSIG_CAMERA_SET_NVG "camera_manager_set_nvg"
+#define COMSIG_CAMERA_CLEAR_NVG "camera_manager_clear_nvg"
+#define COMSIG_CAMERA_SET_TARGET "camera_manager_set_target"
+#define COMSIG_CAMERA_SET_AREA "camera_manager_set_area"
+#define COMSIG_CAMERA_CLEAR "camera_manager_clear_target"

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

@@ -30,4 +30,6 @@
 /// from /obj/proc/afterbuckle()
 #define COSMIG_OBJ_AFTER_BUCKLE "signal_obj_after_buckle"
 
+#define COMSIG_DROPSHIP_ADD_EQUIPMENT "dropship_add_equipment"
+#define COMSIG_DROPSHIP_REMOVE_EQUIPMENT "dropship_remove_equipment"
 #define COMSIG_STRUCTURE_CRATE_SQUAD_LAUNCHED "structure_crate_squad_launched"

code/__DEFINES/layers.dm

@@ -230,6 +230,7 @@
 ///--------------- FULLSCREEN RUNECHAT BUBBLES ------------
 #define LIGHTING_PLANE 100
 #define EXTERIOR_LIGHTING_PLANE 101
+#define NVG_PLANE 110
 
 ///Popup Chat Messages
 #define RUNECHAT_PLANE 501

code/_onclick/hud/rendering/plane_master.dm

@@ -149,6 +149,14 @@
 	remove_filter("AO")
 	add_filter("AO", 1, drop_shadow_filter(x = 0, y = -2, size = 4, color = "#04080FAA"))
 
+/atom/movable/screen/plane_master/nvg_plane
+	name = "NVG plane"
+	plane = NVG_PLANE
+	render_relay_plane = RENDER_PLANE_GAME
+	blend_mode_override = BLEND_MULTIPLY
+	//icon = 'icons/mob/hud/screen1.dmi'
+	//icon_state = "noise"
+
 /atom/movable/screen/plane_master/fullscreen
 	name = "fullscreen alert plane"
 	plane = FULLSCREEN_PLANE

code/controllers/subsystem/hijack.dm

@@ -325,22 +325,22 @@ SUBSYSTEM_DEF(hijack)
 
 /datum/controller/subsystem/hijack/proc/heat_engine_room()
 	engine_room_heated = TRUE
-	var/area/engine_room = GLOB.areas_by_type[/area/almayer/engineering/engine_core]
+	var/area/engine_room = GLOB.areas_by_type[/area/almayer/engineering/lower/engine_core]
 	engine_room.firealert()
 	engine_room.temperature = T90C
 	for(var/mob/current_mob as anything in GLOB.mob_list)
 		var/area/mob_area = get_area(current_mob)
-		if(istype(mob_area, /area/almayer/engineering/engine_core))
+		if(istype(mob_area, /area/almayer/engineering/lower/engine_core))
 			to_chat(current_mob, SPAN_BOLDWARNING("You feel the heat of the room increase as the fusion engines whirr louder."))
 
 /datum/controller/subsystem/hijack/proc/superheat_engine_room()
 	engine_room_superheated = TRUE
-	var/area/engine_room = GLOB.areas_by_type[/area/almayer/engineering/engine_core]
+	var/area/engine_room = GLOB.areas_by_type[/area/almayer/engineering/lower/engine_core]
 	engine_room.firealert()
 	engine_room.temperature = T120C //slowly deals burn at this temp
 	for(var/mob/current_mob as anything in GLOB.mob_list)
 		var/area/mob_area = get_area(current_mob)
-		if(istype(mob_area, /area/almayer/engineering/engine_core))
+		if(istype(mob_area, /area/almayer/engineering/lower/engine_core))
 			to_chat(current_mob, SPAN_BOLDWARNING("The room feels incredibly hot, you can't take much more of this!"))
 
 /datum/controller/subsystem/hijack/proc/announce_sd_halfway()

code/controllers/subsystem/techtree.dm

@@ -34,17 +34,6 @@ SUBSYSTEM_DEF(techtree)
 		var/datum/space_level/zpos = SSmapping.add_new_zlevel(tree.name, list(ZTRAIT_TECHTREE))
 		tree.zlevel = zpos
 
-		var/zlevel = zpos.z_value
-		var/turf/z_min = locate(1, 1, zlevel)
-		var/turf/z_max = locate(world.maxx, world.maxy, zlevel)
-
-
-
-		for(var/t in block(z_min, z_max))
-			var/turf/Tu = t
-			Tu.ChangeTurf(/turf/closed/void, list(/turf/closed/void))
-			new /area/techtree(Tu)
-
 		for(var/tier in tree.tree_tiers)
 			tree.unlocked_techs += tier
 			tree.all_techs += tier

code/game/area/almayer.dm

@@ -129,9 +129,40 @@
 	icon_state = "selfdestruct"
 	fake_zlevel = 1 // upperdeck
 
+// engineering
+
 /area/almayer/engineering
 	minimap_color = MINIMAP_AREA_ENGI
 
+// lower deck
+
+/area/almayer/engineering/lower
+	name = "\improper Lower Deck Engineering"
+	icon_state = "lowerengineering"
+	fake_zlevel = 2 // lowerdeck
+
+/area/almayer/engineering/lower/engine_monitoring//this is not used  so could be remove?
+	name = "\improper Lower Deck Engine Reactor Monitoring"
+	icon_state = "lowermonitoring"
+
+/area/almayer/engineering/lower/workshop
+	name = "\improper Lower Deck Engineering Workshop"
+	icon_state = "workshop"
+
+/area/almayer/engineering/lower/workshop/hangar
+	name = "\improper Ordnance workshop"
+
+/area/almayer/engineering/lower/engine_core
+	name = "\improper Engine Reactor Core Room"
+	icon_state = "coreroom"
+	soundscape_playlist = SCAPE_PL_ENG
+	soundscape_interval = 15
+	hijack_evacuation_area = TRUE
+	hijack_evacuation_weight = 0.2
+	hijack_evacuation_type = EVACUATION_TYPE_ADDITIVE
+
+// upper deck
+
 /area/almayer/engineering/upper_engineering
 	name = "\improper Upper Deck Engineering"
 	icon_state = "upperengineering"
@@ -151,34 +182,6 @@
 	icon_state = "ceroom"
 	fake_zlevel = 1 // upperdeck
 
-/area/almayer/engineering/lower_engine_monitoring
-	name = "\improper Lower Deck Engine Reactor Monitoring"
-	icon_state = "lowermonitoring"
-	fake_zlevel = 2 // lowerdeck
-
-/area/almayer/engineering/lower_engineering
-	name = "\improper Lower Deck Engineering"
-	icon_state = "lowerengineering"
-	fake_zlevel = 2 // lowerdeck
-
-/area/almayer/engineering/engineering_workshop
-	name = "\improper Lower Deck Engineering Workshop"
-	icon_state = "workshop"
-	fake_zlevel = 2 // lowerdeck
-
-/area/almayer/engineering/engineering_workshop/hangar
-	name = "\improper Ordnance workshop"
-
-/area/almayer/engineering/engine_core
-	name = "\improper Engine Reactor Core Room"
-	icon_state = "coreroom"
-	fake_zlevel = 2 // lowerdeck
-	soundscape_playlist = SCAPE_PL_ENG
-	soundscape_interval = 15
-	hijack_evacuation_area = TRUE
-	hijack_evacuation_weight = 0.2
-	hijack_evacuation_type = EVACUATION_TYPE_ADDITIVE
-
 /area/almayer/engineering/starboard_atmos
 	name = "\improper Upper Deck Starboard Atmospherics"
 	icon_state = "starboardatmos"
@@ -238,58 +241,52 @@
 	icon_state = "portpd"
 	fake_zlevel = 2 // lowerdeck
 
+/area/almayer/shipboard/stern_point_defense
+	name = "\improper Lower Deck Stern Point Defense"
+	icon_state = "portpd"
+	fake_zlevel = 2 // lowerdeck
+
+// brig
+
 /area/almayer/shipboard/brig
 	name = "\improper Brig"
 	icon_state = "brig"
 	fake_zlevel = 1 //upperdeck
 
 /area/almayer/shipboard/brig/lobby
 	name = "\improper Brig Lobby"
-	icon_state = "brig"
 
 /area/almayer/shipboard/brig/armory
 	name = "\improper Brig Armory"
-	icon_state = "brig"
 
 /area/almayer/shipboard/brig/main_office
 	name = "\improper Brig Main Office"
-	icon_state = "brig"
 
 /area/almayer/shipboard/brig/perma
 	name = "\improper Brig Perma Cells"
-	icon_state = "brig"
 
 /area/almayer/shipboard/brig/cryo
 	name = "\improper Brig Cryo Pods"
-	icon_state = "brig"
 
 /area/almayer/shipboard/brig/surgery
 	name = "\improper Brig Surgery"
-	icon_state = "brig"
 
 /area/almayer/shipboard/brig/general_equipment
 	name = "\improper Brig General Equipment"
-	icon_state = "brig"
 
 /area/almayer/shipboard/brig/evidence_storage
 	name = "\improper Brig Evidence Storage"
-	icon_state = "brig"
 
 /area/almayer/shipboard/brig/execution
 	name = "\improper Brig Execution Room"
-	icon_state = "brig"
 
 /area/almayer/shipboard/brig/cic_hallway
 	name = "\improper Brig CiC Hallway"
-	icon_state = "brig"
 
 /area/almayer/shipboard/brig/dress
 	name = "\improper CIC Dress Uniform Room"
-	icon_state = "brig"
-
 /area/almayer/shipboard/brig/processing
 	name = "\improper Brig Processing and Holding"
-	icon_state = "brig"
 
 /area/almayer/shipboard/brig/cells
 	name = "\improper Brig Cells"
@@ -393,6 +390,19 @@
 	icon_state = "starboard"
 	fake_zlevel = 2 // lowerdeck
 
+//new hallways areas
+
+/area/almayer/hallways/upper
+	fake_zlevel = 1 // upperdeck
+
+/area/almayer/hallways/upper/port
+	name = "\improper Upper Deck Port Hallway"
+	icon_state = "port"
+
+/area/almayer/hallways/upper/starboard
+	name = "\improper Upper Deck Starboard Hallway"
+	icon_state = "starboard"
+
 /area/almayer/stair_clone
 	name = "\improper Lower Deck Stairs"
 	icon_state = "stairs_lowerdeck"
@@ -404,63 +414,60 @@
 	icon_state = "stairs_upperdeck"
 	fake_zlevel = 1 // upperdeck
 
+// hull areas.
+
+// lower deck hull areas
+
 /area/almayer/hull/lower_hull
 	name = "\improper Lower Deck Hull"
 	icon_state = "lowerhull"
 	fake_zlevel = 2 // lowerdeck
 
+/area/almayer/hull/lower_hull/stern
+	name = "\improper Lower Deck Stern Hull"
+
+/area/almayer/hull/lower_hull/l_f_s
+	name = "\improper Lower Deck Starboard-Fore Hull"
+
+/area/almayer/hull/lower_hull/l_m_s
+	name = "\improper Lower Deck Starboard-Midship Hull"
+
+/area/almayer/hull/lower_hull/l_a_s
+	name = "\improper Lower Deck Starboard Hull"
+
+/area/almayer/hull/lower_hull/l_f_p
+	name = "\improper Lower Deck Port-Fore Hull"
+
+/area/almayer/hull/lower_hull/l_m_p
+	name = "\improper Lower Deck Port-Midship Hull"
+
+/area/almayer/hull/lower_hull/l_a_p
+	name = "\improper Lower Deck Port-Aft Hull"
+
+// upper deck hull areas
+
 /area/almayer/hull/upper_hull
 	name = "\improper Upper Deck Hull"
 	icon_state = "upperhull"
 	fake_zlevel = 1 // upperdeck
 
 /area/almayer/hull/upper_hull/u_f_s
 	name = "\improper Upper Deck Fore-Starboard Hull"
-	icon_state = "upperhull"
 
 /area/almayer/hull/upper_hull/u_m_s
 	name = "\improper Upper Deck Starboard-Midship Hull"
-	icon_state = "upperhull"
 
 /area/almayer/hull/upper_hull/u_a_s
 	name = "\improper Upper Deck Starboard-Aft Hull"
-	icon_state = "upperhull"
 
 /area/almayer/hull/upper_hull/u_f_p
 	name = "\improper Upper Deck Port-Fore Hull"
-	icon_state = "upperhull"
 
 /area/almayer/hull/upper_hull/u_m_p
 	name = "\improper Upper Deck Port-Midship Hull"
-	icon_state = "upperhull"
 
 /area/almayer/hull/upper_hull/u_a_p
 	name = "\improper Upper Deck Port-Aft Hull"
-	icon_state = "upperhull"
-
-/area/almayer/hull/lower_hull/l_f_s
-	name = "\improper Lower Deck Starboard-Fore Hull"
-	icon_state = "upperhull"
-
-/area/almayer/hull/lower_hull/l_m_s
-	name = "\improper Lower Deck Starboard-Midship Hull"
-	icon_state = "upperhull"
-
-/area/almayer/hull/lower_hull/l_a_s
-	name = "\improper Lower Deck Starboard Hull"
-	icon_state = "upperhull"
-
-/area/almayer/hull/lower_hull/l_f_p
-	name = "\improper Lower Deck Port-Fore Hull"
-	icon_state = "upperhull"
-
-/area/almayer/hull/lower_hull/l_m_p
-	name = "\improper Lower Deck Port-Midship Hull"
-	icon_state = "upperhull"
-
-/area/almayer/hull/lower_hull/l_a_p
-	name = "\improper Lower Deck Port-Aft Hull"
-	icon_state = "upperhull"
 
 /area/almayer/living/cryo_cells
 	name = "\improper Lower Deck Cryo Cells"