Merge branch 'master' into chinook-refit

code/__DEFINES/mode.dm

@@ -279,6 +279,7 @@ DEFINE_BITFIELD(whitelist_status, list(
 #define FACTION_LIST_MERCENARY list(FACTION_MERCENARY)
 #define FACTION_LIST_MARSHAL list(FACTION_MARSHAL)
 #define FACTION_LIST_DUTCH list(FACTION_DUTCH)
+#define FACTION_LIST_SURVIVOR_WY list(FACTION_SURVIVOR, FACTION_PMC, FACTION_WY_DEATHSQUAD, FACTION_WY)
 #define FACTION_LIST_MARINE_WY list(FACTION_MARINE, FACTION_PMC, FACTION_WY_DEATHSQUAD, FACTION_WY)
 #define FACTION_LIST_MARINE_UPP list(FACTION_MARINE, FACTION_UPP)
 #define FACTION_LIST_MARINE_TWE list(FACTION_MARINE, FACTION_TWE)

code/_globalvars/lists/mapping_globals.dm

@@ -53,6 +53,7 @@ GLOBAL_LIST_EMPTY(teleporter_landmarks)
 
 GLOBAL_LIST_INIT(cardinals, list(NORTH, SOUTH, EAST, WEST))
 GLOBAL_LIST_EMPTY(nightmare_landmarks)
+GLOBAL_LIST_EMPTY(nightmare_landmark_tags_removed)
 
 GLOBAL_LIST_EMPTY(ship_areas)
 

code/game/machinery/rechargestation.dm

@@ -8,14 +8,23 @@
 	use_power = USE_POWER_IDLE
 	idle_power_usage = 50
 	active_power_usage = 50
+	can_buckle = TRUE
+	/// the borg inside
 	var/mob/living/occupant = null
-	var/max_internal_charge = 15000 // Two charged borgs in a row with default cell
-	var/current_internal_charge = 15000 // Starts charged, to prevent power surges on round start
-	var/charging_cap_active = 25000 // Active Cap - When cyborg is inside
-	var/charging_cap_passive = 2500 // Passive Cap - Recharging internal capacitor when no cyborg is inside
-	var/icon_update_tick = 0 // Used to update icon only once every 10 ticks
+	/// Two charged borgs in a row with default cell
+	var/max_internal_charge = 15000
+	/// Starts charged, to prevent power surges on round start
+	var/current_internal_charge = 15000
+	/// Active Cap - When cyborg is inside
+	var/charging_cap_active = 25000
+	/// Passive Cap - Recharging internal capacitor when no cyborg is inside
+	var/charging_cap_passive = 2500
+	/// Used to update icon only once every 10 ticks
+	var/icon_update_tick = 0
+	/// implants to not remove
 	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)
-	can_buckle = TRUE
+	///stun time upon exiting, if at all
+	var/exit_stun = 2
 
 
 /obj/structure/machinery/recharge_station/Initialize(mapload, ...)
@@ -183,18 +192,23 @@
 
 
 /obj/structure/machinery/recharge_station/proc/go_out()
-	if(!( src.occupant ))
+	if(!occupant)
 		return
-	//for(var/obj/O in src)
-	// O.forceMove(src.loc)
-	if (src.occupant.client)
-		src.occupant.client.eye = src.occupant.client.mob
-		src.occupant.client.perspective = MOB_PERSPECTIVE
-	src.occupant.forceMove(loc)
-	src.occupant = null
+	var/mob/living/synth = occupant
+
+	if(synth.client)
+		synth.client.eye = synth.client.mob
+		synth.client.perspective = MOB_PERSPECTIVE
+
+	synth.forceMove(loc)
+	if(exit_stun)
+		synth.Stun(exit_stun) //Action delay when going out of a closet
+	if(synth.mobility_flags & MOBILITY_MOVE)
+		synth.visible_message(SPAN_WARNING("[synth] suddenly gets out of [src]!"), SPAN_WARNING("You get out of [src] and get your bearings!"))
+
+	occupant = null
 	update_icon()
 	update_use_power(USE_POWER_IDLE)
-	return
 
 /obj/structure/machinery/recharge_station/verb/move_eject()
 	set category = "Object"

code/game/objects/effects/landmarks/landmarks.dm

@@ -90,9 +90,11 @@
 		return
 	GLOB.nightmare_landmarks[insert_tag] = get_turf(src)
 /obj/effect/landmark/nightmare/Destroy()
-	if(insert_tag && autoremove \
-	   && GLOB.nightmare_landmarks[insert_tag] == get_turf(src))
-		GLOB.nightmare_landmarks.Remove(insert_tag)
+	if(insert_tag)
+		var/turf/turf = get_turf(src)
+		if(autoremove && GLOB.nightmare_landmarks[insert_tag] == turf)
+			GLOB.nightmare_landmarks.Remove(insert_tag)
+		GLOB.nightmare_landmark_tags_removed += insert_tag
 	return ..()
 
 /obj/effect/landmark/ert_spawns/distress

code/modules/gear_presets/survivors/survivors.dm

@@ -301,6 +301,7 @@ Everything bellow is a parent used as a base for one or multiple maps.
 	skills = /datum/skills/civilian/survivor
 	flags = EQUIPMENT_PRESET_START_OF_ROUND
 	paygrade = PAY_SHORT_WYC2
+	faction_group = FACTION_LIST_SURVIVOR_WY
 	idtype = /obj/item/card/id/silver/clearance_badge/cl
 	access = list(
 		ACCESS_CIVILIAN_PUBLIC,
@@ -381,7 +382,7 @@ Everything bellow is a parent used as a base for one or multiple maps.
 	access = list(ACCESS_CIVILIAN_PUBLIC,ACCESS_CIVILIAN_LOGISTICS,ACCESS_WY_FLIGHT)
 
 /datum/equipment_preset/survivor/flight_control_operator/load_gear(mob/living/carbon/human/new_human)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/lawyer/bluesuit(new_human), WEAR_BODY)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/workwear/khaki(new_human), WEAR_BODY)
 	if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD])
 		add_ice_colony_survivor_equipment(new_human)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/windbreaker/windbreaker_brown(new_human), WEAR_JACKET)
@@ -425,10 +426,11 @@ Everything bellow is a parent used as a base for one or multiple maps.
 	name = "Survivor - Interstellar Commerce Commission Liaison"
 	assignment = "Interstellar Commerce Commission Corporate Liaison"
 	skills = /datum/skills/civilian/survivor
-	idtype = /obj/item/card/id/silver/cl
+	flags = EQUIPMENT_PRESET_START_OF_ROUND
 	paygrade = PAY_SHORT_ICCL
+	faction_group = FACTION_LIST_SURVIVOR_WY
+	idtype = /obj/item/card/id/silver/cl
 	role_comm_title = "ICC Rep."
-	flags = EQUIPMENT_PRESET_START_OF_ROUND
 
 	survivor_variant = CORPORATE_SURVIVOR
 

code/modules/gear_presets/uscm_ship.dm

@@ -26,6 +26,7 @@
 
 /datum/equipment_preset/uscm_ship/liaison
 	name = "USCM Corporate Liaison (CL)"
+	faction_group =	FACTION_LIST_MARINE_WY
 	flags = EQUIPMENT_PRESET_START_OF_ROUND
 
 	idtype = /obj/item/card/id/silver/cl

code/modules/nightmare/nmnodes/mapload.dm

@@ -94,7 +94,7 @@
 	. = ..()
 	if(!.) return
 	var/dir_path = context.get_file_path(filepath, "map")
-	var/regex/matcher = new(@"^([0-9]+)([\.\+])([^_]+)(_.*)?\.dmm$", "i")
+	var/regex/matcher = new(@"^([0-9]+)([\.\+])(([^_]+)(_.*))?\.dmm$", "i")
 	var/list/dircontents = flist(dir_path)
 	for(var/filename in dircontents)
 		if(!matcher.Find(filename))

code/modules/nightmare/nmtasks/mapload.dm

@@ -34,36 +34,35 @@
 /datum/nmtask/mapload/proc/step_parse()
 	. = TRUE
 	if(!fexists(filepath))
-		log_debug("Nightmare Mapload: File does not exist: [filepath]")
-		return
+		CRASH("Nightmare Mapload: File does not exist: [filepath]")
 	if(!parsed)
 		parsed = new(file(filepath))
 		if(!parsed?.bounds)
-			log_debug("Nightmare Mapload: File loading failed: [filepath]")
-			return
+			CRASH("Nightmare Mapload: File loading failed: [filepath]")
 		if(isnull(parsed.bounds[1]))
-			log_debug("Nightmare Mapload: Map parsing failed: [filepath]")
-			return
+			CRASH("Nightmare Mapload: Map parsing failed: [filepath]")
 	return FALSE
 
 /datum/nmtask/mapload/proc/step_loadmap(list/statsmap)
 	. = TRUE
 	UNTIL(!Master.map_loading)
 	target_turf = GLOB.nightmare_landmarks[landmark]
 	if(!target_turf?.z)
-		log_debug("Nightmare Mapload: Could not find landmark: [landmark]")
-		return
+		if(landmark in GLOB.nightmare_landmark_tags_removed)
+			log_debug("Nightmare Mapload: Could not find landmark: [landmark] because it was deleted")
+			return
+		else
+			CRASH("Nightmare Mapload: Could not find landmark: [landmark]")
 	var/result = parsed.load(target_turf.x, target_turf.y, target_turf.z, crop_map = TRUE, no_changeturf = FALSE, place_on_top = FALSE, delete = replace)
 	if(!result || !parsed.bounds)
-		log_debug("Nightmare Mapload: Map insertion failed unexpectedly for file: [filepath]")
-		return
+		CRASH("Nightmare Mapload: Map insertion failed unexpectedly for file: [filepath]")
 	return FALSE
 
 /datum/nmtask/mapload/proc/step_init(list/statsmap)
 	if(initialize_boundary_contents())
 		log_debug("Nightmare Mapload: Loaded '[filepath]' at '[landmark]' ([target_turf.x], [target_turf.y], [target_turf.z])")
 		return FALSE
-	log_debug("Nightmare Mapload: Loaded map file but could not initialize: '[filepath]' at ([target_turf.x], [target_turf.y], [target_turf.z])")
+	stack_trace("Nightmare Mapload: Loaded map file but could not initialize: '[filepath]' at ([target_turf.x], [target_turf.y], [target_turf.z])")
 	return TRUE
 
 /// Initialize atoms/areas in bounds - basically a Nightmare version of [/datum/map_template/initTemplateBounds]

html/changelogs/archive/2024-03.yml

@@ -0,0 +1,19 @@
+2024-03-01:
+  BadAtThisGame302:
+  - rscadd: Added a new uniform to the Flight Control Operator.
+  - rscadd: Added a new faction IFF grouping for WY Survs.
+  - rscadd: Added the ICC and the CL survs to the WY IFF System.
+  - rscadd: Added the USCM CL to the WY IFF System.
+  Drathek BadAtThisGame:
+  - maptweak: Fixed various nightmare inserts that were not spawning; removing or
+      disabling others that were not in use.
+  - maptweak: Updated containerroom_xenos insert for Solaris Ridge to include coms
+      tower (BadAtThisGame)
+  - code_imp: Nightmare errors are now a runtime.
+  Huffie56:
+  - refactor: refactored stage three of black goo and added stage four.
+  Lok1:
+  - rscadd: maintenance stations stun when exiting like closets
+  Vicacrov:
+  - rscadd: 'You can now order the following in Requisitions: M2C ammo, M56D ammo,
+      UA 45-F mini sentry ammo, UA 60-FP sentry ammo.'

maps/map_files/BigRed/BigRed.dmm

@@ -12602,7 +12602,7 @@
 /area/bigredv2/outside/office_complex)
 "aLh" = (
 /obj/effect/landmark/nightmare{
-	insert_tag = "lz1north"
+	insert_tag = "lz1north_mining"
 	},
 /turf/closed/wall/solaris/reinforced,
 /area/bigredv2/outside/space_port)
@@ -27195,6 +27195,12 @@
 	icon_state = "red"
 	},
 /area/bigredv2/outside/marshal_office)
+"cGv" = (
+/obj/effect/landmark/nightmare{
+	insert_tag = "containerroom_xenos"
+	},
+/turf/closed/wall/solaris/reinforced,
+/area/bigredv2/outside/nw/ceiling)
 "cGQ" = (
 /obj/structure/blocker/forcefield/multitile_vehicles,
 /turf/open/floor{
@@ -28358,7 +28364,7 @@
 /area/bigredv2/outside/dorms)
 "ers" = (
 /obj/effect/landmark/nightmare{
-	insert_tag = "etatunnel"
+	insert_tag = "etatunnel_open"
 	},
 /turf/closed/wall/solaris/rock,
 /area/bigredv2/caves)
@@ -28711,7 +28717,7 @@
 /area/bigredv2/caves/mining)
 "eUT" = (
 /obj/effect/landmark/nightmare{
-	insert_tag = "viro-rock"
+	insert_tag = "viro-rock_open"
 	},
 /turf/closed/wall/solaris/reinforced,
 /area/bigredv2/outside/virology)
@@ -31090,7 +31096,7 @@
 /area/bigredv2/outside/space_port_lz2)
 "iIp" = (
 /obj/effect/landmark/nightmare{
-	insert_tag = "chapel"
+	insert_tag = "chapel_cult"
 	},
 /turf/closed/wall/solaris,
 /area/bigredv2/outside/chapel)
@@ -31315,7 +31321,7 @@
 /area/bigredv2/caves/mining)
 "jcn" = (
 /obj/effect/landmark/nightmare{
-	insert_tag = "tcomms"
+	insert_tag = "tcomms_open"
 	},
 /turf/closed/wall/solaris/rock,
 /area/bigredv2/caves)
@@ -31467,7 +31473,7 @@
 	dir = 5
 	},
 /obj/effect/landmark/nightmare{
-	insert_tag = "dorms"
+	insert_tag = "dorms_party"
 	},
 /turf/open/floor,
 /area/bigredv2/outside/dorms)
@@ -33265,7 +33271,7 @@
 /area/bigredv2/caves/mining)
 "lMt" = (
 /obj/effect/landmark/nightmare{
-	insert_tag = "cargo"
+	insert_tag = "cargo_containers"
 	},
 /turf/closed/wall/solaris,
 /area/bigredv2/outside/cargo)
@@ -33280,7 +33286,7 @@
 /area/bigredv2/caves_lambda)
 "lMB" = (
 /obj/effect/landmark/nightmare{
-	insert_tag = "lz1cave"
+	insert_tag = "lz1cave_flank"
 	},
 /turf/closed/wall/solaris/reinforced,
 /area/bigredv2/outside/space_port)
@@ -34454,7 +34460,7 @@
 /area/bigredv2/outside/filtration_cave_cas)
 "nGt" = (
 /obj/effect/landmark/nightmare{
-	insert_tag = "admin"
+	insert_tag = "admin_pmc"
 	},
 /turf/closed/wall/solaris/reinforced,
 /area/bigredv2/outside/admin_building)
@@ -35469,7 +35475,7 @@
 /area/bigredv2/outside/admin_building)
 "pdN" = (
 /obj/effect/landmark/nightmare{
-	insert_tag = "lz1entrance"
+	insert_tag = "lz1entrance_v2"
 	},
 /turf/open/mars,
 /area/bigredv2/outside/nw)
@@ -36590,7 +36596,7 @@
 /area/bigredv2/caves/mining)
 "qTu" = (
 /obj/effect/landmark/nightmare{
-	insert_tag = "viro"
+	insert_tag = "viro_open"
 	},
 /turf/closed/wall/solaris/rock,
 /area/bigredv2/caves)
@@ -36927,7 +36933,7 @@
 /area/bigredv2/caves/mining)
 "rrl" = (
 /obj/effect/landmark/nightmare{
-	insert_tag = "filtration"
+	insert_tag = "filtration_restored"
 	},
 /turf/open/mars_cave{
 	icon_state = "mars_cave_2"
@@ -38943,7 +38949,7 @@
 /area/bigredv2/caves/mining)
 "tYM" = (
 /obj/effect/landmark/nightmare{
-	insert_tag = "prison"
+	insert_tag = "prison_breakout"
 	},
 /turf/closed/wall/solaris/reinforced,
 /area/bigredv2/outside/marshal_office)
@@ -39277,7 +39283,7 @@
 /area/bigredv2/caves/mining)
 "uCD" = (
 /obj/effect/landmark/nightmare{
-	insert_tag = "reactor"
+	insert_tag = "reactor_meltdown"
 	},
 /turf/closed/wall/solaris/rock,
 /area/bigredv2/caves)
@@ -39883,7 +39889,7 @@
 /area/bigredv2/caves/eta/research)
 "vvi" = (
 /obj/effect/landmark/nightmare{
-	insert_tag = "lz1containers"
+	insert_tag = "lz1containers_scramble"
 	},
 /turf/open/floor{
 	dir = 4;
@@ -41717,7 +41723,7 @@
 /area/bigredv2/outside/n)
 "yfe" = (
 /obj/effect/landmark/nightmare{
-	insert_tag = "eta"
+	insert_tag = "eta_carp"
 	},
 /turf/closed/wall/solaris/reinforced,
 /area/bigredv2/caves/eta/xenobiology)
@@ -49956,7 +49962,7 @@ axv
 anp
 anp
 anp
-anp
+cGv
 ajx
 ajY
 akK