Merge branch 'master' into master

code/__DEFINES/__game.dm

@@ -27,6 +27,7 @@ block( \
 
 #define MAP_ICE_COLONY "Ice Colony" // Highpop only
 #define MAP_LV_624 "LV-624"
+#define MAP_LV_624_REPAIRED "LV-624 Repaired"
 #define MAP_BIG_RED "Solaris Ridge"
 #define MAP_PRISON_STATION "Fiorina Cellblocks"
 #define MAP_PRISON_STATION_V3 "Fiorina Science Annex"
@@ -36,7 +37,7 @@ block( \
 #define MAP_CORSAT "CORSAT" // Highpop only
 #define MAP_KUTJEVO "Kutjevo Refinery"
 #define MAP_ICE_COLONY_V1 "Ice Colony Classic"
-#define MAP_ICE_COLONY_V2 "Ice Colony V2"
+#define MAP_ICE_COLONY_V2 "Ice Colony v2"
 #define MAP_ICE_COLONY_V3 "Shivas Snowball" //Ice Rework, low pop enabled.
 #define MAP_RUNTIME "USS Runtime"
 #define MAP_LV522_CHANCES_CLAIM "LV-522 Chance's Claim" // Highpop Only

code/__DEFINES/xeno.dm

@@ -220,7 +220,7 @@
 #define XENO_EXPLOSIVE_ARMOR_TIER_10 100
 
 // Health bands
-#define XENO_HEALTH_LARVA 35 * XENO_UNIVERSAL_HPMULT
+#define XENO_HEALTH_LARVA 45 * XENO_UNIVERSAL_HPMULT
 #define XENO_HEALTH_LESSER_DRONE 160 * XENO_UNIVERSAL_HPMULT
 #define XENO_HEALTH_RUNNER 230 * XENO_UNIVERSAL_HPMULT // Killed by 1 PB
 #define XENO_HEALTH_TIER_1 250 * XENO_UNIVERSAL_HPMULT

code/datums/components/xeno/ai_behavior_overrides/capture_override_behavior.dm

@@ -19,6 +19,9 @@
 	if(!.)
 		return
 
+	if(isfacehugger(checked_xeno))
+		return FALSE
+
 	var/mob/parent_mob = parent
 
 	var/captee_stat = parent_mob.stat

code/game/machinery/medical_pod/autodoc.dm

@@ -248,6 +248,11 @@
 				if(H.disfigured)
 					surgery_list += create_autodoc_surgery(L,LIMB_SURGERY,"facial")
 
+			if(istype(L,/obj/limb/chest))
+				var/obj/limb/chest/C = L
+				if(M.status_flags & XENO_HOST)
+					surgery_list += create_autodoc_surgery(C,LIMB_SURGERY,"object")
+
 			if(L.status & LIMB_BROKEN)
 				surgery_list += create_autodoc_surgery(L,LIMB_SURGERY,"broken")
 			if(L.status & LIMB_DESTROYED)
@@ -256,7 +261,7 @@
 			if(L.implants.len)
 				for(var/I in L.implants)
 					if(!is_type_in_list(I,known_implants))
-						surgery_list += create_autodoc_surgery(L,LIMB_SURGERY,"shrapnel")
+						surgery_list += create_autodoc_surgery(L,LIMB_SURGERY,"object")
 			if(M.incision_depths[L.name] != SURGERY_DEPTH_SURFACE)
 				surgery_list += create_autodoc_surgery(L,LIMB_SURGERY,"open")
 	var/datum/internal_organ/I = M.internal_organs_by_name["eyes"]
@@ -481,8 +486,8 @@
 						H.updatehealth()
 						H.UpdateDamageIcon()
 
-					if("shrapnel")
-						if(prob(30)) visible_message("[icon2html(src, viewers(src))] \The <b>[src]</b> speaks: Beginning shrapnel removal.");
+					if("object")
+						if(prob(30)) visible_message("[icon2html(src, viewers(src))] \The <b>[src]</b> speaks: Beginning foreign object removal.");
 						if(S.unneeded)
 							sleep(UNNEEDED_DELAY)
 							visible_message("[icon2html(src, viewers(src))] \The <b>[src]</b> speaks: Procedure has been deemed unnecessary.");
@@ -500,6 +505,11 @@
 									S.limb_ref.implants -= I
 									H.embedded_items -= I
 									qdel(I)
+						var/obj/item/larva_ref = locate(/obj/item/alien_embryo) in H.contents
+						if(S.limb_ref.name == "chest" && larva_ref)
+							sleep(REMOVE_OBJECT_MAX_DURATION*surgery_mod)
+							H.contents -= larva_ref
+						qdel(larva_ref)
 						if(S.limb_ref.name == "chest" || S.limb_ref.name == "head")
 							close_encased(H,S.limb_ref)
 						if(!surgery) break
@@ -716,9 +726,9 @@
 								if("missing")
 									surgeryqueue["missing"] = 1
 									dat += "Limb Replacement Surgery"
-								if("shrapnel")
-									surgeryqueue["shrapnel"] = 1
-									dat += "Shrapnel Removal Surgery"
+								if("object")
+									surgeryqueue["object"] = 1
+									dat += "Foreign Object Removal Surgery"
 								if("facial")
 									surgeryqueue["facial"] = 1
 									dat += "Facial Reconstruction Surgery"
@@ -743,8 +753,8 @@
 					dat += "<a href='?src=\ref[src];internal=1'>Internal Bleeding Surgery</a><br>"
 				if(isnull(surgeryqueue["open"]))
 					dat += "<a href='?src=\ref[src];open=1'>Close Open Incisions</a><br>"
-				if(isnull(surgeryqueue["shrapnel"]))
-					dat += "<a href='?src=\ref[src];shrapnel=1'>Shrapnel Removal Surgery</a><br>"
+				if(isnull(surgeryqueue["object"]))
+					dat += "<a href='?src=\ref[src];object=1'>Foreign Object Removal Surgery</a><br>"
 				dat += "<b>Organ Surgeries</b>"
 				dat += "<br>"
 				if(isnull(surgeryqueue["eyes"]))
@@ -852,17 +862,23 @@
 					N.fields["autodoc_manual"] += create_autodoc_surgery(null,LIMB_SURGERY,"missing",1)
 				updateUsrDialog()
 
-			if(href_list["shrapnel"])
+			if(href_list["object"])
 				var/known_implants = list(/obj/item/implant/chem, /obj/item/implant/death_alarm, /obj/item/implant/loyalty, /obj/item/implant/tracking, /obj/item/implant/neurostim)
 				for(var/obj/limb/L in connected.occupant.limbs)
 					if(L)
+						if(istype(L,/obj/limb/chest))
+							var/obj/limb/chest/C = L
+							if(connected.occupant.status_flags & XENO_HOST)
+								N.fields["autodoc_manual"] += create_autodoc_surgery(C,LIMB_SURGERY,"object")
+								needed++
+								continue
 						if(L.implants.len)
 							for(var/I in L.implants)
 								if(!is_type_in_list(I,known_implants))
-									N.fields["autodoc_manual"] += create_autodoc_surgery(L,LIMB_SURGERY,"shrapnel")
+									N.fields["autodoc_manual"] += create_autodoc_surgery(L,LIMB_SURGERY,"object")
 									needed++
 				if(!needed)
-					N.fields["autodoc_manual"] += create_autodoc_surgery(null,LIMB_SURGERY,"shrapnel",1)
+					N.fields["autodoc_manual"] += create_autodoc_surgery(null,LIMB_SURGERY,"object",1)
 				updateUsrDialog()
 
 			if(href_list["facial"])

code/game/objects/items/stacks/sheets/sheet_types.dm

@@ -255,6 +255,7 @@ var/global/list/datum/stack_recipe/cardboard_recipes = list ( \
 		new/datum/stack_recipe("empty magazine box (M41A Ext)", /obj/item/ammo_box/magazine/ext/empty), \
 		new/datum/stack_recipe("empty magazine box (M41A Incen)", /obj/item/ammo_box/magazine/incen/empty), \
 		new/datum/stack_recipe("empty magazine box (M41A LE)", /obj/item/ammo_box/magazine/le/empty), \
+		new/datum/stack_recipe("empty magazine box (M41A MK1)", /obj/item/ammo_box/magazine/mk1/empty), \
 		null, \
 		new/datum/stack_recipe("empty shotgun shell box (Beanbag)", /obj/item/ammo_box/magazine/shotgun/beanbag/empty), \
 		new/datum/stack_recipe("empty shotgun shell box (Buckshot)", /obj/item/ammo_box/magazine/shotgun/buckshot/empty), \
@@ -279,6 +280,8 @@ var/global/list/datum/stack_recipe/cardboard_recipes = list ( \
 		new/datum/stack_recipe("empty rifle ammo box (10x24mm Incen)", /obj/item/ammo_box/rounds/incen/empty), \
 		new/datum/stack_recipe("empty rifle ammo box (10x24mm LE)", /obj/item/ammo_box/rounds/le/empty), \
 		null, \
+		new/datum/stack_recipe("empty smartgun ammo box (10x28mm)", /obj/item/ammo_box/rounds/smartgun/empty), \
+		null, \
 		new/datum/stack_recipe("empty box of MREs", /obj/item/ammo_box/magazine/misc/mre/empty), \
 		new/datum/stack_recipe("empty box of M94 Marking Flare Packs", /obj/item/ammo_box/magazine/misc/flares/empty), \
 		new/datum/stack_recipe("empty box of flashlights", /obj/item/ammo_box/magazine/misc/flashlight/empty), \

code/game/objects/structures/crates_lockers/closets/job_closets.dm

@@ -118,6 +118,7 @@
 	new /obj/item/ammo_magazine/smartgun(src)
 	new /obj/item/ammo_magazine/smartgun(src)
 	new /obj/item/storage/belt/marine/smartgunner(src)
+	new /obj/item/storage/belt/gun/smartgunner(src)
 
 /obj/structure/closet/cryo/Initialize()
 	. = ..()

code/modules/admin/game_master/game_master.dm

@@ -29,7 +29,7 @@ GLOBAL_VAR_INIT(radio_communication_clarity, 100)
 
 // Spawn stuff
 #define DEFAULT_SPAWN_XENO_STRING XENO_CASTE_DRONE
-#define GAME_MASTER_AI_XENOS list(XENO_CASTE_DRONE, XENO_CASTE_RUNNER, XENO_CASTE_LURKER, XENO_CASTE_CRUSHER)
+#define GAME_MASTER_AI_XENOS list(XENO_CASTE_DRONE, XENO_CASTE_RUNNER, XENO_CASTE_LURKER, XENO_CASTE_CRUSHER, XENO_CASTE_FACEHUGGER)
 #define DEFAULT_SPAWN_HIVE_STRING XENO_HIVE_NORMAL
 
 #define DEFAULT_XENO_AMOUNT_TO_SPAWN 1

code/modules/admin/game_master/game_master_submenu/ambush.dm

@@ -1,6 +1,6 @@
 
 #define DEFAULT_SPAWN_XENO_STRING XENO_CASTE_DRONE
-#define GAME_MASTER_AMBUSH_AI_XENOS list(XENO_CASTE_DRONE, XENO_CASTE_RUNNER, XENO_CASTE_LURKER)
+#define GAME_MASTER_AMBUSH_AI_XENOS list(XENO_CASTE_DRONE, XENO_CASTE_RUNNER, XENO_CASTE_LURKER, XENO_CASTE_FACEHUGGER)
 #define DEFAULT_SPAWN_HIVE_STRING XENO_HIVE_NORMAL
 
 #define DEFAULT_XENO_AMOUNT_TO_SPAWN 1

code/modules/character_traits/robotic_limbs.dm

@@ -6,23 +6,16 @@
 /datum/character_trait/robo_limb
 	var/robo_limb_name
 	var/code_limb
-	var/additional_description = "Only usable by 2ndLts and up."
 	applyable = FALSE
 	trait_group = /datum/character_trait_group/robo_limb
 	cost = 1
-	var/minimum_ranking = 12 // MO1, so SO and up
 
 /datum/character_trait/robo_limb/New()
 	..()
 	trait_name = "Prosthetic [robo_limb_name]"
-	trait_desc = "Has their [robo_limb_name] replaced with a prosthetic. [additional_description]"
+	trait_desc = "Has their [robo_limb_name] replaced with a prosthetic."
 
 /datum/character_trait/robo_limb/apply_trait(mob/living/carbon/human/target, datum/equipment_preset/preset)
-	var/string_paygrade = preset.load_rank(target)
-	var/datum/paygrade/paygrade_datum = GLOB.paygrades[string_paygrade]
-	if(paygrade_datum?.ranking < minimum_ranking)
-		to_chat(target, SPAN_WARNING("You aren't a high enough rank to be eligible to have a prosthetic [robo_limb_name]!"))
-		return
 	var/obj/limb/limb = target.get_limb(code_limb)
 	limb.robotize()
 	target.update_body()
@@ -41,13 +34,9 @@
 /datum/character_trait/robo_limb/left_arm
 	robo_limb_name = "Left Arm"
 	code_limb = "l_arm"
-	additional_description = "Only usable by Captains and up."
 	applyable = TRUE
-	minimum_ranking = 14
 
 /datum/character_trait/robo_limb/right_arm
 	robo_limb_name = "Right Arm"
 	code_limb = "r_arm"
-	additional_description = "Only usable by Captains and up."
 	applyable = TRUE
-	minimum_ranking = 14

code/modules/cm_aliens/structures/egg.dm

@@ -8,18 +8,18 @@
 	icon_state = "Egg Growing"
 	density = FALSE
 	anchored = TRUE
-	layer = LYING_BETWEEN_MOB_LAYER //to stop hiding eggs under corpses
+	layer = RESIN_STRUCTURE_LAYER //so facehuggers will be above the eggs
 	health = 80
 	plane = GAME_PLANE
 	var/list/egg_triggers = list()
 	var/status = EGG_GROWING //can be EGG_GROWING, EGG_GROWN, EGG_BURST, EGG_BURSTING, or EGG_DESTROYED; all mutually exclusive
 	var/on_fire = FALSE
 	var/hivenumber = XENO_HIVE_NORMAL
 	var/flags_embryo = NO_FLAGS
+	var/trigger_radius = 2
 
 /obj/effect/alien/egg/Initialize(mapload, hive)
 	. = ..()
-	create_egg_triggers()
 	if (hive)
 		hivenumber = hive
 
@@ -93,21 +93,10 @@
 		update_icon()
 		deploy_egg_triggers()
 
-/obj/effect/alien/egg/proc/create_egg_triggers()
-	for(var/i in 1 to 8)
-		egg_triggers += new /obj/effect/egg_trigger(src, src)
-
 /obj/effect/alien/egg/proc/deploy_egg_triggers()
-	var/i = 1
-	var/x_coords = list(-1,-1,-1,0,0,1,1,1)
-	var/y_coords = list(1,0,-1,1,-1,1,0,-1)
-	var/turf/target_turf
-	for(var/trigger in egg_triggers)
-		var/obj/effect/egg_trigger/ET = trigger
-		target_turf = locate(x+x_coords[i],y+y_coords[i], z)
-		if(target_turf)
-			ET.forceMove(target_turf)
-			i++
+	var/list/observed_turfs = orange(trigger_radius, src)
+	for(var/target_turf in observed_turfs)
+		egg_triggers += new /obj/effect/egg_trigger(target_turf, src)
 
 /obj/effect/alien/egg/proc/hide_egg_triggers()
 	for(var/trigger in egg_triggers)
@@ -136,20 +125,8 @@
 	status = EGG_BURST
 	if(is_hugger_player_controlled)
 		return //Don't need to spawn a hugger, a player controls it already!
-	var/obj/item/clothing/mask/facehugger/child = new(loc, hivenumber)
-
-	child.flags_embryo = flags_embryo
-	flags_embryo = NO_FLAGS // Lose the embryo flags when passed on
 
-	if(X && X.caste.can_hold_facehuggers && (!X.l_hand || !X.r_hand)) //sanity checks
-		X.put_in_hands(child)
-		return
-
-	if(instant_trigger)
-		if(!child.leap_at_nearest_target())
-			child.return_to_egg(src)
-	else
-		child.go_idle()
+	new /mob/living/carbon/xenomorph/facehugger(loc, null, hivenumber)
 
 /obj/effect/alien/egg/bullet_act(obj/projectile/P)
 	..()
@@ -286,9 +263,9 @@
 /obj/effect/egg_trigger/Crossed(atom/movable/AM)
 	if(!linked_egg && !linked_eggmorph) //something went very wrong.
 		qdel(src)
-	else if(linked_egg && (get_dist(src, linked_egg) != 1 || !isturf(linked_egg.loc))) //something went wrong
+	else if(linked_egg && (get_dist(src, linked_egg) > linked_egg.trigger_radius || !isturf(linked_egg.loc))) //something went wrong
 		forceMove(linked_egg)
-	else if(linked_eggmorph && (get_dist(src, linked_eggmorph) != 1 || !isturf(linked_eggmorph.loc))) //something went wrong
+	else if(linked_eggmorph && (get_dist(src, linked_eggmorph) > linked_egg.trigger_radius || !isturf(linked_eggmorph.loc))) //something went wrong
 		forceMove(linked_eggmorph)
 	else if(iscarbon(AM))
 		var/mob/living/carbon/C = AM

code/modules/cm_marines/equipment/maps.dm

@@ -70,7 +70,7 @@
 /obj/item/map/ice_colony_map/v1
 	html_link = "https://cm-ss13.com/w/images/8/88/Ice_V1.png"
 
-/obj/item/map/ice_colony_map_/v2
+/obj/item/map/ice_colony_map/v2
 	html_link = "https://cm-ss13.com/w/images/c/cf/Ice_Colony_v2.png"
 
 /obj/item/map/ice_colony_map_v3
@@ -150,9 +150,10 @@ GLOBAL_LIST_INIT_TYPED(map_type_list, /obj/item/map, setup_all_maps())
 /proc/setup_all_maps()
 	return list(
 		MAP_LV_624 = new /obj/item/map/lazarus_landing_map(),
+		MAP_LV_624_REPAIRED = new /obj/item/map/lazarus_landing_map(),
 		MAP_ICE_COLONY = new /obj/item/map/ice_colony_map(),
 		MAP_ICE_COLONY_V1 = new /obj/item/map/ice_colony_map/v1(),
-		MAP_ICE_COLONY_V2 = new /obj/item/map/ice_colony_map_/v2(),
+		MAP_ICE_COLONY_V2 = new /obj/item/map/ice_colony_map/v2(),
 		MAP_ICE_COLONY_V3 = new /obj/item/map/ice_colony_map_v3(),
 		MAP_WHISKEY_OUTPOST = new /obj/item/map/whiskey_outpost_map(),
 		MAP_BIG_RED = new /obj/item/map/big_red_map(),

code/modules/mob/living/carbon/xenomorph/Facehuggers.dm

@@ -1,5 +1,5 @@
-#define MIN_IMPREGNATION_TIME 10 SECONDS //Time it takes to impregnate someone
-#define MAX_IMPREGNATION_TIME 15 SECONDS
+#define MIN_IMPREGNATION_TIME 30 SECONDS //Time it takes to impregnate someone
+#define MAX_IMPREGNATION_TIME 40 SECONDS
 
 #define MIN_ACTIVE_TIME 5 SECONDS //Time between being dropped and going idle
 #define MAX_ACTIVE_TIME 15 SECONDS

code/modules/mob/living/carbon/xenomorph/Xenomorph.dm

@@ -1107,7 +1107,7 @@
 			to_chat(src, SPAN_WARNING("[current_airlock] is locked down tight. You can't squeeze underneath!"))
 			return FALSE
 	visible_message(SPAN_WARNING("[src] scuttles underneath [current_structure]!"), \
-	SPAN_WARNING("You squeeze and scuttle underneath [current_structure]."), max_distance = 5)
+	SPAN_WARNING("You squeeze and scuttle underneath [current_structure]."), max_distance = 2)
 	forceMove(current_structure.loc)
 	return TRUE
 

code/modules/mob/living/carbon/xenomorph/abilities/carrier/carrier_abilities.dm

@@ -6,6 +6,8 @@
 	action_type = XENO_ACTION_CLICK
 	ability_primacy = XENO_PRIMARY_ACTION_3
 
+	default_ai_action = TRUE
+
 /datum/action/xeno_action/activable/throw_hugger/action_cooldown_check()
 	if(owner)
 		var/mob/living/carbon/xenomorph/carrier/X = owner

code/modules/mob/living/carbon/xenomorph/abilities/carrier/carrier_powers.dm

@@ -3,6 +3,13 @@
 	X.throw_hugger(A)
 	return ..()
 
+/datum/action/xeno_action/activable/throw_hugger/process_ai(mob/living/carbon/xenomorph/X, delta_time)
+	var/distance = get_dist(X, X.current_target)
+	if(!DT_PROB(ai_prob_chance, delta_time) || distance < 3 || distance > 8)
+		return
+
+	use_ability_async(X.current_target)
+
 /datum/action/xeno_action/activable/retrieve_egg/use_ability(atom/A)
 	var/mob/living/carbon/xenomorph/carrier/X = owner
 	X.retrieve_egg(A)

code/modules/mob/living/carbon/xenomorph/abilities/facehugger/facehugger_abilities.dm

@@ -17,3 +17,5 @@
 	freeze_time = 5
 	freeze_play_sound = FALSE
 	can_be_shield_blocked = TRUE
+
+	ai_prob_chance = 45