Merge branch 'master' of https://github.com/tgstation/TerraGov-Marine…

…-Corps

_maps/map_files/Campaign maps/nt_base/nt_base.dmm

@@ -10663,7 +10663,7 @@
 /turf/open/floor/mainship/stripesquare,
 /area/gelida/indoors/c_block/garage)
 "hTM" = (
-/obj/machinery/sleep_console,
+/obj/machinery/computer/sleep_console,
 /turf/open/floor/prison/sterilewhite/full,
 /area/gelida/indoors/a_block/medical)
 "hUc" = (
@@ -13774,7 +13774,7 @@
 /turf/open/floor/prison/whitegreenfull2,
 /area/gelida/indoors/a_block/fitness)
 "kiW" = (
-/obj/machinery/body_scanconsole,
+/obj/machinery/computer/body_scanconsole,
 /obj/machinery/light{
 	dir = 1
 	},
@@ -23795,7 +23795,9 @@
 /turf/open/floor/plating/ground/desertdam/asphalt/cement,
 /area/gelida/outdoors/colony_streets/north_east_street)
 "roD" = (
-/obj/machinery/atmospherics/components/unary/cryo_cell,
+/obj/machinery/atmospherics/components/unary/cryo_cell{
+	dir = 1
+	},
 /turf/open/floor/tile/dark2{
 	dir = 4
 	},

_maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm

@@ -18919,13 +18919,6 @@
 /obj/machinery/atmospherics/pipe/simple/green/hidden,
 /turf/open/floor/plating,
 /area/ice_colony/underground/maintenance/central)
-"dKp" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/simple/green/hidden{
-	dir = 4
-	},
-/turf/open/floor/tile/dark2,
-/area/ice_colony/surface/command)
 "dKq" = (
 /obj/machinery/door/poddoor/timed_late/containment/landing_zone/lz2,
 /obj/structure/cable,
@@ -27136,7 +27129,9 @@
 /turf/open/floor/plating,
 /area/ice_colony/underground/maintenance/north)
 "pCL" = (
-/obj/machinery/atmospherics/components/unary/cryo_cell,
+/obj/machinery/atmospherics/components/unary/cryo_cell{
+	dir = 1
+	},
 /turf/open/floor/tile/green/whitegreen,
 /area/ice_colony/surface/clinic/treatment)
 "pDQ" = (
@@ -64075,7 +64070,7 @@ auX
 sdW
 iPL
 haC
-dKp
+aua
 iPL
 haC
 apL
@@ -64497,7 +64492,7 @@ cXX
 mId
 auX
 odY
-dKp
+aua
 mId
 auX
 auS
@@ -64709,7 +64704,7 @@ jos
 asd
 auX
 pDQ
-dKp
+aua
 apL
 uoG
 cIs
@@ -65553,7 +65548,7 @@ aug
 aqw
 haC
 haC
-dKp
+aua
 ltl
 uLL
 kWN
@@ -65765,7 +65760,7 @@ aJe
 nZl
 aqC
 haC
-dKp
+aua
 haC
 haC
 haC

_maps/map_files/Iteron/Iteron.dmm

@@ -2477,15 +2477,6 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/mainship/patrol_base)
-"FK" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
-	dir = 1
-	},
-/turf/open/floor/plating/plating_catwalk,
-/area/mainship/patrol_base)
 "FL" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 4
@@ -3800,7 +3791,9 @@
 /turf/open/floor/prison/sterilewhite,
 /area/mainship/patrol_base)
 "WP" = (
-/obj/machinery/atmospherics/components/unary/cryo_cell,
+/obj/machinery/atmospherics/components/unary/cryo_cell{
+	dir = 1
+	},
 /turf/open/floor/prison/sterilewhite,
 /area/mainship/patrol_base)
 "WU" = (
@@ -3819,10 +3812,12 @@
 /turf/open/floor/mainship/mono,
 /area/mainship/patrol_base/barracks)
 "WY" = (
-/obj/machinery/atmospherics/components/unary/cryo_cell,
 /obj/machinery/light/mainship{
 	light_color = "#da2f1b"
 	},
+/obj/machinery/atmospherics/components/unary/cryo_cell{
+	dir = 1
+	},
 /turf/open/floor/prison/sterilewhite,
 /area/mainship/patrol_base)
 "Xc" = (
@@ -24553,7 +24548,7 @@ bu
 bu
 zS
 fV
-FK
+Fs
 Jp
 KN
 KN

_maps/map_files/gelida_iv/gelida_iv.dmm

@@ -25894,7 +25894,9 @@
 /turf/open/floor/plating/ground/desertdam/asphalt/cement,
 /area/gelida/outdoors/colony_streets/north_east_street)
 "roD" = (
-/obj/machinery/atmospherics/components/unary/cryo_cell,
+/obj/machinery/atmospherics/components/unary/cryo_cell{
+	dir = 1
+	},
 /turf/open/floor/tile/dark2{
 	dir = 4
 	},

_maps/shuttles/tgs_canterbury.dmm

@@ -157,11 +157,6 @@
 	name = "\improper Command Cockpit"
 	},
 /obj/structure/cable,
-/obj/machinery/door/poddoor/mainship{
-	dir = 2;
-	id = "Interior_Emergency_umbilical";
-	name = "\improper Umbillical Airlock"
-	},
 /turf/open/floor/mainship/mono,
 /area/shuttle/canterbury/cic)
 "ax" = (

code/__DEFINES/campaign.dm

@@ -18,8 +18,13 @@
 #define CAMPAIGN_MAX_LOSS_BONUS 0.45
 
 //mission defines
+///Mission has not been loaded
 #define MISSION_STATE_NEW "mission state new"
+///Mission loaded but not yet active
+#define MISSION_STATE_LOADED "mission state loaded"
+///Mission actively running
 #define MISSION_STATE_ACTIVE "mission state active"
+///Mission ended
 #define MISSION_STATE_FINISHED "mission state finished"
 
 #define MISSION_OUTCOME_MAJOR_VICTORY "major victory"

code/__DEFINES/dcs/signals.dm

@@ -101,6 +101,11 @@
 ///Override code for NT base rescue mission
 #define COMSIG_GLOB_CAMPAIGN_NT_OVERRIDE_CODE "!campaign_nt_override_code"
 
+///Campaign asset activation successful
+#define COMSIG_CAMPAIGN_ASSET_ACTIVATION "campaign_asset_activation"
+///Campaign asset disabler activated
+#define COMSIG_CAMPAIGN_DISABLER_ACTIVATION "campaign_disabler_activation"
+
 //////////////////////////////////////////////////////////////////
 
 // /datum signals

code/__DEFINES/mobs.dm

@@ -572,6 +572,8 @@ GLOBAL_LIST_INIT(xenoupgradetiers, list(XENO_UPGRADE_BASETYPE, XENO_UPGRADE_INVA
 #define RAV_CHARGESPEED 2
 #define RAV_CHARGEDISTANCE 4
 
+#define RAV_RAVAGE_THROW_RANGE 1
+
 #define RAVAGER_ENDURE_DURATION				10 SECONDS
 #define RAVAGER_ENDURE_DURATION_WARNING		0.7
 #define RAVAGER_ENDURE_HP_LIMIT				-100
@@ -668,6 +670,9 @@ GLOBAL_LIST_INIT(xenoupgradetiers, list(XENO_UPGRADE_BASETYPE, XENO_UPGRADE_INVA
 #define DRONE_ESSENCE_LINK_REGEN 0.012 // Amount of health regen given as a percentage.
 #define DRONE_ESSENCE_LINK_SHARED_HEAL 0.1 // The effectiveness of heals when applied to the other linked xeno, as a percentage
 
+//Defender defines
+#define DEFENDER_CHARGE_RANGE 4
+
 //Baneling defines
 #define BANELING_CHARGE_MAX 2
 #define BANELING_CHARGE_GAIN_TIME 240 SECONDS

code/__DEFINES/sound.dm

@@ -32,3 +32,32 @@
 
 ///Frequency stuff only works with 45kbps oggs.
 #define GET_RAND_FREQUENCY (rand(32000, 55000))
+
+//default byond sound environments
+#define SOUND_ENVIRONMENT_NONE -1
+#define SOUND_ENVIRONMENT_GENERIC 0
+#define SOUND_ENVIRONMENT_PADDED_CELL 1
+#define SOUND_ENVIRONMENT_ROOM 2
+#define SOUND_ENVIRONMENT_BATHROOM 3
+#define SOUND_ENVIRONMENT_LIVINGROOM 4
+#define SOUND_ENVIRONMENT_STONEROOM 5
+#define SOUND_ENVIRONMENT_AUDITORIUM 6
+#define SOUND_ENVIRONMENT_CONCERT_HALL 7
+#define SOUND_ENVIRONMENT_CAVE 8
+#define SOUND_ENVIRONMENT_ARENA 9
+#define SOUND_ENVIRONMENT_HANGAR 10
+#define SOUND_ENVIRONMENT_CARPETED_HALLWAY 11
+#define SOUND_ENVIRONMENT_HALLWAY 12
+#define SOUND_ENVIRONMENT_STONE_CORRIDOR 13
+#define SOUND_ENVIRONMENT_ALLEY 14
+#define SOUND_ENVIRONMENT_FOREST 15
+#define SOUND_ENVIRONMENT_CITY 16
+#define SOUND_ENVIRONMENT_MOUNTAINS 17
+#define SOUND_ENVIRONMENT_QUARRY 18
+#define SOUND_ENVIRONMENT_PLAIN 19
+#define SOUND_ENVIRONMENT_PARKING_LOT 20
+#define SOUND_ENVIRONMENT_SEWER_PIPE 21
+#define SOUND_ENVIRONMENT_UNDERWATER 22
+#define SOUND_ENVIRONMENT_DRUGGED 23
+#define SOUND_ENVIRONMENT_DIZZY 24
+#define SOUND_ENVIRONMENT_PSYCHOTIC 25

code/__DEFINES/tgs.dm

@@ -1,6 +1,6 @@
 // tgstation-server DMAPI
 
-#define TGS_DMAPI_VERSION "6.6.1"
+#define TGS_DMAPI_VERSION "6.6.2"
 
 // All functions and datums outside this document are subject to change with any version and should not be relied on.
 

code/_onclick/click.dm

@@ -1,8 +1,9 @@
-//Delays the mob's next click/action by num deciseconds
-// eg: 10 - 3 = 7 deciseconds of delay
-// eg: 10 * 0.5 = 5 deciseconds of delay
-// DOES NOT EFFECT THE BASE 1 DECISECOND DELAY OF NEXT_CLICK
-
+/**
+ * Delays the mob's next click/action by num deciseconds
+ * eg: 10 - 3 = 7 deciseconds of delay
+ * eg: 10 * 0.5 = 5 deciseconds of delay
+ * DOES NOT EFFECT THE BASE 1 DECISECOND DELAY OF NEXT_CLICK
+ */
 /mob/proc/changeNext_move(num)
 	next_move = world.time + ((num + next_move_adjust) * next_move_modifier)
 

code/datums/gamemodes/campaign/campaign_assets.dm

@@ -65,8 +65,8 @@
 		immediate_effect()
 
 ///Handles the activated asset process
-/datum/campaign_asset/proc/attempt_activatation()
-	if(activation_checks())
+/datum/campaign_asset/proc/attempt_activatation(mob/user)
+	if(activation_checks(user))
 		return FALSE
 
 	activated_effect()
@@ -78,26 +78,34 @@
 	uses --
 	if(uses <= 0)
 		asset_flags |= ASSET_CONSUMED
+	SEND_SIGNAL(src, COMSIG_CAMPAIGN_ASSET_ACTIVATION)
 	return TRUE
 
 ///Returns TRUE if unable to be activated
-/datum/campaign_asset/proc/activation_checks()
+/datum/campaign_asset/proc/activation_checks(mob/user)
 	SHOULD_CALL_PARENT(TRUE)
-	if((asset_flags & ASSET_CONSUMED) || asset_flags & ASSET_DISABLED || uses <= 0)
+	if(!(asset_flags & ASSET_ACTIVATED_EFFECT))
+		return TRUE
+	if((asset_flags & ASSET_CONSUMED))
+		to_chat(user, span_warning("This asset is inactive."))
+		return TRUE
+	if(uses <= 0)
+		to_chat(user, span_warning("No further uses of this assets available."))
+		return TRUE
+	if(asset_flags & ASSET_DISABLED)
+		to_chat(user, span_warning("External interferance prevents the activation of this asset."))
 		return TRUE
-
 	if((asset_flags & ASSET_DISALLOW_REPEAT_USE) && (asset_flags & ASSET_ACTIVE))
-		to_chat(faction.faction_leader, span_warning(already_active_message))
+		to_chat(user, span_warning(already_active_message))
 		return TRUE
-
 	if(asset_flags & ASSET_ACTIVE_MISSION_ONLY)
 		var/datum/game_mode/hvh/campaign/mode = SSticker.mode
 		var/datum/campaign_mission/current_mission = mode.current_mission
-		if(!current_mission || (current_mission.mission_state == MISSION_STATE_FINISHED))
-			to_chat(faction.faction_leader, span_warning("Unavailable until next mission confirmed."))
+		if(!current_mission || (current_mission.mission_state == MISSION_STATE_NEW) || (current_mission.mission_state == MISSION_STATE_FINISHED))
+			to_chat(user, span_warning("Unavailable until next mission confirmed."))
 			return TRUE
 		if(blacklist_mission_flags & current_mission.mission_flags)
-			to_chat(faction.faction_leader, span_warning(blacklist_message))
+			to_chat(user, span_warning(blacklist_message))
 			return TRUE
 
 	return FALSE

code/datums/gamemodes/campaign/campaign_mission.dm

@@ -42,6 +42,10 @@
 	var/starting_faction_mission_brief = "starting faction mission brief here"
 	///Detailed mission description for the hostile faction
 	var/hostile_faction_mission_brief = "hostile faction mission brief here"
+	///Optional mission parameters for the starting faction. Some are autopopulated
+	var/starting_faction_mission_parameters
+	///Optional mission parameters for the hostile faction. Some are autopopulated
+	var/hostile_faction_mission_parameters
 	///Any additional rewards for the starting faction, for display purposes
 	var/starting_faction_additional_rewards = "starting faction mission rewards here"
 	///Any additional rewards for the hostile faction, for display purposes
@@ -157,7 +161,7 @@
 /datum/campaign_mission/proc/load_map()
 	mission_z_level = load_new_z_level(map_file, map_name, TRUE, map_traits)
 	set_z_lighting(mission_z_level.z_value, map_light_colours[1], map_light_levels[1], map_light_colours[2], map_light_levels[2], map_light_colours[3], map_light_levels[3], map_light_colours[4], map_light_levels[4])
-
+	mission_state = MISSION_STATE_LOADED
 	SEND_GLOBAL_SIGNAL(COMSIG_GLOB_CAMPAIGN_MISSION_LOADED, mission_z_level.z_value)
 
 ///Generates the mission brief for the mission if it needs to be late loaded