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

…-Corps

_maps/map_files/Magmoor_Digsite_IV/Magmoor_Digsite_IV.dmm

@@ -2167,7 +2167,7 @@
 /turf/open/floor/mainship/cargo/arrow,
 /area/magmoor/engi)
 "bwo" = (
-/obj/structure/computerframe,
+/obj/effect/spawner/random/machinery/random_broken_computer/intel,
 /turf/open/floor/mainship/purple{
 	dir = 1
 	},
@@ -11899,6 +11899,12 @@
 	},
 /turf/open/liquid/lava/autosmoothing/catwalk,
 /area/magmoor/compound/north)
+"iqB" = (
+/obj/effect/spawner/random/machinery/random_broken_computer/intel,
+/turf/open/floor/mainship/orange{
+	dir = 8
+	},
+/area/magmoor/engi)
 "iqM" = (
 /obj/machinery/door/airlock/mainship/engineering/glass{
 	name = "\improper Observation Deck"
@@ -15877,10 +15883,10 @@
 /obj/effect/turf_decal/warning_stripes/thin{
 	dir = 1
 	},
-/obj/machinery/computer/intel_computer,
 /obj/machinery/light{
 	dir = 8
 	},
+/obj/effect/spawner/random/machinery/random_broken_computer/intel,
 /turf/open/floor/tile/dark/red2{
 	dir = 1
 	},
@@ -19295,8 +19301,7 @@
 /turf/open/floor/mainship/sterile/dark,
 /area/magmoor/medical/storage)
 "nFZ" = (
-/obj/structure/table/mainship,
-/obj/machinery/prop/computer/PC,
+/obj/effect/spawner/random/machinery/random_broken_computer/intel,
 /turf/open/floor/mainship/orange{
 	dir = 1
 	},
@@ -19369,6 +19374,12 @@
 	},
 /turf/open/floor/grass,
 /area/magmoor/civilian/rnr)
+"nHT" = (
+/obj/effect/spawner/random/machinery/random_broken_computer/intel,
+/turf/open/floor/mainship/green{
+	dir = 4
+	},
+/area/magmoor/hydroponics/north)
 "nIo" = (
 /obj/structure/rock/basalt/pile/alt2,
 /turf/open/floor/plating/ground/mars/dirttosand{
@@ -19487,6 +19498,10 @@
 	},
 /turf/open/floor/mainship/sterile/dark,
 /area/magmoor/medical/treatment)
+"nPT" = (
+/obj/effect/spawner/random/machinery/random_broken_computer/intel,
+/turf/open/floor/mainship/mono,
+/area/magmoor/civilian/arrival)
 "nQe" = (
 /obj/structure/table/mainship,
 /obj/item/trash/tray,
@@ -19746,7 +19761,7 @@
 /turf/open/floor/plating/ground/concrete/edge,
 /area/magmoor/compound/north)
 "oat" = (
-/obj/structure/table/reinforced,
+/obj/effect/spawner/random/machinery/random_broken_computer/intel,
 /turf/open/floor/mainship/sterile/corner{
 	dir = 8
 	},
@@ -25187,7 +25202,7 @@
 /turf/open/floor/freezer,
 /area/magmoor/civilian/clean/toilet)
 "rOQ" = (
-/obj/structure/rack,
+/obj/effect/spawner/random/machinery/random_broken_computer/intel,
 /turf/open/floor/tile/purple/taupepurple{
 	dir = 1
 	},
@@ -26115,6 +26130,7 @@
 /obj/machinery/air_alarm{
 	dir = 4
 	},
+/obj/effect/spawner/random/machinery/random_broken_computer/intel,
 /turf/open/floor/wood,
 /area/magmoor/medical/breakroom)
 "syA" = (
@@ -28722,7 +28738,7 @@
 /turf/open/floor/grass,
 /area/magmoor/civilian/clean)
 "umS" = (
-/obj/machinery/computer3,
+/obj/effect/spawner/random/machinery/random_broken_computer/intel,
 /turf/open/floor/mainship/orange{
 	dir = 6
 	},
@@ -33595,6 +33611,7 @@
 /area/magmoor/engi/storage)
 "xDW" = (
 /obj/machinery/light,
+/obj/effect/spawner/random/machinery/random_broken_computer/intel,
 /turf/open/floor/mainship/blue{
 	dir = 6
 	},
@@ -43557,7 +43574,7 @@ tky
 ybU
 kJp
 llg
-cbr
+nHT
 csb
 tDx
 jMC
@@ -52008,7 +52025,7 @@ lrw
 pSu
 pSu
 cvs
-pSu
+nPT
 cIl
 eTo
 pUx
@@ -60787,7 +60804,7 @@ rxA
 slR
 xce
 neY
-ilf
+iqB
 smc
 fkr
 rVx

code/__DEFINES/calibers.dm

@@ -13,6 +13,7 @@
 #define CALIBER_50AE ".50 AE"
 #define CALIBER_41RIM ".41 Rimfire" //Derringer
 #define CALIBER_70MANKEY ".70 Mankey" //Don't ask
+#define CALIBER_41AE ".41 AE"
 
 // Revolvers
 #define CALIBER_44 ".44 Magnum"

code/__DEFINES/dcs/signals/signals_keybindings.dm

@@ -166,6 +166,8 @@
 #define COMSIG_XENOABILITY_TOGGLE_BOMB_RADIAL "xenoability_toggle_bomb_radial"
 #define COMSIG_XENOABILITY_CREATE_BOMB "xenoability_create_bomb"
 #define COMSIG_XENOABILITY_BOMBARD "xenoability_bombard"
+#define COMSIG_XENOABILITY_ACID_SHROUD "xenoability_acid_shroud"
+#define COMSIG_XENOABILITY_ACID_SHROUD_SELECT "xenoability_acid_shroud_select"
 
 #define COMSIG_XENOABILITY_THROW_HUGGER "xenoability_throw_hugger"
 #define COMSIG_XENOABILITY_CALL_YOUNGER "xenoability_call_younger"

code/__DEFINES/jobs.dm

@@ -182,3 +182,11 @@ GLOBAL_LIST_INIT(jobs_fallen_marine, typecacheof(list(/datum/job/fallen/marine),
 #define ENGINEER_TOTAL_BUY_POINTS 75
 /// How many points the field commander can spend
 #define COMMANDER_TOTAL_BUY_POINTS 45
+
+GLOBAL_LIST_INIT(default_marine_points, list(
+		"SMARTGUNNER SUPPLIES" = DEFAULT_TOTAL_BUY_POINTS,
+		"ENGINEERING SUPPLIES" = ENGINEER_TOTAL_BUY_POINTS,
+		"LEADER SUPPLIES" = DEFAULT_TOTAL_BUY_POINTS,
+		"MEDICAL SUPPLIES" = MEDIC_TOTAL_BUY_POINTS,
+		"COMMANDER SUPPLIES" = COMMANDER_TOTAL_BUY_POINTS,
+	))

code/__DEFINES/loadout.dm

@@ -656,7 +656,7 @@ GLOBAL_LIST_INIT(synthetic_clothes_listed_products, list(
 		/obj/item/clothing/shoes/black = list(CAT_SHO, "Black Shoes", 0, "synth-armor"),
 		/obj/item/storage/pouch/tools/full = list(CAT_POU, "Tool pouch", 0, "black"),
 		/obj/item/storage/pouch/construction/full = list(CAT_POU, "Construction pouch", 0, "black"),
-		/obj/item/storage/pouch/medkit/medic = list(CAT_POU, "Medkit pouch", 0, "black"),
+		/obj/item/storage/pouch/medkit/doctor = list(CAT_POU, "Medkit pouch", 0, "black"),
 		/obj/item/storage/pouch/surgery = list(CAT_POU, "White surgical pouch", 0, "black"),
 		/obj/item/storage/pouch/field_pouch/full = list(CAT_POU, "Field pouch", 0, "black"),
 		/obj/item/clothing/head/modular/style/cap = list(CAT_SHN, "TGMC cap", 0, "synth-rcmarmstorage"),

code/__DEFINES/maths.dm

@@ -206,3 +206,9 @@
 	return list(region_x1 & region_x2, region_y1 & region_y2)
 
 // )
+/// Converts a probability/second chance to probability/seconds_per_tick chance
+/// For example, if you want an event to happen with a 10% per second chance, but your proc only runs every 5 seconds, do `if(prob(100*SPT_PROB_RATE(0.1, 5)))`
+#define SPT_PROB_RATE(prob_per_second, seconds_per_tick) (1 - (1 - (prob_per_second)) ** (seconds_per_tick))
+
+/// Like SPT_PROB_RATE but easier to use, simply put `if(SPT_PROB(10, 5))`
+#define SPT_PROB(prob_per_second_percent, seconds_per_tick) (prob(100*SPT_PROB_RATE((prob_per_second_percent)/100, (seconds_per_tick))))

code/datums/actions/observer_action.dm

@@ -63,9 +63,8 @@
 	if(new_mob.stat == DEAD)
 		to_chat(owner, span_warning("You cannot join if the mob is dead."))
 		return FALSE
-	switch(tgui_alert(owner, "Are you sure you want to take " + new_mob.real_name +" ("+new_mob.job.title+")?", "Take SSD mob", list("Yes", "No",)))
-		if("No")
-			return
+	if(tgui_alert(owner, "Are you sure you want to take " + new_mob.real_name +" ("+new_mob.job.title+")?", "Take SSD mob", list("Yes", "No",)) != "Yes")
+		return
 	if(isxeno(new_mob))
 		var/mob/living/carbon/xenomorph/ssd_xeno = new_mob
 		if(ssd_xeno.tier != XENO_TIER_MINION && XENODEATHTIME_CHECK(owner))
@@ -100,7 +99,10 @@
 	log_admin("[owner.key] took control of [new_mob.name] as [new_mob.p_they()] was ssd.")
 	new_mob.transfer_mob(owner)
 	var/mob/living/carbon/human/H = new_mob
+	var/datum/job/j = H.job
+	var/datum/outfit/job/o = j.outfit
 	H.on_transformation()
+	o.handle_id(H)
 
 //respawn button for campaign gamemode
 /datum/action/observer_action/campaign_respawn

code/datums/components/_component.dm

@@ -268,17 +268,17 @@
  */
 /datum/proc/GetExactComponent(datum/component/c_type)
 	RETURN_TYPE(c_type)
-	if(initial(c_type.dupe_mode) == COMPONENT_DUPE_ALLOWED || initial(c_type.dupe_mode) == COMPONENT_DUPE_SELECTIVE)
+	var/initial_type_mode = initial(c_type.dupe_mode)
+	if(initial_type_mode == COMPONENT_DUPE_ALLOWED || initial_type_mode == COMPONENT_DUPE_SELECTIVE)
 		stack_trace("GetComponent was called to get a component of which multiple copies could be on an object. This can easily break and should be changed. Type: \[[c_type]\]")
-	var/list/dc = _datum_components
-	if(!dc)
+	var/list/all_components = _datum_components
+	if(!all_components)
 		return null
-	var/datum/component/C = dc[c_type]
-	if(C)
-		if(length(C))
-			C = C[1]
-		if(C.type == c_type)
-			return C
+	var/datum/component/potential_component
+	if(length(all_components))
+		potential_component = all_components[c_type]
+	if(potential_component?.type == c_type)
+		return potential_component
 	return null
 
 /**

code/datums/components/jump.dm

@@ -74,6 +74,9 @@
 		return
 
 	if(stamina_cost && (jumper.getStaminaLoss() > -stamina_cost))
+		if(isrobot(jumper) || issynth(jumper))
+			to_chat(jumper, span_warning("Your leg servos do not allow you to jump!"))
+			return
 		to_chat(jumper, span_warning("Catch your breath!"))
 		return
 

code/datums/gamemodes/_game_mode.dm

@@ -481,6 +481,8 @@ GLOBAL_LIST_INIT(bioscan_locations, list(
 		parts += "[GLOB.round_statistics.points_from_mining] requisitions points gained from mining."
 	if(GLOB.round_statistics.points_from_research)
 		parts += "[GLOB.round_statistics.points_from_research] requisitions points gained from research."
+	if(GLOB.round_statistics.runner_items_stolen)
+		parts += "[GLOB.round_statistics.runner_items_stolen] items stolen by runners."
 
 	if(GLOB.round_statistics.sandevistan_uses)
 		var/sandevistan_text = "[GLOB.round_statistics.sandevistan_uses] number of times someone was boosted by a sandevistan"

code/datums/gamemodes/campaign/loadout_items/SOM/back_slot.dm

@@ -33,6 +33,13 @@
 	unlock_cost = 200
 	loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_UNLOCKABLE
 
+/datum/loadout_item/back/som_engineer_pack
+	name = "Welding bag"
+	desc = "A technician backpack with integrated welder tank. Has satchel storage."
+	jobs_supported = list(SOM_SQUAD_ENGINEER)
+	loadout_item_flags = LOADOUT_ITEM_ROUNDSTART_OPTION|LOADOUT_ITEM_DEFAULT_CHOICE
+	item_typepath = /obj/item/storage/backpack/marine/engineerpack/som
+
 /datum/loadout_item/back/blinkdrive
 	name = "Blink drive"
 	desc = "A portable Bluespace Displacement Drive, otherwise known as a blink drive. \