Pacify CI checks

Starfly-13 · Jul 14, 2024 · 632f8fd · 632f8fd
1 parent a6027cd
commit 632f8fd
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/_maps/_basemap.dm b/_maps/_basemap.dm
@@ -1,6 +1,6 @@
 /// VERY IMPORTANT FOR RUNNING FAST IN PRODUCTION!
 /// If you define this flag, centcom will load. It's also supposed to preload planetoids, but that is disabled.
-#define FULL_INIT
+// #define FULL_INIT
 
 #ifdef FULL_INIT
 	#include "map_files\generic\CentCom.dmm"

diff --git a/code/modules/jobs/access.dm b/code/modules/jobs/access.dm
@@ -114,9 +114,10 @@
 	if (gen_ship_access(ship))
 		return TRUE
 
-	var/obj/item/card/id/id = item?.GetID()
-	if (id?.has_ship_access(ship))
-		return TRUE
+	if(istype(item, /obj/item/card/id))
+		var/obj/item/card/id/id = item.GetID()
+		if (id.has_ship_access(ship))
+			return TRUE
 
 	return FALSE
 

diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
@@ -1036,9 +1036,9 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 						accessory_overlay.color = "#[H.dna.features[FEATURE_UNATHI_COLOR_FRILL1]]"
 					if("horns")
 						accessory_overlay.color = "#[H.dna.features[FEATURE_UNATHI_COLOR_HORN1]]"
-					if("spines" || "waggingspines")
+					if("spines", "waggingspines")
 						accessory_overlay.color = "#[H.dna.features[FEATURE_UNATHI_COLOR_SPINE1]]"
-					if("tail" || "waggingtail")
+					if("tail", "waggingtail")
 						accessory_overlay.color = "#[H.dna.features[FEATURE_UNATHI_COLOR_TAIL1]]"
 					else
 						accessory_overlay.color = "#[H.dna.features[FEATURE_UNATHI_COLOR_BODY1]]"
@@ -1067,9 +1067,9 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 							secondary_color_overlay.color = "#[H.dna.features[FEATURE_UNATHI_COLOR_FRILL2]]"
 						if("horns")
 							secondary_color_overlay.color = "#[H.dna.features[FEATURE_UNATHI_COLOR_HORN2]]"
-						if("spines" || "waggingspines")
+						if("spines", "waggingspines")
 							secondary_color_overlay.color = "#[H.dna.features[FEATURE_UNATHI_COLOR_SPINE2]]"
-						if("tail" || "waggingtail")
+						if("tail", "waggingtail")
 							secondary_color_overlay.color = "#[H.dna.features[FEATURE_UNATHI_COLOR_TAIL2]]"
 						else
 							secondary_color_overlay.color = "#[H.dna.features[FEATURE_UNATHI_COLOR_BODY2]]"

diff --git a/code/modules/starfly13/__HELPERS/unathi_colors.dm b/code/modules/starfly13/__HELPERS/unathi_colors.dm
@@ -15,7 +15,7 @@
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 //---------------------------------------------------------------------------
 
-/proc/choose_unathi_color(mob/user, list/features, var/unathi_color, var/default_color)
+/proc/choose_unathi_color(mob/user, list/features, unathi_color, default_color)
 	// create an associative list to map color define to body part description
 	var/list/bodypart_list = list(
 		FEATURE_UNATHI_COLOR_BODY1 = "body",