Merge branch 'master' of https://github.com/cmss13-devs/cmss13 into s…

…pec-vendor

code/__DEFINES/equipment.dm

@@ -27,7 +27,7 @@
 #define ITEM_UNCATCHABLE (1<<9)
 /// Used for nonstandard marine clothing to ignore 'specialty' var.
 #define NO_NAME_OVERRIDE (1<<10)
-/// Used for armors or uniforms that don't have a snow icon state.
+/// Used for armors or uniforms that don't have a snow/desert/etc icon state set via select_gamemode_skin (not all item types currently perform this test though).
 #define NO_SNOW_TYPE (1<<11)
 
 #define INVULNERABLE (1<<12)

code/__DEFINES/guns.dm

@@ -45,3 +45,15 @@
 //autofire component fire callback return flags
 #define AUTOFIRE_CONTINUE (1<<0)
 #define AUTOFIRE_SUCCESS (1<<1)
+
+///Base CO special weapons options
+#define CO_GUNS list(CO_GUN_MATEBA, CO_GUN_MATEBA_SPECIAL, CO_GUN_DEAGLE)
+
+///Council CO special weapons options
+#define COUNCIL_CO_GUNS list(CO_GUN_MATEBA_COUNCIL, CO_GUN_DEAGLE_COUNCIL)
+
+#define CO_GUN_MATEBA "Mateba"
+#define CO_GUN_MATEBA_SPECIAL "Mateba Special"
+#define CO_GUN_DEAGLE "Desert Eagle"
+#define CO_GUN_MATEBA_COUNCIL "Colonel's Mateba"
+#define CO_GUN_DEAGLE_COUNCIL "Golden Desert Eagle"

code/__DEFINES/job.dm

@@ -9,6 +9,7 @@
 #define SQUAD_MARINE_4 "Delta"
 #define SQUAD_MARINE_5 "Echo"
 #define SQUAD_MARINE_CRYO "Foxtrot"
+#define SQUAD_MARINE_INTEL "Intel"
 #define SQUAD_SOF "SOF"
 
 // Job name defines

code/__DEFINES/layers.dm

@@ -83,10 +83,15 @@
 
 #define ABOVE_SPECIAL_RESIN_STRUCTURE_LAYER 3.01
 
+/// A layer above objects (like structures) but below items
+#define BETWEEN_OBJECT_ITEM_LAYER 3.01
+
+/// The layer on which items lay
+#define ITEM_LAYER 3.02
 /// for items that should be at the top of the pile of items
-#define UPPER_ITEM_LAYER 3.01
+#define UPPER_ITEM_LAYER 3.03
 /// just above all items
-#define ABOVE_OBJ_LAYER 3.02
+#define ABOVE_OBJ_LAYER 3.04
 
 #define BUSH_LAYER 3.05
 

code/__DEFINES/minimap.dm

@@ -52,6 +52,7 @@ GLOBAL_LIST_INIT(all_minimap_flags, bitfield2list(MINIMAP_FLAG_ALL))
 #define MINIMAP_SQUAD_ECHO "#00b043"
 #define MINIMAP_SQUAD_FOXTROT "#fe7b2e"
 #define MINIMAP_SQUAD_SOF "#400000"
+#define MINIMAP_SQUAD_INTEL "#053818"
 
 #define MINIMAP_ICON_BACKGROUND_CIVILIAN "#7D4820"
 #define MINIMAP_ICON_BACKGROUND_CIC "#3f3f3f"

code/__DEFINES/mobs.dm

@@ -310,6 +310,10 @@
 // Queen strain flags
 #define QUEEN_NORMAL "Normal"
 
+// Facehugger strain flags
+#define FACEHUGGER_NORMAL "Normal"
+#define FACEHUGGER_WATCHER "Watcher"
+
 // Drone strain flags
 #define DRONE_NORMAL "Normal"
 #define DRONE_HEALER "Healer"

code/__DEFINES/mode.dm

@@ -240,7 +240,7 @@ var/global/list/whitelist_hierarchy = list(WHITELIST_NORMAL, WHITELIST_COUNCIL,
 #define FACTION_MONKEY "Monkey" // Nanu
 
 #define FACTION_LIST_MARINE list(FACTION_MARINE)
-#define FACTION_LIST_HUMANOID list(FACTION_MARINE, FACTION_PMC, FACTION_WY, FACTION_WY_DEATHSQUAD, FACTION_CLF, FACTION_CONTRACTOR, FACTION_UPP, FACTION_FREELANCER, FACTION_SURVIVOR, FACTION_NEUTRAL, FACTION_COLONIST, FACTION_MERCENARY, FACTION_DUTCH, FACTION_HEFA, FACTION_GLADIATOR, FACTION_PIRATE, FACTION_PIZZA, FACTION_SOUTO, FACTION_YAUTJA, FACTION_ZOMBIE)
+#define FACTION_LIST_HUMANOID list(FACTION_MARINE, FACTION_PMC, FACTION_WY, FACTION_WY_DEATHSQUAD, FACTION_CLF, FACTION_CONTRACTOR, FACTION_UPP, FACTION_FREELANCER, FACTION_SURVIVOR, FACTION_NEUTRAL, FACTION_COLONIST, FACTION_MERCENARY, FACTION_DUTCH, FACTION_HEFA, FACTION_GLADIATOR, FACTION_PIRATE, FACTION_PIZZA, FACTION_SOUTO, FACTION_YAUTJA, FACTION_ZOMBIE, FACTION_TWE)
 #define FACTION_LIST_ERT list(FACTION_PMC, FACTION_WY_DEATHSQUAD, FACTION_CLF, FACTION_CONTRACTOR, FACTION_UPP, FACTION_FREELANCER, FACTION_MERCENARY, FACTION_DUTCH, FACTION_HEFA, FACTION_GLADIATOR, FACTION_PIRATE, FACTION_PIZZA, FACTION_SOUTO, FACTION_MARSHAL, FACTION_TWE)
 #define FACTION_LIST_WY list(FACTION_PMC, FACTION_WY_DEATHSQUAD, FACTION_WY)
 #define FACTION_LIST_MARINE_WY list(FACTION_MARINE, FACTION_PMC, FACTION_WY_DEATHSQUAD, FACTION_WY)

code/__DEFINES/traits.dm

@@ -200,6 +200,10 @@
 #define TRAIT_TOOL_SIMPLE_BLOWTORCH "t_tool_simple_blowtorch"
 
 #define TRAIT_TOOL_PEN "t_tool_pen"
+
+/// Can lockout blackmarket from ASRS console circuits.
+#define TRAIT_TOOL_TRADEBAND "t_tool_tradeband"
+
 // CLOTHING TRAITS
 #define TRAIT_CLOTHING_HOOD "t_clothing_hood"
 

code/__DEFINES/urls.dm

@@ -5,7 +5,8 @@
 #define URL_ISSUE_TRACKER "https://github.com/cmss13-devs/cmss13/issues"
 
 // ------ MISC WIKI LINKS ------ //
-#define URL_WIKI_RULES "https://cm-ss13.com/wiki/Rules"
+#define URL_RULES_PAGE "https://cm-ss13.com/rules"
+#define URL_RULES_EORG "https://cm-ss13.com/rules#rule-4-no-griefing"
 #define URL_WIKI_LANDING "https://cm-ss13.com/wiki/Main_Page"
 #define URL_WIKI_COC "https://cm-ss13.com/wiki/Rank"
 #define URL_WIKI_LAW "https://cm-ss13.com/wiki/Marine_Law"

code/_onclick/hud/screen_objects.dm

@@ -144,7 +144,7 @@
 
 /atom/movable/screen/zone_sel/clicked(mob/user, list/mods)
 	if (..())
-		return 1
+		return TRUE
 
 	var/icon_x = text2num(mods["icon-x"])
 	var/icon_y = text2num(mods["icon-y"])
@@ -209,7 +209,11 @@
 	icon = 'icons/mob/hud/screen1_robot.dmi'
 
 /atom/movable/screen/clicked(mob/user)
-	if(!user) return 1
+	if(!user)
+		return TRUE
+
+	if(isobserver(user))
+		return TRUE
 
 	switch(name)
 		if("equip")

code/datums/emergency_calls/emergency_call.dm

@@ -91,12 +91,12 @@
 	else
 		return chosen_call
 
-/datum/game_mode/proc/get_specific_call(call_name, announce = TRUE, is_emergency = TRUE, info = "", announce_dispatch_message = TRUE)
+/datum/game_mode/proc/get_specific_call(call_name, quiet_launch = FALSE, announce = TRUE, is_emergency = TRUE, info = "", announce_dispatch_message = TRUE)
 	for(var/datum/emergency_call/E in all_calls) //Loop through all potential candidates
 		if(E.name == call_name)
 			var/datum/emergency_call/em_call = new E.type()
 			em_call.objective_info = info
-			em_call.activate(announce, is_emergency, announce_dispatch_message)
+			em_call.activate(quiet_launch, announce, is_emergency, announce_dispatch_message)
 			return
 	error("get_specific_call could not find emergency call '[call_name]'")
 	return
@@ -192,7 +192,7 @@
 	else
 		to_chat(src, SPAN_WARNING("You did not get enlisted in the response team. Better luck next time!"))
 
-/datum/emergency_call/proc/activate(announce = TRUE, turf/override_spawn_loc, announce_dispatch_message = TRUE)
+/datum/emergency_call/proc/activate(quiet_launch = FALSE, announce = TRUE, turf/override_spawn_loc, announce_dispatch_message = TRUE)
 	set waitfor = 0
 	if(!SSticker.mode) //Something horribly wrong with the gamemode ticker
 		return
@@ -202,12 +202,12 @@
 	show_join_message() //Show our potential candidates the message to let them join.
 	message_admins("Distress beacon: '[name]' activated [src.hostility? "[SPAN_WARNING("(THEY ARE HOSTILE)")]":"(they are friendly)"]. Looking for candidates.")
 
-	if(announce)
+	if(!quiet_launch)
 		marine_announcement("A distress beacon has been launched from the [MAIN_SHIP_NAME].", "Priority Alert", 'sound/AI/distressbeacon.ogg', logging = ARES_LOG_SECURITY)
 
-	addtimer(CALLBACK(src, TYPE_PROC_REF(/datum/emergency_call, spawn_candidates), announce, override_spawn_loc, announce_dispatch_message), 30 SECONDS)
+	addtimer(CALLBACK(src, TYPE_PROC_REF(/datum/emergency_call, spawn_candidates), quiet_launch, announce, override_spawn_loc, announce_dispatch_message), 30 SECONDS)
 
-/datum/emergency_call/proc/spawn_candidates(announce = TRUE, override_spawn_loc, announce_dispatch_message = TRUE)
+/datum/emergency_call/proc/spawn_candidates(quiet_launch = FALSE, announce = TRUE, override_spawn_loc, announce_dispatch_message = TRUE)
 	if(SSticker.mode)
 		SSticker.mode.picked_calls -= src
 
@@ -218,7 +218,7 @@
 		members = list() //Empty the members list.
 		candidates = list()
 
-		if(announce)
+		if(!quiet_launch)
 			marine_announcement("The distress signal has not received a response, the launch tubes are now recalibrating.", "Distress Beacon", logging = ARES_LOG_SECURITY)
 		return
 

code/datums/emergency_calls/inspection.dm

@@ -263,3 +263,44 @@
 		to_chat(M, SPAN_BOLD("The laws of arth stretch beyond the Sol. Where others fall to corruption, you stay steadfast in your morals."))
 		to_chat(M, SPAN_BOLD("Corporate Officers chase after paychecks and promotions, but you are motivated to do your sworn duty and care for the population, no matter how far or isolated a colony may be."))
 		to_chat(M, SPAN_BOLD("Despite being stretched thin, the stalwart oath of the Marshals has continued to keep communities safe, with the CMB well respected by many. You are a representation of that oath, serve with distinction."))
+
+/datum/emergency_call/inspection_cmb/black_market
+	name = "Inspection - Colonial Marshal Ledger Investigation Team"
+	mob_max = 3 //Marshal, Deputy, ICC CL
+	mob_min = 2
+	shuttle_id = "Distress_PMC"
+
+	max_synths = 0
+	will_spawn_icc_liaison = TRUE
+	will_spawn_cmb_observer = FALSE
+
+/datum/emergency_call/inspection_cmb/black_market/New()
+	..()
+	dispatch_message = "Third Fleet High Command to [MAIN_SHIP_NAME], we have received inconsistent supply manifests and irregularities on the ASRS system aboard your ship, and have requested a CMB Investigation Team to board and clear you of any wrongdoing."
+	arrival_message = "Incoming Transmission: [MAIN_SHIP_NAME], this is Anchorpoint Station with the Colonial Marshal Bureau. Be advised, we are dispatching a team of Marshals to board with you by request of GSO-91. Submitting authorized docking clearances, over."
+	objectives = "Investigate the inconsistencies aboard the [MAIN_SHIP_NAME]'s ASRS. In the case of illegal activity, collect evidence, and submit a report to the CMB Command at Anchorpoint Station. If required, the ICC Liaison's Tradeband is capable of fixing ASRS computers. Work with the [MAIN_SHIP_NAME]'s military police force."
+
+/datum/emergency_call/inspection_cmb/black_market/create_member(datum/mind/current_mind, turf/override_spawn_loc)
+	var/turf/spawn_loc = override_spawn_loc ? override_spawn_loc : get_spawn_point()
+
+	if(!istype(spawn_loc))
+		return //Didn't find a useable spawn point.
+
+	var/mob/living/carbon/human/mob = new(spawn_loc)
+	current_mind.transfer_to(mob, TRUE)
+
+	if(!leader && HAS_FLAG(mob?.client.prefs.toggles_ert, PLAY_LEADER) && check_timelock(mob.client, JOB_SQUAD_LEADER, time_required_for_job))
+		leader = mob
+		to_chat(mob, SPAN_ROLE_HEADER("You are the Colonial Marshal!"))
+		arm_equipment(mob, /datum/equipment_preset/cmb/leader, TRUE, TRUE)
+	else if(!icc_liaison && will_spawn_icc_liaison && check_timelock(mob.client, JOB_CORPORATE_LIAISON, time_required_for_job))
+		icc_liaison = mob
+		to_chat(mob, SPAN_ROLE_HEADER("You are a CMB-attached Interstellar Commerce Commission Liaison!"))
+		arm_equipment(mob, /datum/equipment_preset/cmb/liaison/black_market, TRUE, TRUE) //ICC CL gets a custom item
+	else
+		to_chat(mob, SPAN_ROLE_HEADER("You are a CMB Deputy!"))
+		arm_equipment(mob, /datum/equipment_preset/cmb/standard, TRUE, TRUE)
+
+	print_backstory(mob)
+
+	addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(to_chat), mob, SPAN_BOLD("Objectives:</b> [objectives]")), 1 SECONDS)

code/datums/skills.dm

@@ -293,6 +293,16 @@ CIVILIAN
 		SKILL_INTEL = SKILL_INTEL_EXPERT,
 	)
 
+/datum/skills/civilian/icc_investigation
+	name = "ICC CL - Black Market ERT"
+	skills = list(
+		SKILL_CQC = SKILL_CQC_DEFAULT,
+		SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED,
+		SKILL_ENGINEER = SKILL_ENGINEER_ENGI, //The ASRS consoles
+		SKILL_FIREARMS = SKILL_FIREARMS_CIVILIAN,
+		SKILL_POLICE = SKILL_POLICE_SKILLED, //The CMB Tradeband Compliance Device
+	)
+
 /datum/skills/civilian/manager/director
 	name = "Weyland-Yutani Director"
 	skills = list(

code/datums/supply_packs/_supply_packs.dm

@@ -23,6 +23,8 @@
 	var/iteration_needed = 0
 	/// How many W-Y dollars are deducted from the supply controller. Only use for contraband.
 	var/dollar_cost = 0
+	/// How much "heat" this crate adds, too much heat will send an investigation. Only use for contraband.
+	var/crate_heat = 0
 
 /datum/supply_packs/New()
 	if(randomised_num_contained)