[TM ONLY] Jobcode Sanity Check + Ananasi

_maps/map_files/Vampire/special_fran/special_francisco.dmm

@@ -3488,8 +3488,8 @@
 /obj/structure/vampdoor/prison{
 	dir = 8
 	},
-/obj/effect/mapping_helpers/door/access/voivodate_master,
 /obj/effect/mapping_helpers/door/lock,
+/obj/effect/mapping_helpers/door/access/voivodate/master,
 /turf/open/floor/city/plating_mono,
 /area/vtm/interior/voivodate/sanctum)
 "cbT" = (
@@ -5290,8 +5290,8 @@
 /obj/structure/vampdoor/reinf{
 	dir = 8
 	},
-/obj/effect/mapping_helpers/door/access/voivodate_master,
 /obj/effect/mapping_helpers/door/lock,
+/obj/effect/mapping_helpers/door/access/voivodate/advanced,
 /turf/open/floor/plating/stone,
 /area/vtm/interior/voivodate/sanctum)
 "daK" = (
@@ -12311,8 +12311,8 @@
 /area/vtm/interior/ghetto)
 "heH" = (
 /obj/structure/vampdoor/reinf,
-/obj/effect/mapping_helpers/door/access/voivodate_master,
 /obj/effect/mapping_helpers/door/lock,
+/obj/effect/mapping_helpers/door/access/voivodate/master,
 /turf/open/floor/wood/smooth,
 /area/vtm/interior/voivodate)
 "heM" = (
@@ -13091,6 +13091,17 @@
 /obj/effect/turf_decal/bordur,
 /turf/open/floor/plating/sidewalk/old,
 /area/vtm/interior/hotel)
+"hEY" = (
+/obj/effect/turf_decal/bordur{
+	dir = 1
+	},
+/obj/structure/vampdoor/reinf{
+	dir = 8
+	},
+/obj/effect/mapping_helpers/door/lock,
+/obj/effect/mapping_helpers/door/access/voivodate,
+/turf/open/floor/city/plating_mono,
+/area/vtm/interior/voivodate/sanctum)
 "hFd" = (
 /obj/effect/turf_decal/trimline/yellow/filled/warning{
 	dir = 8
@@ -13247,8 +13258,8 @@
 /obj/structure/vampdoor/reinf{
 	dir = 8
 	},
-/obj/effect/mapping_helpers/door/access/voivodate_master,
 /obj/effect/mapping_helpers/door/lock,
+/obj/effect/mapping_helpers/door/access/voivodate/advanced,
 /turf/open/floor/plating/sidewalk/old,
 /area/vtm/interior/voivodate/sanctum)
 "hJu" = (
@@ -14798,8 +14809,8 @@
 /obj/structure/vampdoor/reinf{
 	dir = 8
 	},
-/obj/effect/mapping_helpers/door/access/voivodate_master,
 /obj/effect/mapping_helpers/door/lock,
+/obj/effect/mapping_helpers/door/access/voivodate/advanced,
 /turf/open/floor/city/plating_mono,
 /area/vtm/interior/voivodate/sanctum)
 "izL" = (
@@ -15283,6 +15294,15 @@
 /obj/structure/coclock,
 /turf/open/floor/city/plating,
 /area/vtm/interior/museum)
+"iSq" = (
+/obj/effect/turf_decal/bordur,
+/obj/structure/vampdoor/reinf{
+	dir = 8
+	},
+/obj/effect/mapping_helpers/door/lock,
+/obj/effect/mapping_helpers/door/access/voivodate,
+/turf/open/floor/city/plating_mono,
+/area/vtm/interior/voivodate/sanctum)
 "iSP" = (
 /obj/effect/turf_decal/siding/white/corner{
 	color = "#570090"
@@ -16852,8 +16872,8 @@
 /area/vtm/interior/gang)
 "jNQ" = (
 /obj/structure/vampdoor/prison,
-/obj/effect/mapping_helpers/door/access/voivodate_master,
 /obj/effect/mapping_helpers/door/lock,
+/obj/effect/mapping_helpers/door/access/voivodate/advanced,
 /turf/open/floor/city/plating_mono,
 /area/vtm/interior/voivodate/sanctum)
 "jNV" = (
@@ -21764,8 +21784,8 @@
 /area/vtm/interior/endron_facility/restricted)
 "mIw" = (
 /obj/structure/vampdoor/prison,
-/obj/effect/mapping_helpers/door/access/voivodate_master,
 /obj/effect/mapping_helpers/door/lock,
+/obj/effect/mapping_helpers/door/access/voivodate/advanced,
 /turf/open/floor/plating/stone,
 /area/vtm/interior/voivodate/sanctum)
 "mIC" = (
@@ -23899,8 +23919,8 @@
 	dir = 4
 	},
 /obj/structure/vampdoor/reinf,
-/obj/effect/mapping_helpers/door/access/voivodate_master,
 /obj/effect/mapping_helpers/door/lock,
+/obj/effect/mapping_helpers/door/access/voivodate,
 /turf/open/floor/city/plating_mono,
 /area/vtm/interior/voivodate/sanctum)
 "nXv" = (
@@ -25714,8 +25734,8 @@
 	dir = 1
 	},
 /obj/structure/vampdoor/oldwood,
-/obj/effect/mapping_helpers/door/access/voivodate_master,
 /obj/effect/mapping_helpers/door/lock,
+/obj/effect/mapping_helpers/door/access/voivodate,
 /turf/open/floor/city/plating_mono,
 /area/vtm/interior/voivodate)
 "oVN" = (
@@ -32709,8 +32729,8 @@
 	dir = 8
 	},
 /obj/structure/vampdoor/reinf,
-/obj/effect/mapping_helpers/door/access/voivodate_master,
 /obj/effect/mapping_helpers/door/lock,
+/obj/effect/mapping_helpers/door/access/voivodate,
 /turf/open/floor/city/plating_mono,
 /area/vtm/interior/voivodate/sanctum)
 "sPw" = (
@@ -37445,8 +37465,8 @@
 /obj/structure/vampdoor/reinf{
 	dir = 4
 	},
-/obj/effect/mapping_helpers/door/access/voivodate_master,
 /obj/effect/mapping_helpers/door/lock,
+/obj/effect/mapping_helpers/door/access/voivodate/advanced,
 /turf/open/floor/wood/smooth/old,
 /area/vtm/interior/voivodate)
 "vws" = (
@@ -38378,8 +38398,8 @@
 /obj/structure/vampdoor/prison{
 	dir = 8
 	},
-/obj/effect/mapping_helpers/door/access/voivodate_master,
 /obj/effect/mapping_helpers/door/lock,
+/obj/effect/mapping_helpers/door/access/voivodate/master,
 /turf/open/floor/city/plating_mono,
 /area/vtm/interior/voivodate/sanctum)
 "wcF" = (
@@ -38929,8 +38949,8 @@
 /obj/structure/vampdoor/reinf{
 	dir = 8
 	},
-/obj/effect/mapping_helpers/door/access/voivodate_master,
 /obj/effect/mapping_helpers/door/lock,
+/obj/effect/mapping_helpers/door/access/voivodate/advanced,
 /turf/open/floor/city/plating_mono,
 /area/vtm/interior/voivodate/sanctum)
 "wuR" = (
@@ -88852,8 +88872,8 @@ tBB
 tBB
 tBB
 tBB
-izK
-wuQ
+hEY
+iSq
 tBB
 tBB
 tBB

code/__DEFINES/jobs.dm

@@ -29,6 +29,8 @@
 #define JOB_UNAVAILABLE_KINDRED_CLAN 15
 #define JOB_UNAVAILABLE_FERA_TRIBE 16
 #define JOB_UNAVAILABLE_FERA_AUSPICE 17
+#define JOB_UNAVAILABLE_CLAN_SLOTS 18 // APOC EDIT START
+#define JOB_UNAVAILABLE_TRIBE_SLOTS 19 // APOC EDIT END
 
 // DARKPACK EDIT ADD END
 

code/__DEFINES/~darkpack/factions.dm

@@ -5,6 +5,7 @@
 #define FACTION_CAMARILLA "camarilla"
 #define FACTION_SABBAT "sabbat"
 #define FACTION_GIOVANNI "giovanni-faction"
+#define FACTION_VOIVODATE "seers-voivodate"
 
 // City faction
 #define FACTION_CITY "city"

code/__DEFINES/~darkpack/fera/fera.dm

@@ -16,6 +16,9 @@
 #define BREED_CORAX_HOMID "Corax Homid"
 #define BREED_CORVID "Corvid"
 
+#define BREED_ANANASI_HOMID "Ananasi Homid"
+#define BREED_ARACHNID "Arachnid"
+
 #define FEATURE_FERA_FUR_COLOR "fera_fur_color"
 #define FEATURE_FERA_HAIR(splat_id) "fera_hair" + splat_id
 #define FEATURE_FERA_BODY(splat_id) "fera_body" + splat_id
@@ -37,7 +40,15 @@ GLOBAL_ALIST_INIT(fera_fur_colors, alist(
 		"green" = "green",
 		"red" = "red",
 		"gray" = "gray",
-	)
+	),
+	SPLAT_ANANASI = list(
+		"black" = "black",
+		"blue" = "blue",
+		"red" = "red",
+		"white" = "white",
+		"ginger" = "ginger",
+		"brown" = "brown",
+	),
 ))
 
 #define STATUS_EFFECT_DELIRIUM /datum/status_effect/delirium

code/__DEFINES/~darkpack/fera/werewolf_tribe.dm

@@ -16,8 +16,18 @@
 #define TRIBE_STARGAZERS "Stargazers"
 #define TRIBE_BLACK_SPIRAL_DANCERS "Black Spiral Dancers"
 
+#define TRIBE_SECEAN "Secean"
+#define TRIBE_PLICARE "Plicare"
+#define TRIBE_GADERIN "Gaderin"
+#define TRIBE_AGERE "Agere"
+#define TRIBE_ANOMIA "Anomia"
+#define TRIBE_MALUM "Malum"
+#define TRIBE_KAR "Kar"
+#define TRIBE_AMARI_ALIQUID "Amari Aliquid"
+#define TRIBE_CHYMOS "Chymos"
+
 #define TRIBE_LIST_ALL list(TRIBE_RONIN, TRIBE_GALESTALKERS, TRIBE_CHILDREN_OF_GAIA, TRIBE_UKTENA, TRIBE_FIANNA, TRIBE_GET_OF_FENRIS, TRIBE_BLACK_FURIES, TRIBE_SILVER_FANGS, TRIBE_SILENT_STRIDERS, TRIBE_RED_TALONS, TRIBE_STARGAZERS, TRIBE_GLASS_WALKERS, TRIBE_BONE_GNAWERS, TRIBE_SHADOW_LORDS, TRIBE_BLACK_SPIRAL_DANCERS)
 #define TRIBE_LIST_GAIA list(TRIBE_GALESTALKERS, TRIBE_CHILDREN_OF_GAIA, TRIBE_UKTENA, TRIBE_FIANNA, TRIBE_GET_OF_FENRIS, TRIBE_BLACK_FURIES, TRIBE_SILVER_FANGS, TRIBE_SILENT_STRIDERS, TRIBE_RED_TALONS, TRIBE_STARGAZERS, TRIBE_GLASS_WALKERS, TRIBE_BONE_GNAWERS, TRIBE_SHADOW_LORDS)
-#define TRIBE_LIST_WYLD list(TRIBE_GALESTALKERS, TRIBE_CHILDREN_OF_GAIA, TRIBE_UKTENA, TRIBE_FIANNA, TRIBE_GET_OF_FENRIS, TRIBE_BLACK_FURIES, TRIBE_SILVER_FANGS, TRIBE_SILENT_STRIDERS, TRIBE_RED_TALONS, TRIBE_STARGAZERS, TRIBE_SHADOW_LORDS)
-#define TRIBE_LIST_WEAVER list(TRIBE_GLASS_WALKERS, TRIBE_BONE_GNAWERS)
-#define TRIBE_LIST_WYRM list(TRIBE_BLACK_SPIRAL_DANCERS)
+#define TRIBE_LIST_WYLD list(TRIBE_GALESTALKERS, TRIBE_CHILDREN_OF_GAIA, TRIBE_UKTENA, TRIBE_FIANNA, TRIBE_GET_OF_FENRIS, TRIBE_BLACK_FURIES, TRIBE_SILVER_FANGS, TRIBE_SILENT_STRIDERS, TRIBE_RED_TALONS, TRIBE_STARGAZERS, TRIBE_SHADOW_LORDS, TRIBE_KAR, TRIBE_AMARI_ALIQUID, TRIBE_CHYMOS)
+#define TRIBE_LIST_WEAVER list(TRIBE_GLASS_WALKERS, TRIBE_BONE_GNAWERS, TRIBE_SECEAN, TRIBE_PLICARE, TRIBE_GADERIN)
+#define TRIBE_LIST_WYRM list(TRIBE_BLACK_SPIRAL_DANCERS, TRIBE_AGERE, TRIBE_ANOMIA, TRIBE_MALUM)

code/__DEFINES/~darkpack/jobs.dm

@@ -26,16 +26,17 @@
 #define JOB_TOWERWORK "Tower Employee"
 
 //Primogens
-#define JOB_PRIMOGEN_TOREADOR "Primogen Toreador"
-#define JOB_PRIMOGEN_BANU_HAQIM "Primogen Banu Haqim"
-#define JOB_PRIMOGEN_LASOMBRA "Primogen Lasombra"
-#define JOB_PRIMOGEN_MALKAVIAN "Primogen Malkavian"
-#define JOB_PRIMOGEN_NOSFERATU "Primogen Nosferatu"
-#define JOB_PRIMOGEN_VENTRUE "Primogen Ventrue"
+#define JOB_PRIMOGEN_TOREADOR "Toreador Primogen"
+#define JOB_PRIMOGEN_BANU_HAQIM "Banu Haqim Primogen"
+#define JOB_PRIMOGEN_LASOMBRA "Lasombra Primogen"
+#define JOB_PRIMOGEN_MALKAVIAN "Malkavian Primogen"
+#define JOB_PRIMOGEN_NOSFERATU "Nosferatu Primogen"
+#define JOB_PRIMOGEN_VENTRUE "Ventrue Primogen"
+#define JOB_PRIMOGEN_DUSKBORN "Duskborn Primogen" // APOC EDIT CHANGE - JOBS
 
 //Anarch
 #define JOB_BARON "Baron"
-#define JOB_TAPSTER "The Anarchy Rose Employee" // APOC EDIT CHANGE - JOBS
+#define JOB_TAPSTER "Retinue" // APOC EDIT CHANGE - JOBS
 #define JOB_BRUISER "Bruiser"
 #define JOB_EMISSARY "Emissary"
 #define JOB_SWEEPER "Sweeper"
@@ -60,7 +61,7 @@
 #define JOB_FEDERAL_INVESTIGATOR "Federal Investigator"
 
 //Clinic
-#define JOB_CLINIC_DIRECTOR "Clinic Director"
+#define JOB_CLINIC_DIRECTOR "Senior Doctor"
 #define JOB_DOCTOR "Doctor"
 
 //Church
@@ -122,6 +123,7 @@
 #define JOB_DISPLAY_ORDER_NOSFERATU 10
 #define JOB_DISPLAY_ORDER_TOREADOR 11
 #define JOB_DISPLAY_ORDER_VENTRUE 12
+#define JOB_DISPLAY_ORDER_DUSKBORN 13
 
 #define JOB_DISPLAY_ORDER_CLINICS_DIRECTOR 1
 #define JOB_DISPLAY_ORDER_DOCTOR 2
@@ -136,10 +138,11 @@
 
 #define JOB_DISPLAY_ORDER_BARON 1
 #define JOB_DISPLAY_ORDER_EMISSARY 2
-#define JOB_DISPLAY_ORDER_SWEEPER 3
-#define JOB_DISPLAY_ORDER_BRUISER 4
-#define JOB_DISPLAY_ORDER_LIAISON 5
-#define JOB_DISPLAY_ORDER_TAPSTER 6
+#define JOB_DISPLAY_ORDER_REEVE 3
+#define JOB_DISPLAY_ORDER_SWEEPER 4
+#define JOB_DISPLAY_ORDER_BRUISER 5
+#define JOB_DISPLAY_ORDER_LIAISON 6
+#define JOB_DISPLAY_ORDER_TAPSTER 7
 
 #define JOB_DISPLAY_ORDER_REGENT 1
 #define JOB_DISPLAY_ORDER_ARCHIVIST 2

code/__DEFINES/~darkpack/lock_access_defines.dm

@@ -4,6 +4,8 @@
 #define LOCKACCESS_PRINCE "prince"
 #define LOCKACCESS_PRIMOGEN "primogen"
 
+#define LOCKACCESS_DUSKBORN_PRIMOGEN "duskborn"
+
 #define LOCKACCESS_BANU "banuhaqim"
 #define LOCKACCESS_BANU_PRIMOGEN "primBanu"
 

code/__DEFINES/~darkpack/signals_kindred.dm

@@ -1,10 +1,11 @@
 // This is the new signals file for every signal vampire related in WOD13
 // New signals related to vampires and things vampires do should be defined here
 
-///called in bloodsucking.dm at the end of /mob/living/carbon/human/proc/drinksomeblood
+// WAS called in bloodsucking.dm at the end of /mob/living/carbon/human/proc/drinksomeblood, now
+// handled by a trait check. this could still be useful for other things though so keeping this
 #define COMSIG_MOB_VAMPIRE_SUCKED "mob_vampire_sucked"
 	///vampire suck resisted
-	#define COMPONENT_RESIST_VAMPIRE_KISS (1<<0)
+	// #define COMPONENT_RESIST_VAMPIRE_KISS (1<<0)
 
 ///baali demons have touched the target, time to apply the effect from daimonion 4
 #define COMSIG_BAALI_DEMON_REACHED_TARGET "baali_demon_reached_target"

code/__DEFINES/~darkpack/splats.dm

@@ -9,7 +9,8 @@
 //#define SPLAT_FERA "splat_fera"
 #define SPLAT_GAROU "splat_garou"
 #define SPLAT_CORAX "splat_corax"
-#define SPLAT_SHIFTERS list(SPLAT_GAROU, SPLAT_CORAX)
+#define SPLAT_ANANASI "splat_ananasi"
+#define SPLAT_SHIFTERS list(SPLAT_GAROU, SPLAT_CORAX, SPLAT_ANANASI)
 
 #define SPLAT_PRIO_HALFSPLAT 100
 #define SPLAT_PRIO_SPLAT 200

code/__DEFINES/~darkpack/traits/declarations.dm

@@ -109,6 +109,8 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 #define TRAIT_SCARRING_RESISTANT "scarring_resistant"// Temporal scars wont save
 /// Stepping on glass shards immunity. Currently used for a couple Garou forms but could be used elsewhere.
 #define TRAIT_HARDENED_SOLES "hardened_soles"
+// Splats that resist the affects of The Kiss
+#define TRAIT_RESISTS_KISS "resists_kiss"
 
 #define TRAIT_IN_FRENZY "in_frenzy"
 
@@ -165,6 +167,14 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 #define TRAIT_JAMMING_WEAPONS "jamming_weapons"
 #define TRAIT_NATURAL "natural"
 #define TRAIT_AURA_OF_CONFIDENCE "aura_of_confidence"
+// Fera with no passive healing
+#define TRAIT_NO_PASSIVE_HEALING "no_passive_healing"
+// Wyrmling Kinship gift, per Changing Breeds - Ananasi Gifts - Hatar
+#define TRAIT_WYRMLING_KINSHIP "wyrmling_kinship"
+// Prevents bloodying, made for Groom gift, per Changing Breeds - Ananasi Gifts - Tenere
+#define TRAIT_ALWAYS_CLEAN "always_clean"
+// Blood Of Pain gift, per Changing Breeds - Ananasi Gifts - Hatar
+#define TRAIT_BLOOD_OF_PAIN "blood_of_pain"
 
 /// Mob has had atleast one tooth yanked out while having no method of regenerating it.
 #define TRAIT_TOOTH_PULLED "tooth_pulled"

code/__DEFINES/~darkpack/traits/sources.dm

@@ -5,6 +5,9 @@
 
 #define GIFT_TRAIT "gift"
 
+/// Trait given by a fera's Tribe
+#define TRIBE_TRAIT "tribe"
+
 #define STAKE_TRAIT "stake"
 #define DAMAGE_TRAIT "damage"