compile fix + bug fix

Zonespace27 · Sep 14, 2024 · 1e2a1c1 · 1e2a1c1
1 parent b24ea10
commit 1e2a1c1
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 28 deletions.
diff --git a/code/game/objects/items/reagent_containers/autoinjectors.dm b/code/game/objects/items/reagent_containers/autoinjectors.dm
@@ -77,7 +77,9 @@
 	if(!uses_left)
 		return FALSE
 
-	if((user.reagents.get_reagent_amount(chemname) + amount_per_transfer_from_this) > (chemical_reagents_list[chemname].overdose))
+	var/datum/reagent/reagent_datum = GLOB.chemical_reagents_list[chemname]
+
+	if((user.reagents.get_reagent_amount(chemname) + amount_per_transfer_from_this) > (reagent_datum.overdose))
 		return FALSE
 
 	if(skilllock != SKILL_MEDICAL_TRAINED && !skillcheck(user, SKILL_MEDICAL, skilllock))

diff --git a/code/modules/mob/living/carbon/human/ai/brain/ai_brain.dm b/code/modules/mob/living/carbon/human/ai/brain/ai_brain.dm
@@ -161,7 +161,7 @@ GLOBAL_LIST_EMPTY(human_ai_brains)
 		location_loop:
 			for(var/turf/location as anything in directions)
 				if(location)
-					var/list/turf/path = getline2(tied_human, location, include_from_atom = FALSE)
+					var/list/turf/path = get_line(tied_human, location, include_start_atom = FALSE)
 					for(var/turf/possible_blocker as anything in path)
 						if(possible_blocker.density)
 							continue location_loop

diff --git a/code/modules/mob/living/carbon/human/ai/brain/ai_brain_factions.dm b/code/modules/mob/living/carbon/human/ai/brain/ai_brain_factions.dm
@@ -36,7 +36,7 @@
 
 
 /datum/human_ai_faction/uscm
-	faction = FACTION_USCM
+	faction = FACTION_MARINE
 	friendly_factions = list(
 		FACTION_COLONIST,
 		FACTION_TWE,
@@ -57,7 +57,7 @@
 	neutral_factions = list(
 		FACTION_FREELANCER,
 		FACTION_CONTRACTOR,
-		FACTION_USCM,
+		FACTION_MARINE,
 		FACTION_MERCENARY,
 		FACTION_TWE,
 	)
@@ -72,7 +72,6 @@
 	neutral_factions = list(
 		FACTION_FREELANCER,
 		FACTION_CONTRACTOR,
-		FACTION_USCM,
 		FACTION_MERCENARY,
 	)
 

diff --git a/code/modules/mob/living/carbon/human/ai/brain/ai_brain_targeting.dm b/code/modules/mob/living/carbon/human/ai/brain/ai_brain_targeting.dm
@@ -158,7 +158,7 @@
 	primary_weapon.start_fire(object = current_target, bypass_checks = TRUE)
 
 /datum/human_ai_brain/proc/friendly_check()
-	var/list/turf_list = getline2(get_turf(tied_human), get_turf(current_target))
+	var/list/turf_list = get_line(get_turf(tied_human), get_turf(current_target))
 	for(var/turf/tile in turf_list)
 		if(istype(tile, /turf/closed))
 			return TRUE

diff --git a/code/modules/projectiles/gun_helpers.dm b/code/modules/projectiles/gun_helpers.dm
@@ -157,30 +157,29 @@ DEFINES in setup.dm, referenced here.
 	if(CONFIG_GET(flag/remove_gun_restrictions))
 		return TRUE //Not if the config removed it.
 
-	if(user.mind)
-		switch(user.job)
-			if(
-				"PMC",
-				"WY Agent",
-				"Corporate Liaison",
-				"Event",
-				"UPP Armsmaster", //this rank is for the Fun - Ivan preset, it allows him to use the PMC guns randomly generated from his backpack
-			) return TRUE
-		switch(user.faction)
-			if(
-				FACTION_WY_DEATHSQUAD,
-				FACTION_PMC,
-				FACTION_MERCENARY,
-				FACTION_FREELANCER,
-			) return TRUE
-
-		for(var/faction in user.faction_group)
-			if(faction in FACTION_LIST_WY)
-				return TRUE
-
-		if(user.faction in FACTION_LIST_WY)
+	switch(user.job)
+		if(
+			"PMC",
+			"WY Agent",
+			"Corporate Liaison",
+			"Event",
+			"UPP Armsmaster", //this rank is for the Fun - Ivan preset, it allows him to use the PMC guns randomly generated from his backpack
+		) return TRUE
+	switch(user.faction)
+		if(
+			FACTION_WY_DEATHSQUAD,
+			FACTION_PMC,
+			FACTION_MERCENARY,
+			FACTION_FREELANCER,
+		) return TRUE
+
+	for(var/faction in user.faction_group)
+		if(faction in FACTION_LIST_WY)
 			return TRUE
 
+	if(user.faction in FACTION_LIST_WY)
+		return TRUE
+
 	to_chat(user, SPAN_WARNING("[src] flashes a warning sign indicating unauthorized use!"))
 
 // Checks whether there is anything to put your harness