some local test issues, stop bothering me! just work!

cmss13-devs · Jan 25, 2025 · 1072d9e · 1072d9e
1 parent 0947e8b
commit 1072d9e
Show file tree

Hide file tree

Showing 20 changed files with 32 additions and 32 deletions.
diff --git a/code/game/gamemodes/cm_process.dm b/code/game/gamemodes/cm_process.dm
@@ -225,9 +225,9 @@ GLOBAL_VAR_INIT(next_admin_bioscan, 30 MINUTES)
 	for(var/i in GLOB.alive_human_list)
 		var/mob/M = i
 		if(M.z && (M.z in z_levels) && !istype(M.loc, /turf/open/space) && !istype(M.loc, /area/adminlevel/ert_station/fax_response_station))
-			if(M.faction in FACTION_LIST_WY)
+			if(M.faction.code_identificator in FACTION_LIST_WY)
 				num_pmcs++
-			else if(M.faction == FACTION_MARINE)
+			else if(M.faction.code_identificator == FACTION_MARINE)
 				num_marines++
 
 	return list(num_marines,num_pmcs)

diff --git a/code/game/machinery/computer/groundside_operations.dm b/code/game/machinery/computer/groundside_operations.dm
@@ -242,7 +242,7 @@
 			if(!is_announcement_active)
 				to_chat(usr, SPAN_WARNING("Please allow at least [COOLDOWN_COMM_MESSAGE*0.1] second\s to pass between announcements."))
 				return FALSE
-			if(announcement_faction != FACTION_MARINE && usr.faction != GLOB.faction_datums[announcement_faction])
+			if(announcement_faction != FACTION_MARINE && usr.faction.code_identificator != announcement_faction)
 				to_chat(usr, SPAN_WARNING("Access denied."))
 				return
 			var/input = stripped_multiline_input(usr, "Please write a message to announce to the station crew.", "Priority Announcement", "")

diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm
@@ -244,7 +244,7 @@ GLOBAL_LIST_INIT(frozen_items, list(SQUAD_MARINE_1 = list(), SQUAD_MARINE_2 = li
 				dept_console = GLOB.frozen_items["Eng"]
 
 
-		if(cryo_human.faction != FACTION_MARINE)
+		if(cryo_human.faction.code_identificator != FACTION_MARINE)
 			dept_console = GLOB.frozen_items[cryo_human.faction]
 
 		if(cryo_human.job in FAX_RESPONDER_JOB_LIST)
@@ -565,7 +565,7 @@ GLOBAL_LIST_INIT(frozen_items, list(SQUAD_MARINE_1 = list(), SQUAD_MARINE_2 = li
 		return TRUE
 	if(no_store_pod)
 		return TRUE
-	if(occupant.faction != FACTION_MARINE)
+	if(occupant.faction.code_identificator != FACTION_MARINE)
 		return TRUE
 	return FALSE
 

diff --git a/code/game/objects/items/devices/motion_detector.dm b/code/game/objects/items/devices/motion_detector.dm
@@ -224,7 +224,7 @@
 		var/mob/living/M = A //do this to skip the unnecessary istype() check; everything in ping_candidate is a mob already
 		if(M == loc) continue //device user isn't detected
 		if(world.time > M.l_move_time + 20) continue //hasn't moved recently
-		if(M.ally_faction(iff_signal))
+		if(M.ally_faction(GLOB.faction_datums[iff_signal]))
 			continue
 
 		apply_debuff(M)

diff --git a/code/game/objects/items/explosives/grenades/marines.dm b/code/game/objects/items/explosives/grenades/marines.dm
@@ -541,7 +541,7 @@
 		SPAN_NOTICE("You finish deploying [src]."))
 	var/obj/item/explosive/mine/sebb/planted = new /obj/item/explosive/mine/sebb(get_turf(user))
 	planted.activate_sensors()
-	planted.iff_signal = user.faction // assuring IFF is set
+	planted.iff_signal = user.faction.code_identificator // assuring IFF is set
 	planted.pixel_x += rand(-5, 5)
 	planted.pixel_y += rand(-5, 5)
 	qdel(src)

diff --git a/code/game/objects/items/explosives/mine.dm b/code/game/objects/items/explosives/mine.dm
@@ -117,7 +117,7 @@
 		if(active)
 			if(user.action_busy)
 				return
-			if(user.faction == iff_signal)
+			if(user.faction.code_identificator == iff_signal)
 				user.visible_message(SPAN_NOTICE("[user] starts disarming [src]."), \
 				SPAN_NOTICE("You start disarming [src]."))
 			else
@@ -127,7 +127,7 @@
 				user.visible_message(SPAN_WARNING("[user] stops disarming [src]."), \
 					SPAN_WARNING("You stop disarming [src]."))
 				return
-			if(user.faction != iff_signal) //ow!
+			if(user.faction.code_identificator != iff_signal) //ow!
 				if(prob(75))
 					triggered = TRUE
 					if(tripwire)
@@ -205,7 +205,7 @@
 		return
 	if(L.stat == DEAD)
 		return
-	if(L.ally_faction(iff_signal))
+	if(L.ally_faction(GLOB.faction_datums[iff_signal]))
 		return
 	if(HAS_TRAIT(L, TRAIT_ABILITY_BURROWED))
 		return

diff --git a/code/modules/assembly/proximity.dm b/code/modules/assembly/proximity.dm
@@ -70,7 +70,7 @@
 	if(scanning)
 		var/turf/mainloc = get_turf(src)
 		for(var/mob/living/M in range(range,mainloc))
-			if(M.ally_faction(iff_signal))
+			if(M.ally_faction(GLOB.faction_datums[iff_signal]))
 				continue
 			HasProximity(M)
 

diff --git a/code/modules/cm_marines/radar.dm b/code/modules/cm_marines/radar.dm
@@ -228,7 +228,7 @@
 	if(!humanoid || !istype(humanoid))
 		return FALSE
 	if(..())
-		if(humanoid.faction != faction)
+		if(humanoid.faction.code_identificator != faction)
 			return FALSE
 		if(istype(humanoid.w_uniform, /obj/item/clothing/under))
 			var/obj/item/clothing/under/uniform = humanoid.w_uniform

diff --git a/code/modules/cm_preds/smartdisc.dm b/code/modules/cm_preds/smartdisc.dm
@@ -148,7 +148,7 @@
 	break_stuff_probability = 0
 	destroy_surroundings = 0
 
-	faction = FACTION_YAUTJA
+	faction_to_get = FACTION_YAUTJA
 	var/lifetime = 8 //About 15 seconds.
 	var/time_idle = 0
 

diff --git a/code/modules/defenses/bell_tower.dm b/code/modules/defenses/bell_tower.dm
@@ -162,11 +162,11 @@
 /obj/structure/machinery/defenses/bell_tower/md/setup_tripwires()
 	md = new(src)
 	md.linked_tower = src
-	md.iff_signal = faction
+	md.iff_signal = faction.code_identificator
 	md.toggle_active(null, FALSE)
 
 	if(!md.iff_signal)
-		md.iff_signal = GLOB.faction_datums[FACTION_MARINE]
+		md.iff_signal = FACTION_MARINE
 
 /obj/structure/machinery/defenses/bell_tower/md/clear_tripwires()
 	if(md)

diff --git a/code/modules/maptext_alerts/text_blurbs.dm b/code/modules/maptext_alerts/text_blurbs.dm
@@ -42,8 +42,8 @@ base = the base the marines are staging from. The ship, Whiskey Outpost etc. Non
 							"cl" = list(),
 							"misc" = list())
 
-	for(var/mob/living/carbon/human/H as anything in GLOB.alive_human_list)
-		if(H.faction != FACTION_MARINE || (H.z in exempt_zlevels))
+	for(var/mob/living/carbon/human/H as anything in GLOB.faction_datums[FACTION_MARINE].total_mobs)
+		if(H.z in exempt_zlevels)
 			continue
 		switch(H.job)
 			if(BLURB_USCM_COMBAT)

diff --git a/code/modules/mob/dead/observer/orbit.dm b/code/modules/mob/dead/observer/orbit.dm
@@ -153,9 +153,9 @@
 					in_thunderdome += list(serialized)
 				else if(human.job in FAX_RESPONDER_JOB_LIST)
 					responders += list(serialized)
-				else if(SSticker.mode.is_in_endgame == TRUE && !is_mainship_level(human.z) && !(human.faction in FACTION_LIST_ERT_ALL) && !(isyautja(human)))
+				else if(SSticker.mode.is_in_endgame == TRUE && !is_mainship_level(human.z) && !(human.faction.code_identificator in FACTION_LIST_ERT_ALL) && !(isyautja(human)))
 					escaped += list(serialized)
-				else if(human.faction in FACTION_LIST_WY)
+				else if(human.faction.code_identificator in FACTION_LIST_WY)
 					wy += list(serialized)
 				else if(issynth(human) && !isinfiltratorsynthetic(human))
 					synthetics += list(serialized)
@@ -181,7 +181,7 @@
 					marshal += list(serialized)
 				else if(human.faction.code_identificator == FACTION_DUTCH)
 					dutch += list(serialized)
-				else if(human.faction in FACTION_MARINE)
+				else if(human.faction.code_identificator == FACTION_MARINE)
 					marines += list(serialized)
 				else if(issurvivorjob(human.job))
 					survivors += list(serialized)

diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
@@ -1061,7 +1061,7 @@
 	set name = "View Crew Manifest"
 	set category = "IC"
 
-	if(faction != FACTION_MARINE && !((faction in FACTION_LIST_WY) || faction == FACTION_FAX))
+	if(faction.code_identificator != FACTION_MARINE && !((faction.code_identificator in FACTION_LIST_WY) || faction.code_identificator == FACTION_FAX))
 		to_chat(usr, SPAN_WARNING("You have no access to [MAIN_SHIP_NAME] crew manifest."))
 		return
 	GLOB.crew_manifest.open_ui(src)
@@ -1074,7 +1074,7 @@
 		to_chat(src, "The game appears to have misplaced your mind datum.")
 		return
 
-	if(!skillcheck(usr, SKILL_INTEL, SKILL_INTEL_TRAINED) || faction != FACTION_MARINE && !(faction in FACTION_LIST_WY))
+	if(!skillcheck(usr, SKILL_INTEL, SKILL_INTEL_TRAINED) || faction.code_identificator != FACTION_MARINE && !(faction.code_identificator in FACTION_LIST_WY))
 		to_chat(usr, SPAN_WARNING("You have no access to the [MAIN_SHIP_NAME] intel network."))
 		return
 

diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Hellhound.dm b/code/modules/mob/living/carbon/xenomorph/castes/Hellhound.dm
@@ -75,7 +75,7 @@
 	weed_food_states_flipped = list("Hellhound_1","Hellhound_2","Hellhound_3")
 
 /mob/living/carbon/xenomorph/hellhound/Initialize(mapload, mob/living/carbon/xenomorph/old_xeno, datum/faction/faction_to_set)
-	. = ..(mapload, old_xeno, faction_to_set || FACTION_XENOMORPH_YAUTJA)
+	. = ..(mapload, old_xeno, faction_to_set || GLOB.faction_datums[FACTION_XENOMORPH_YAUTJA])
 
 	set_languages(list(LANGUAGE_HELLHOUND, LANGUAGE_YAUTJA))
 

diff --git a/code/modules/projectiles/guns/smartgun.dm b/code/modules/projectiles/guns/smartgun.dm
@@ -770,7 +770,7 @@
 
 /obj/item/weapon/gun/smartgun/dirty/Initialize(mapload, ...)
 	. = ..()
-	MD.iff_signal = FACTION_PMC
+	MD.iff_signal =GLOB.faction_datums[FACTION_PMC]
 
 //TERMINATOR SMARTGUN
 /obj/item/weapon/gun/smartgun/dirty/elite
@@ -779,7 +779,7 @@
 
 /obj/item/weapon/gun/smartgun/dirty/elite/Initialize(mapload, ...)
 	. = ..()
-	MD.iff_signal = FACTION_WY_DEATHSQUAD
+	MD.iff_signal = GLOB.faction_datums[FACTION_WY_DEATHSQUAD]
 
 /obj/item/weapon/gun/smartgun/dirty/elite/set_gun_config_values()
 	..()
@@ -801,7 +801,7 @@
 
 /obj/item/weapon/gun/smartgun/clf/Initialize(mapload, ...)
 	. = ..()
-	MD.iff_signal = FACTION_CLF
+	MD.iff_signal = GLOB.faction_datums[FACTION_CLF]
 
 /obj/item/weapon/gun/smartgun/admin
 	requires_power = FALSE
@@ -854,4 +854,4 @@
 
 /obj/item/weapon/gun/smartgun/rmc/Initialize(mapload, ...)
 	. = ..()
-	MD.iff_signal = FACTION_TWE
+	MD.iff_signal = GLOB.faction_datums[FACTION_TWE]
diff --git a/code/modules/vehicles/souto_mobile.dm b/code/modules/vehicles/souto_mobile.dm
@@ -37,7 +37,7 @@
 /obj/vehicle/souto/super/buckle_mob(mob/M, mob/user)
 	if(!locked) //Vehicle is unlocked until first being mounted, since the Soutomobile is faction-locked and otherwise Souto Man cannot automatically buckle in on spawn as his equipment is spawned before his ID.
 		locked = TRUE
-	else if(M == user && M.faction != FACTION_SOUTO && locked == TRUE) //Are you a cool enough dude to drive this bike? Nah, nobody's THAT cool.
+	else if(M == user && M.faction.code_identificator != FACTION_SOUTO && locked == TRUE) //Are you a cool enough dude to drive this bike? Nah, nobody's THAT cool.
 		to_chat(user, SPAN_WARNING("Somehow, as you take hold of the handlebars, [src] manages to glare at you. You back off. We didn't sign up for haunted motorbikes, man."))
 		return
 	..()
diff --git a/maps/map_files/BigRed/sprinkles/5.eta_carp.dmm b/maps/map_files/BigRed/sprinkles/5.eta_carp.dmm
@@ -83,7 +83,7 @@
 /area/bigredv2/caves/eta/xenobiology)
 "t" = (
 /mob/living/simple_animal/hostile/carp{
-	faction = "nfo";
+	faction_to_get = "nfo";
 	name = "strange fish"
 	},
 /turf/open/ice,

diff --git a/maps/map_files/CORSAT/Corsat.dmm b/maps/map_files/CORSAT/Corsat.dmm
@@ -1735,7 +1735,7 @@
 "agX" = (
 /mob/living/simple_animal/hostile/carp{
 	color = "orange";
-	faction = "nfo";
+	faction_to_get = "nfo";
 	harm_intent_damage = 0;
 	melee_damage_lower = 0;
 	melee_damage_upper = 0

diff --git a/maps/templates/baseone.dmm b/maps/templates/baseone.dmm
@@ -739,7 +739,7 @@
 /mob/living/simple_animal/chicken{
 	desc = "A chubby and friendly chicken, often sticking to the person being on kitchen duty. She looks somewhat lonely.";
 	emote_see = list("pecks at the ground","flaps its wings","clucks happily");
-	faction = "upp";
+	faction_to_get = "upp";
 	name = "\improper Charlie";
 	voice_name = "chicken"
 	},

diff --git a/maps/templates/lazy_templates/fax_responder_base.dmm b/maps/templates/lazy_templates/fax_responder_base.dmm
@@ -4320,7 +4320,7 @@
 "TI" = (
 /mob/living/simple_animal/hostile/carp{
 	destroy_surroundings = 0;
-	faction = "fax";
+	faction_to_get = "fax";
 	name = "Gary"
 	},
 /turf/open/space/basic,