diff --git a/code/datums/outfits/ert/biesel.dm b/code/datums/outfits/ert/biesel.dm index 533f8b03026..a53722682f9 100644 --- a/code/datums/outfits/ert/biesel.dm +++ b/code/datums/outfits/ert/biesel.dm @@ -28,7 +28,8 @@ SPECIES_TAJARA_MSAI = /obj/item/clothing/shoes/jackboots/toeless, SPECIES_TAJARA_ZHAN = /obj/item/clothing/shoes/jackboots/toeless, SPECIES_VAURCA_WORKER = /obj/item/clothing/shoes/vaurca, - SPECIES_VAURCA_WARRIOR =/obj/item/clothing/shoes/vaurca + SPECIES_VAURCA_WARRIOR =/obj/item/clothing/shoes/vaurca, + SPECIES_VAURCA_ATTENDANT =/obj/item/clothing/shoes/vaurca ) id_iff = IFF_TCFL @@ -64,6 +65,7 @@ SPECIES_TAJARA_MSAI = /obj/item/clothing/gloves/latex/nitrile/tajara, SPECIES_TAJARA_ZHAN = /obj/item/clothing/gloves/latex/nitrile/tajara, SPECIES_VAURCA_WARRIOR = /obj/item/clothing/gloves/latex/nitrile/vaurca, + SPECIES_VAURCA_ATTENDANT = /obj/item/clothing/gloves/latex/nitrile/vaurca, SPECIES_VAURCA_WORKER = /obj/item/clothing/gloves/latex/nitrile/vaurca, ) @@ -100,6 +102,7 @@ SPECIES_TAJARA_MSAI = /obj/item/clothing/gloves/yellow/specialt, SPECIES_TAJARA_ZHAN = /obj/item/clothing/gloves/yellow/specialt, SPECIES_VAURCA_WARRIOR = null, + SPECIES_VAURCA_ATTENDANT = null, SPECIES_VAURCA_WORKER = null ) accessory = /obj/item/clothing/accessory/storage/brown_vest diff --git a/code/datums/outfits/ert/qukala.dm b/code/datums/outfits/ert/qukala.dm index 1db5971cf7a..31e762c3ec8 100644 --- a/code/datums/outfits/ert/qukala.dm +++ b/code/datums/outfits/ert/qukala.dm @@ -18,16 +18,19 @@ species_suit = list( //bugs and trees can't use the skroidsuits SPECIES_VAURCA_WORKER = /obj/item/clothing/suit/storage/vest/kala, SPECIES_VAURCA_WARRIOR = /obj/item/clothing/suit/storage/vest/kala, + SPECIES_VAURCA_ATTENDANT = /obj/item/clothing/suit/storage/vest/kala, SPECIES_DIONA = /obj/item/clothing/suit/storage/vest/kala ) species_head = list( //until we get non-skrell kala helmets SPECIES_VAURCA_WORKER = /obj/item/clothing/head/helmet/tactical, SPECIES_VAURCA_WARRIOR = /obj/item/clothing/head/helmet/tactical, + SPECIES_VAURCA_ATTENDANT = /obj/item/clothing/head/helmet/tactical, SPECIES_DIONA = /obj/item/clothing/head/helmet/tactical ) species_shoes = list( SPECIES_VAURCA_WORKER = /obj/item/clothing/shoes/vaurca, SPECIES_VAURCA_WARRIOR = /obj/item/clothing/shoes/vaurca, + SPECIES_VAURCA_ATTENDANT = /obj/item/clothing/shoes/vaurca, SPECIES_DIONA = null ) belt_contents = list( @@ -71,6 +74,7 @@ gloves = /obj/item/clothing/gloves/latex/nitrile species_gloves = list( SPECIES_VAURCA_WARRIOR = /obj/item/clothing/gloves/latex/nitrile/vaurca, + SPECIES_VAURCA_ATTENDANT = /obj/item/clothing/gloves/latex/nitrile/vaurca, SPECIES_VAURCA_WORKER = /obj/item/clothing/gloves/latex/nitrile/vaurca, SPECIES_DIONA = null ) @@ -107,6 +111,7 @@ belt = /obj/item/storage/belt/utility/very_full glasses = /obj/item/clothing/glasses/welding/superior species_gloves = list( + SPECIES_VAURCA_ATTENDANT = null, SPECIES_VAURCA_WARRIOR = null, SPECIES_VAURCA_WORKER = null, SPECIES_DIONA = null diff --git a/code/datums/outfits/event/outfit_generic/_generic.dm b/code/datums/outfits/event/outfit_generic/_generic.dm index 02cd199c935..b4e40a01a96 100644 --- a/code/datums/outfits/event/outfit_generic/_generic.dm +++ b/code/datums/outfits/event/outfit_generic/_generic.dm @@ -62,7 +62,8 @@ SPECIES_TAJARA_MSAI = /obj/item/clothing/shoes/workboots/toeless, SPECIES_TAJARA_ZHAN = /obj/item/clothing/shoes/workboots/toeless, SPECIES_VAURCA_WORKER = /obj/item/clothing/shoes/workboots/toeless, - SPECIES_VAURCA_WARRIOR = /obj/item/clothing/shoes/vaurca + SPECIES_VAURCA_WARRIOR = /obj/item/clothing/shoes/vaurca, + SPECIES_VAURCA_ATTENDANT = /obj/item/clothing/shoes/vaurca ) /obj/outfit/admin/generic/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) diff --git a/code/datums/outfits/event/outfit_generic/security.dm b/code/datums/outfits/event/outfit_generic/security.dm index 6744ebf85a3..690a596a88a 100644 --- a/code/datums/outfits/event/outfit_generic/security.dm +++ b/code/datums/outfits/event/outfit_generic/security.dm @@ -42,5 +42,6 @@ SPECIES_TAJARA_MSAI = /obj/item/clothing/shoes/jackboots/toeless, SPECIES_TAJARA_ZHAN = /obj/item/clothing/shoes/jackboots/toeless, SPECIES_VAURCA_WORKER = /obj/item/clothing/shoes/jackboots/toeless, - SPECIES_VAURCA_WARRIOR = /obj/item/clothing/shoes/vaurca + SPECIES_VAURCA_WARRIOR = /obj/item/clothing/shoes/vaurca, + SPECIES_VAURCA_ATTENDANT = /obj/item/clothing/shoes/vaurca ) diff --git a/code/game/jobs/faction/hephaestus.dm b/code/game/jobs/faction/hephaestus.dm index ff59d508edd..f807cfb7c8e 100644 --- a/code/game/jobs/faction/hephaestus.dm +++ b/code/game/jobs/faction/hephaestus.dm @@ -33,6 +33,7 @@ "Corporate Liaison" = list( SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, + SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER ) diff --git a/code/game/jobs/faction/idris.dm b/code/game/jobs/faction/idris.dm index 010e2768e4b..e90d7cffdf2 100644 --- a/code/game/jobs/faction/idris.dm +++ b/code/game/jobs/faction/idris.dm @@ -39,6 +39,7 @@ SPECIES_UNATHI, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, + SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER ) diff --git a/code/game/jobs/faction/nanotrasen.dm b/code/game/jobs/faction/nanotrasen.dm index d3dd88047d8..b23da78115f 100644 --- a/code/game/jobs/faction/nanotrasen.dm +++ b/code/game/jobs/faction/nanotrasen.dm @@ -19,6 +19,7 @@ SPECIES_DIONA_COEUS, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, + SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER, SPECIES_TAJARA_ZHAN, diff --git a/code/game/jobs/faction/orion_express.dm b/code/game/jobs/faction/orion_express.dm index a47497674fa..d7e36ea4198 100644 --- a/code/game/jobs/faction/orion_express.dm +++ b/code/game/jobs/faction/orion_express.dm @@ -31,6 +31,7 @@ "Corporate Liaison" = list( SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, + SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER ) diff --git a/code/game/jobs/faction/pmc.dm b/code/game/jobs/faction/pmc.dm index 8a0b605531b..3f9b77c2564 100644 --- a/code/game/jobs/faction/pmc.dm +++ b/code/game/jobs/faction/pmc.dm @@ -30,7 +30,8 @@ SPECIES_DIONA, SPECIES_DIONA_COEUS, SPECIES_VAURCA_WORKER, - SPECIES_VAURCA_WARRIOR + SPECIES_VAURCA_WARRIOR, + SPECIES_VAURCA_ATTENDANT ) ) diff --git a/code/game/jobs/faction/scc.dm b/code/game/jobs/faction/scc.dm index ba2f88aefc7..45c6292ac77 100644 --- a/code/game/jobs/faction/scc.dm +++ b/code/game/jobs/faction/scc.dm @@ -32,6 +32,7 @@ SPECIES_DIONA_COEUS, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, + SPECIES_VAURCA_ATTENDANT, SPECIES_UNATHI, SPECIES_IPC, SPECIES_IPC_G1, diff --git a/code/game/jobs/faction/zavodskoi.dm b/code/game/jobs/faction/zavodskoi.dm index 6f76a81a029..80fb1f63bd9 100644 --- a/code/game/jobs/faction/zavodskoi.dm +++ b/code/game/jobs/faction/zavodskoi.dm @@ -41,6 +41,7 @@ SPECIES_DIONA_COEUS, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, + SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BREEDER, SPECIES_VAURCA_BULWARK ) diff --git a/code/game/jobs/faction/zeng_hu.dm b/code/game/jobs/faction/zeng_hu.dm index 3287b3a5d03..00e7aa7b5c2 100644 --- a/code/game/jobs/faction/zeng_hu.dm +++ b/code/game/jobs/faction/zeng_hu.dm @@ -35,6 +35,7 @@ SPECIES_TAJARA_ZHAN, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, + SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER ) diff --git a/code/game/jobs/job/captain.dm b/code/game/jobs/job/captain.dm index b74aa2786af..7678c6c0fc1 100644 --- a/code/game/jobs/job/captain.dm +++ b/code/game/jobs/job/captain.dm @@ -24,7 +24,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1) outfit = /obj/outfit/job/captain - blacklisted_species = list(SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_UNATHI, SPECIES_DIONA, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER, SPECIES_DIONA, SPECIES_DIONA_COEUS) + blacklisted_species = list(SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_UNATHI, SPECIES_DIONA, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER, SPECIES_DIONA, SPECIES_DIONA_COEUS) /obj/outfit/job/captain name = "Captain" @@ -108,7 +108,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1) ACCESS_CREMATORIUM, ACCESS_KITCHEN, ACCESS_HYDROPONICS, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_MAILSORTING, ACCESS_JANITOR, ACCESS_HOP, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_WEAPONS, ACCESS_JOURNALIST, ACCESS_BRIDGE_CREW, ACCESS_INTREPID, ACCESS_TELEPORTER) - blacklisted_species = list(SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER) + blacklisted_species = list(SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER) /obj/outfit/job/xo name = "Executive Officer" @@ -160,7 +160,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1) access = list(ACCESS_EVA, ACCESS_HEADS, ACCESS_MAINT_TUNNELS, ACCESS_WEAPONS, ACCESS_BRIDGE_CREW, ACCESS_INTREPID, ACCESS_TELEPORTER, ACCESS_EXTERNAL_AIRLOCKS) minimal_access = list(ACCESS_HEADS, ACCESS_EVA, ACCESS_GATEWAY, ACCESS_WEAPONS, ACCESS_BRIDGE_CREW, ACCESS_INTREPID, ACCESS_TELEPORTER, ACCESS_EXTERNAL_AIRLOCKS) - blacklisted_species = list(SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER) + blacklisted_species = list(SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER) /obj/outfit/job/bridge_crew name = "Bridge Crew" diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/civilian.dm index e19d0274286..c207ec51cb8 100644 --- a/code/game/jobs/job/civilian.dm +++ b/code/game/jobs/job/civilian.dm @@ -360,7 +360,7 @@ outfit = /obj/outfit/job/operations_manager - blacklisted_species = list(SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER) + blacklisted_species = list(SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER) /obj/outfit/job/operations_manager name = "Operations Manager" diff --git a/code/game/jobs/job/engineering.dm b/code/game/jobs/job/engineering.dm index 7ca6679b95c..664f9ecee19 100644 --- a/code/game/jobs/job/engineering.dm +++ b/code/game/jobs/job/engineering.dm @@ -30,7 +30,7 @@ minimal_player_age = 7 outfit = /obj/outfit/job/chief_engineer - blacklisted_species = list(SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER) + blacklisted_species = list(SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER) /obj/outfit/job/chief_engineer name = "Chief Engineer" diff --git a/code/game/jobs/job/event.dm b/code/game/jobs/job/event.dm index ef8a2fb13f4..09ee1ce9862 100644 --- a/code/game/jobs/job/event.dm +++ b/code/game/jobs/job/event.dm @@ -80,6 +80,7 @@ SPECIES_TAJARA_MSAI = /obj/item/clothing/gloves/latex/nitrile/tajara, SPECIES_TAJARA_ZHAN = /obj/item/clothing/gloves/latex/nitrile/tajara, SPECIES_VAURCA_WARRIOR = /obj/item/clothing/gloves/latex/nitrile/vaurca, + SPECIES_VAURCA_ATTENDANT = /obj/item/clothing/gloves/latex/nitrile/vaurca, SPECIES_VAURCA_WORKER = /obj/item/clothing/gloves/latex/nitrile/vaurca ) @@ -117,6 +118,7 @@ SPECIES_TAJARA_MSAI = /obj/item/clothing/gloves/yellow/specialt, SPECIES_TAJARA_ZHAN = /obj/item/clothing/gloves/yellow/specialt, SPECIES_VAURCA_WARRIOR = null, + SPECIES_VAURCA_ATTENDANT = null, SPECIES_VAURCA_WORKER = null, SPECIES_VAURCA_BULWARK = null ) diff --git a/code/game/jobs/job/hra.dm b/code/game/jobs/job/hra.dm index 81c68a89010..ddc9b50dd2c 100644 --- a/code/game/jobs/job/hra.dm +++ b/code/game/jobs/job/hra.dm @@ -19,7 +19,7 @@ ACCESS_CONSTRUCTION, ACCESS_RESEARCH, ACCESS_GATEWAY, ACCESS_WEAPONS, ACCESS_BRIDGE_CREW, ACCESS_INTREPID, ACCESS_CENT_CCIA) outfit = /obj/outfit/job/hra - blacklisted_species = list(SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_UNATHI, SPECIES_DIONA, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER, SPECIES_DIONA, SPECIES_DIONA_COEUS) + blacklisted_species = list(SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_UNATHI, SPECIES_DIONA, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER, SPECIES_DIONA, SPECIES_DIONA_COEUS) /obj/outfit/job/hra diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm index a33f2eb1b98..3fca603208b 100644 --- a/code/game/jobs/job/medical.dm +++ b/code/game/jobs/job/medical.dm @@ -29,7 +29,7 @@ minimal_player_age = 10 outfit = /obj/outfit/job/cmo - blacklisted_species = list(SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER) + blacklisted_species = list(SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER) /obj/outfit/job/cmo name = "Chief Medical Officer" diff --git a/code/game/jobs/job/science.dm b/code/game/jobs/job/science.dm index 80060718bd8..0c1dce2ab79 100644 --- a/code/game/jobs/job/science.dm +++ b/code/game/jobs/job/science.dm @@ -32,7 +32,7 @@ minimal_player_age = 14 outfit = /obj/outfit/job/rd - blacklisted_species = list(SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_VAURCA_BREEDER, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK) + blacklisted_species = list(SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_VAURCA_BREEDER, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK) /obj/outfit/job/rd name = "Research Director" diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm index e115f72d31a..44f9fc93f3b 100644 --- a/code/game/jobs/job/security.dm +++ b/code/game/jobs/job/security.dm @@ -32,7 +32,7 @@ minimal_player_age = 14 outfit = /obj/outfit/job/hos - blacklisted_species = list(SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA_ZHAN, SPECIES_DIONA, SPECIES_DIONA_COEUS, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER) + blacklisted_species = list(SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA_ZHAN, SPECIES_DIONA, SPECIES_DIONA_COEUS, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER) /obj/outfit/job/hos name = "Head of Security" diff --git a/code/game/machinery/body_scanner.dm b/code/game/machinery/body_scanner.dm index b183c51f521..060601a0b08 100644 --- a/code/game/machinery/body_scanner.dm +++ b/code/game/machinery/body_scanner.dm @@ -36,6 +36,7 @@ SPECIES_TAJARA_ZHAN, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, + SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BREEDER, SPECIES_VAURCA_BULWARK, SPECIES_DIONA, diff --git a/code/modules/background/citizenship/dionae.dm b/code/modules/background/citizenship/dionae.dm index 56115ab02e7..0ebf13b39cd 100644 --- a/code/modules/background/citizenship/dionae.dm +++ b/code/modules/background/citizenship/dionae.dm @@ -22,6 +22,7 @@ SPECIES_UNATHI, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, + SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK ), "Diplomatic Aide" = list( @@ -41,6 +42,7 @@ SPECIES_UNATHI, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, + SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK ) ) @@ -76,6 +78,7 @@ SPECIES_UNATHI, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, + SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK ), "Diplomatic Aide" = list( @@ -96,6 +99,7 @@ SPECIES_UNATHI, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, + SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK ) ) @@ -131,6 +135,7 @@ SPECIES_UNATHI, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, + SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK ), "Diplomatic Aide" = list( @@ -151,6 +156,7 @@ SPECIES_UNATHI, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, + SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK ) ) diff --git a/code/modules/background/citizenship/human.dm b/code/modules/background/citizenship/human.dm index 460d7d23bbc..029bbdea6ac 100644 --- a/code/modules/background/citizenship/human.dm +++ b/code/modules/background/citizenship/human.dm @@ -11,6 +11,7 @@ "Consular Officer" = list( SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, + SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK ), "Diplomatic Aide" = list( @@ -114,6 +115,7 @@ SPECIES_UNATHI, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, + SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER ), @@ -136,6 +138,7 @@ SPECIES_UNATHI, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, + SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER ) @@ -202,6 +205,7 @@ SPECIES_UNATHI, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, + SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER ), @@ -212,6 +216,7 @@ SPECIES_UNATHI, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, + SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER ) @@ -273,6 +278,7 @@ SPECIES_UNATHI, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, + SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER ) @@ -303,6 +309,7 @@ SPECIES_TAJARA_ZHAN, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, + SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER ), @@ -322,6 +329,7 @@ SPECIES_TAJARA_ZHAN, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, + SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER ) diff --git a/code/modules/background/citizenship/ipc.dm b/code/modules/background/citizenship/ipc.dm index 2e4aa8b54cd..c430d3c6775 100644 --- a/code/modules/background/citizenship/ipc.dm +++ b/code/modules/background/citizenship/ipc.dm @@ -26,6 +26,7 @@ SPECIES_UNATHI, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, + SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER ), @@ -42,6 +43,7 @@ SPECIES_UNATHI, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, + SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER ) diff --git a/code/modules/background/citizenship/skrell.dm b/code/modules/background/citizenship/skrell.dm index 0be3a2abc18..f293b04c427 100644 --- a/code/modules/background/citizenship/skrell.dm +++ b/code/modules/background/citizenship/skrell.dm @@ -28,6 +28,7 @@ SPECIES_UNATHI, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, + SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK ), "Diplomatic Aide" = list( diff --git a/code/modules/background/citizenship/tajara.dm b/code/modules/background/citizenship/tajara.dm index 49765a31a15..4f0dbfde70b 100644 --- a/code/modules/background/citizenship/tajara.dm +++ b/code/modules/background/citizenship/tajara.dm @@ -27,6 +27,7 @@ SPECIES_UNATHI, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, + SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER, SPECIES_TAJARA_ZHAN, @@ -50,6 +51,7 @@ SPECIES_UNATHI, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, + SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER, SPECIES_TAJARA_ZHAN @@ -118,6 +120,7 @@ SPECIES_UNATHI, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, + SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER, SPECIES_TAJARA_ZHAN, @@ -141,6 +144,7 @@ SPECIES_UNATHI, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, + SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER, SPECIES_TAJARA_ZHAN @@ -207,6 +211,7 @@ SPECIES_UNATHI, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, + SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER, SPECIES_TAJARA_ZHAN, @@ -230,6 +235,7 @@ SPECIES_UNATHI, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, + SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER, SPECIES_TAJARA_ZHAN diff --git a/code/modules/background/citizenship/unathi.dm b/code/modules/background/citizenship/unathi.dm index 69d0de8222d..b8e85b6601b 100644 --- a/code/modules/background/citizenship/unathi.dm +++ b/code/modules/background/citizenship/unathi.dm @@ -28,6 +28,7 @@ SPECIES_TAJARA_ZHAN, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, + SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK, ), "Diplomatic Aide" = list( diff --git a/code/modules/background/citizenship/vaurca.dm b/code/modules/background/citizenship/vaurca.dm index 884fe52427d..1a832aa59f0 100644 --- a/code/modules/background/citizenship/vaurca.dm +++ b/code/modules/background/citizenship/vaurca.dm @@ -30,6 +30,7 @@ SPECIES_UNATHI, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, + SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK ), "Diplomatic Aide" = ALL_SPECIES @@ -105,6 +106,7 @@ SPECIES_UNATHI, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, + SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK ), "Diplomatic Aide" = ALL_SPECIES @@ -177,6 +179,7 @@ SPECIES_UNATHI, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, + SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK ), "Diplomatic Aide" = ALL_SPECIES diff --git a/code/modules/client/preference_setup/loadout/items/augments.dm b/code/modules/client/preference_setup/loadout/items/augments.dm index 460bf0d21f9..182402f9f53 100644 --- a/code/modules/client/preference_setup/loadout/items/augments.dm +++ b/code/modules/client/preference_setup/loadout/items/augments.dm @@ -13,7 +13,7 @@ description = "An eye augment that allows the user to deploy medical or security sensors." path = /obj/item/organ/internal/augment/eye_sensors cost = 1 - whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI, SPECIES_UNATHI, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR) + whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI, SPECIES_UNATHI, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT) /datum/gear/augment/eye_sensors/New() ..() @@ -32,7 +32,7 @@ display_name = "synthetic vocal cords selection" description = "Vocal cords of synthetic nature packed into an augment kit. This allows users who are mute due to structural damage of the throat to speak. The advanced model allows use of normal accents, while the cheaper basic model will set your accent to text-to-speech." path = /obj/item/organ/internal/augment/synthetic_cords - whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER, SPECIES_UNATHI) + whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER, SPECIES_UNATHI) cost = 1 /datum/gear/augment/synthetic_cords/New() @@ -98,7 +98,7 @@ display_name = "cochlear implant" description = "A synthetic replacement for the structures within the ear, allowing the user to hear without requiring external tools." path = /obj/item/organ/internal/augment/cochlear - whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER, SPECIES_UNATHI) + whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER, SPECIES_UNATHI) cost = 1 /datum/gear/augment/analyzer @@ -132,7 +132,7 @@ display_name = "taste booster selection" description = "A selection of augments that modify the user's taste sensitivity." path = /obj/item/organ/internal/augment/taste_booster - whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER, SPECIES_UNATHI) + whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER, SPECIES_UNATHI) /datum/gear/augment/taste_boosters/New() ..() @@ -151,13 +151,13 @@ display_name = "psionic receiver" description = "An augment installed into the head that functions as a surrogate for a missing zona bovinae, also functioning as a filter for the psionically-challenged." path = /obj/item/organ/internal/augment/psi - whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI, SPECIES_UNATHI, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL) + whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI, SPECIES_UNATHI, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL) /datum/gear/augment/memory_inhibitor display_name = "memory inhibitor" description = "A Zeng Hu implant that allows one to have control over their memories, allowing you to set a timer and remove any memories developed within it." path = /obj/item/organ/internal/augment/memory_inhibitor - whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI) + whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI) faction = "Zeng-Hu Pharmaceuticals" allowed_roles = list("Physician", "Surgeon", "Chief Medical Officer", "Pharmacist", "Paramedic", "Psychiatrist", "Medical Intern", "Corporate Liaison", "Research Director","Scientist", "Xenobiologist", "Xenobotanist", "Xenoarchaeologist", "Lab Assistant", "Assistant", "Off-Duty Crew Member", "Corporate Reporter", "Captain", "Bridge Crew", "Medical Personnel", "Science Personnel") @@ -165,7 +165,7 @@ display_name = "emotional manipulator" description = "A Zeng Hu brain implant to manipulate the brain's chemicals to induce a calming or happy feeling." path = /obj/item/organ/internal/augment/emotional_manipulator - whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI) + whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI) faction = "Zeng-Hu Pharmaceuticals" allowed_roles = list("Physician", "Surgeon", "Chief Medical Officer", "Pharmacist", "Paramedic", "Psychiatrist", "Medical Intern", "Corporate Liaison", "Research Director","Scientist", "Xenobiologist", "Xenobotanist", "Xenoarchaeologist", "Lab Assistant", "Assistant", "Off-Duty Crew Member", "Corporate Reporter", "Captain", "Bridge Crew", "Medical Personnel", "Science Personnel") @@ -173,7 +173,7 @@ display_name = "vision enhanced retinas" description = "Zeng Hu implants given to EMTs to assist with finding the injured. These eye implants allow one to see further than you normally could." path = /obj/item/organ/internal/augment/enhanced_vision - whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL) + whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL) faction = "Zeng-Hu Pharmaceuticals" cost = 3 allowed_roles = list("Physician", "Surgeon", "Chief Medical Officer", "Pharmacist", "Paramedic", "Psychiatrist", "Medical Intern", "Corporate Liaison", "Research Director","Scientist", "Xenobiologist", "Xenobotanist", "Xenoarchaeologist", "Lab Assistant", "Assistant", "Off-Duty Crew Member", "Corporate Reporter", "Captain", "Bridge Crew", "Medical Personnel", "Science Personnel") @@ -182,7 +182,7 @@ display_name = "ocular installed sightlights" description = "Designed to assist Zeng-Hu medical personnel in darker areas or places experiencing periodic power issues, Sightlights will allow one to be able to use their eyes as a flashlight." path = /obj/item/organ/internal/augment/sightlights - whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL) + whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL) faction = "Zeng-Hu Pharmaceuticals" cost = 3 allowed_roles = list("Physician", "Surgeon", "Chief Medical Officer", "Pharmacist", "Paramedic", "Psychiatrist", "Medical Intern", "Corporate Liaison", "Research Director","Scientist", "Xenobiologist", "Xenobotanist", "Xenoarchaeologist", "Lab Assistant", "Assistant", "Off-Duty Crew Member", "Corporate Reporter", "Captain", "Bridge Crew", "Medical Personnel", "Science Personnel") @@ -191,7 +191,7 @@ display_name = "zeng-hu facial augment selection" description = "A clear sign of Zeng-Hu's best, this plate bearing the company's symbol is installed on those who prove themselves in the hyper-competitive environment." path = /obj/item/organ/internal/augment/eye_sensors/medical/zenghu_plate - whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL) + whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL) faction = "Zeng-Hu Pharmaceuticals" allowed_roles = list("Physician", "Surgeon", "Chief Medical Officer", "Pharmacist", "Paramedic", "Psychiatrist", "Medical Intern", "Corporate Liaison", "Research Director","Scientist", "Xenobiologist", "Xenobotanist", "Xenoarchaeologist", "Lab Assistant", "Assistant", "Off-Duty Crew Member", "Corporate Reporter", "Captain", "Bridge Crew", "Medical Personnel", "Science Personnel") @@ -227,28 +227,28 @@ description = "A fluff based augmentation that can be renamed/redescribed to appear as something else for RP purposes." path = /obj/item/organ/internal/augment/head_fluff flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION - whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER, SPECIES_UNATHI) + whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER, SPECIES_UNATHI) /datum/gear/augment/chest_fluff display_name = "custom chest augmentation" description = "A fluff based augmentation that can be renamed/redescribed to appear as something else for RP purposes." path = /obj/item/organ/internal/augment/head_fluff/chest_fluff flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION - whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER, SPECIES_UNATHI) + whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER, SPECIES_UNATHI) /datum/gear/augment/rhand_fluff display_name = "custom right hand augmentation" description = "A fluff based augmentation that can be renamed/redescribed to appear as something else for RP purposes." path = /obj/item/organ/internal/augment/head_fluff/rhand_fluff flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION - whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER, SPECIES_UNATHI) + whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER, SPECIES_UNATHI) /datum/gear/augment/lhand_fluff display_name = "custom left hand augmentation" description = "A fluff based augmentation that can be renamed/redescribed to appear as something else for RP purposes." path = /obj/item/organ/internal/augment/head_fluff/lhand_fluff flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION - whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER, SPECIES_UNATHI) + whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER, SPECIES_UNATHI) /datum/gear/augment/skrell_language display_name = "Zeng-Hu Nral'malic language processor" @@ -263,7 +263,7 @@ display_name = "phalanx facial plate" description = "This modular face plate accommodates a wide array of cybernetic augmentations, enabling seamless integration with Phalanx's transhumanist doctrine. Enhanced sensory overlays and HUDs offer Phalanx members superior situational awareness and promote a sense of hive-thinking." path = /obj/item/organ/internal/augment/eye_sensors/phalanx - whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_UNATHI) + whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK, SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_UNATHI) allowed_roles = list("Physician", "Surgeon", "Pharmacist", "Paramedic", "Psychiatrist", "Medical Intern", "Medical Personnel", "Security Officer", "Warden", "Security Cadet", "Investigator", "Security Personnel", "Corporate Liaison", "Assistant", "Off-Duty Crew Member", "Corporate Reporter", "Bridge Crew") faction = "Private Military Contracting Group" cost = 1 diff --git a/code/modules/client/preference_setup/loadout/items/xeno/skrell.dm b/code/modules/client/preference_setup/loadout/items/xeno/skrell.dm index 9da9eb4d77a..ae1dcc92f23 100644 --- a/code/modules/client/preference_setup/loadout/items/xeno/skrell.dm +++ b/code/modules/client/preference_setup/loadout/items/xeno/skrell.dm @@ -58,7 +58,7 @@ ABSTRACT_TYPE(/datum/gear/ears/skrell) /datum/gear/accessory/capes display_name = "shoulder capes" path = /obj/item/clothing/accessory/poncho/shouldercape - whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER) + whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER) sort_category = "Xenowear - Skrell" /datum/gear/accessory/capes/New() @@ -121,7 +121,7 @@ ABSTRACT_TYPE(/datum/gear/ears/skrell) /datum/gear/skrell_projector display_name = "nralakk projector" path = /obj/item/skrell_projector - whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER) + whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER) sort_category = "Xenowear - Skrell" /datum/gear/homeworld_deck @@ -199,7 +199,7 @@ ABSTRACT_TYPE(/datum/gear/ears/skrell) display_name = "nralakk federation passport" path = /obj/item/clothing/accessory/badge/passport/nralakk sort_category = "Xenowear - Skrell" - whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER) + whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER) flags = GEAR_NO_SELECTION cost = 1 @@ -217,14 +217,14 @@ ABSTRACT_TYPE(/datum/gear/ears/skrell) // the whitelisted list ensures only people with skrell, vaurca, or diona whitelists can reach this check /datum/gear/accessory/skrell_passport/check_species_whitelist(mob/living/carbon/human/H) - var/static/list/species_list = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_BREEDER, SPECIES_VAURCA_BULWARK, SPECIES_DIONA, SPECIES_DIONA_COEUS) + var/static/list/species_list = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_BREEDER, SPECIES_VAURCA_BULWARK, SPECIES_DIONA, SPECIES_DIONA_COEUS) if(H.species.name in species_list) return TRUE return FALSE /datum/gear/accessory/skrell_passport/spawn_item(location, metadata, mob/living/carbon/human/H) var/obj/item/clothing/accessory/badge/passport/nralakk/J = ..() - var/static/list/species_name_to_tag = list(SPECIES_SKRELL = "_s", SPECIES_SKRELL_AXIORI = "_s", SPECIES_VAURCA_WARRIOR = "_v", SPECIES_VAURCA_WORKER = "_v", SPECIES_VAURCA_BREEDER = "_v", SPECIES_VAURCA_BULWARK = "_v", SPECIES_DIONA = "_d", SPECIES_DIONA_COEUS = "_d") + var/static/list/species_name_to_tag = list(SPECIES_SKRELL = "_s", SPECIES_SKRELL_AXIORI = "_s", SPECIES_VAURCA_WARRIOR = "_v", SPECIES_VAURCA_ATTENDANT = "_v", SPECIES_VAURCA_WORKER = "_v", SPECIES_VAURCA_BREEDER = "_v", SPECIES_VAURCA_BULWARK = "_v", SPECIES_DIONA = "_d", SPECIES_DIONA_COEUS = "_d") var/tag = species_name_to_tag[H.species.name] if(tag) J.species_tag = tag @@ -269,7 +269,7 @@ var/datum/gear_tweak/social_credit/social_credit_tweak = new() /datum/gear/uniform/skrell/work display_name = "work uniforms" path = /obj/item/clothing/under/skrell/nralakk - whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_BREEDER, SPECIES_VAURCA_BULWARK, SPECIES_DIONA, SPECIES_DIONA_COEUS) + whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_BREEDER, SPECIES_VAURCA_BULWARK, SPECIES_DIONA, SPECIES_DIONA_COEUS) flags = GEAR_HAS_DESC_SELECTION /datum/gear/uniform/skrell/work/New() @@ -302,7 +302,7 @@ ABSTRACT_TYPE(/datum/gear/suit/skrell) /datum/gear/suit/skrell/jacket display_name = "work jackets" path = /obj/item/clothing/suit/storage/toggle/skrell - whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_BREEDER, SPECIES_VAURCA_BULWARK) + whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_BREEDER, SPECIES_VAURCA_BULWARK) sort_category = "Xenowear - Skrell" flags = GEAR_HAS_DESC_SELECTION @@ -336,14 +336,14 @@ ABSTRACT_TYPE(/datum/gear/accessory/skrell) /datum/gear/accessory/skrell/starcoat display_name = "star coat" path = /obj/item/clothing/suit/storage/toggle/skrell/starcoat - whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_BREEDER, SPECIES_VAURCA_BULWARK, SPECIES_DIONA, SPECIES_DIONA_COEUS) + whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_BREEDER, SPECIES_VAURCA_BULWARK, SPECIES_DIONA, SPECIES_DIONA_COEUS) sort_category = "Xenowear - Skrell" slot = slot_wear_suit /datum/gear/accessory/skrell/poncho display_name = "skrell poncho" path = /obj/item/clothing/accessory/poncho/skrell - whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_BREEDER, SPECIES_VAURCA_BULWARK) + whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_BREEDER, SPECIES_VAURCA_BULWARK) sort_category = "Xenowear - Skrell" flags = GEAR_HAS_DESC_SELECTION @@ -359,7 +359,7 @@ ABSTRACT_TYPE(/datum/gear/accessory/skrell) /datum/gear/accessory/skrell/workcloak display_name = "work cloaks" path = /obj/item/clothing/accessory/poncho/shouldercape - whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_BREEDER, SPECIES_VAURCA_BULWARK) + whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_BREEDER, SPECIES_VAURCA_BULWARK) sort_category = "Xenowear - Skrell" flags = GEAR_HAS_DESC_SELECTION @@ -375,7 +375,7 @@ ABSTRACT_TYPE(/datum/gear/accessory/skrell) /datum/gear/accessory/skrell/tees display_name = "skrellian wetshirts" path = /obj/item/clothing/accessory/tshirt/skrell - whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER) + whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER) sort_category = "Xenowear - Skrell" flags = GEAR_HAS_DESC_SELECTION @@ -396,7 +396,7 @@ ABSTRACT_TYPE(/datum/gear/accessory/skrell) /datum/gear/accessory/skrell/dress display_name = "skrellian formal wetshirts" path = /obj/item/clothing/accessory/dressshirt/skrell - whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER) + whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER) sort_category = "Xenowear - Skrell" flags = GEAR_HAS_DESC_SELECTION @@ -435,7 +435,7 @@ ABSTRACT_TYPE(/datum/gear/accessory/skrell) /datum/gear/accessory/skrell/nationcapes display_name = "nation capes" path = /obj/item/clothing/accessory/poncho/shouldercape/nationcapes - whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER, SPECIES_DIONA, SPECIES_DIONA_COEUS) + whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER, SPECIES_DIONA, SPECIES_DIONA_COEUS) sort_category = "Xenowear - Skrell" flags = GEAR_HAS_DESC_SELECTION diff --git a/code/modules/client/preference_setup/loadout/items/xeno/unathi.dm b/code/modules/client/preference_setup/loadout/items/xeno/unathi.dm index b5ea2524b2b..20634460517 100644 --- a/code/modules/client/preference_setup/loadout/items/xeno/unathi.dm +++ b/code/modules/client/preference_setup/loadout/items/xeno/unathi.dm @@ -4,7 +4,7 @@ regions of Moghes. The forest mantle is exclusively for nobility these days." path = /obj/item/clothing/accessory/poncho/unathimantle cost = 1 - whitelisted = list(SPECIES_UNATHI, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI) + whitelisted = list(SPECIES_UNATHI, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI) sort_category = "Xenowear - Unathi" flags = GEAR_HAS_COLOR_SELECTION @@ -62,7 +62,7 @@ display_name = "roughspun robe" path = /obj/item/clothing/suit/unathi/robe cost = 1 - whitelisted = list(SPECIES_UNATHI, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR) + whitelisted = list(SPECIES_UNATHI, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT) sort_category = "Xenowear - Unathi" flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION @@ -75,7 +75,7 @@ display_name = "tzirzi robe" path = /obj/item/clothing/suit/unathi/robe/robe_coat cost = 1 - whitelisted = list(SPECIES_UNATHI, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI) + whitelisted = list(SPECIES_UNATHI, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI) sort_category = "Xenowear - Unathi" /datum/gear/suit/robe_coat/New() @@ -155,7 +155,7 @@ /datum/gear/uniform/unathi display_name = "sinta tunic" path = /obj/item/clothing/under/unathi - whitelisted = list(SPECIES_UNATHI, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI) + whitelisted = list(SPECIES_UNATHI, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI) sort_category = "Xenowear - Unathi" flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION | GEAR_HAS_ACCENT_COLOR_SELECTION @@ -168,7 +168,7 @@ /datum/gear/head/sinta_ronin display_name = "straw hat" path = /obj/item/clothing/head/unathi - whitelisted = list(SPECIES_UNATHI, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK) + whitelisted = list(SPECIES_UNATHI, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK) sort_category = "Xenowear - Unathi" /datum/gear/head/sinta_ronin/New() @@ -189,7 +189,7 @@ /datum/gear/eyes/wasteland_goggles display_name = "wasteland goggles" path = /obj/item/clothing/glasses/safety/goggles/wasteland - whitelisted = list(SPECIES_UNATHI, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR) + whitelisted = list(SPECIES_UNATHI, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT) origin_restriction = list(/singleton/origin_item/origin/wastelander, /singleton/origin_item/origin/mikuetz) sort_category = "Xenowear - Unathi" @@ -286,7 +286,7 @@ /datum/gear/uniform/unathi/zazali display_name = "zazali garb" path = /obj/item/clothing/under/unathi/zazali - whitelisted = list(SPECIES_UNATHI, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI) + whitelisted = list(SPECIES_UNATHI, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI) sort_category = "Xenowear - Unathi" flags = GEAR_HAS_COLOR_SELECTION | GEAR_HAS_ACCENT_COLOR_SELECTION @@ -299,7 +299,7 @@ /datum/gear/uniform/unathi/zozo display_name = "zozo top" path = /obj/item/clothing/under/unathi/zozo - whitelisted = list(SPECIES_UNATHI, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI) + whitelisted = list(SPECIES_UNATHI, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI) sort_category = "Xenowear - Unathi" flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION @@ -424,7 +424,7 @@ display_name = "gyazo belt" path = /obj/item/clothing/accessory/unathi cost = 1 - whitelisted = list(SPECIES_UNATHI, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI) + whitelisted = list(SPECIES_UNATHI, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI) sort_category = "Xenowear - Unathi" flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION @@ -441,7 +441,7 @@ display_name = "hegemony passport" path = /obj/item/clothing/accessory/badge/passport/hegemony cost = 1 - whitelisted = list(SPECIES_UNATHI, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER, SPECIES_DIONA, SPECIES_DIONA_COEUS, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_HUMAN) + whitelisted = list(SPECIES_UNATHI, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER, SPECIES_DIONA, SPECIES_DIONA_COEUS, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_HUMAN) sort_category = "Xenowear - Unathi" flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION @@ -449,7 +449,7 @@ display_name = "hegemony passcard selection" path = /obj/item/clothing/accessory/badge/passcard/hegemony cost = 1 - whitelisted = list(SPECIES_UNATHI, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER, SPECIES_DIONA, SPECIES_DIONA_COEUS, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_HUMAN) + whitelisted = list(SPECIES_UNATHI, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER, SPECIES_DIONA, SPECIES_DIONA_COEUS, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_HUMAN) sort_category = "Xenowear - Unathi" flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION diff --git a/code/modules/client/preference_setup/loadout/items/xeno/vaurca.dm b/code/modules/client/preference_setup/loadout/items/xeno/vaurca.dm index 235630faff2..55b414bb6d6 100644 --- a/code/modules/client/preference_setup/loadout/items/xeno/vaurca.dm +++ b/code/modules/client/preference_setup/loadout/items/xeno/vaurca.dm @@ -2,7 +2,7 @@ display_name = "vaurca blindfold" path = /obj/item/clothing/glasses/sunglasses/blinders cost = 2 - whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK) + whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK) sort_category = "Xenowear - Vaurca" flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION @@ -10,7 +10,7 @@ display_name = "mandible garment" path = /obj/item/clothing/mask/gas/vaurca cost = 1 - whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK) + whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK) sort_category = "Xenowear - Vaurca" flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION @@ -18,7 +18,7 @@ display_name = "filter port" path = /obj/item/clothing/mask/gas/vaurca/filter cost = 1 - whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BREEDER, SPECIES_VAURCA_BULWARK) + whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BREEDER, SPECIES_VAURCA_BULWARK) sort_category = "Xenowear - Vaurca" /datum/gear/mask/expression @@ -26,7 +26,7 @@ path = /obj/item/clothing/head/expression cost = 1 slot = slot_head - whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR) + whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT) sort_category = "Xenowear - Vaurca" flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION @@ -41,7 +41,7 @@ /datum/gear/head/shaper display_name = "shaper helmet" path = /obj/item/clothing/head/shaper - whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK) + whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK) sort_category = "Xenowear - Vaurca" flags = GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION @@ -50,7 +50,7 @@ path = /obj/item/storage/backpack/cloak cost = 1 slot = slot_back - whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK) + whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK) sort_category = "Xenowear - Vaurca" flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION @@ -59,7 +59,7 @@ path = /obj/item/storage/backpack/cloak cost = 1 slot = slot_back - whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK) + whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK) sort_category = "Xenowear - Vaurca" flags = GEAR_HAS_DESC_SELECTION @@ -90,7 +90,7 @@ path = /obj/item/clothing/suit/vaurca cost = 1 slot = slot_wear_suit - whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK) + whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK) sort_category = "Xenowear - Vaurca" /datum/gear/vaurca_robe/New() @@ -105,7 +105,7 @@ /datum/gear/uniform/vaurca display_name = "vaurca clothes" path = /obj/item/clothing/under/vaurca - whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK) + whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK) sort_category = "Xenowear - Vaurca" flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION @@ -113,7 +113,7 @@ display_name = "vaurcan gear harness" description = "A selection of vaurca colored gear harnesses." path = /obj/item/clothing/under/vaurca/gearharness - whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR) + whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT) sort_category = "Xenowear - Vaurca" flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION @@ -129,7 +129,7 @@ display_name = "vaurcan gear harness (colorable)" description = "A tight-fitting gear harness designed for the Vaurcan form. Mass-produced from equally mass-produced materials." path = /obj/item/clothing/under/vaurca/gearharness/colorable - whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR) + whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT) sort_category = "Xenowear - Vaurca" flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION @@ -137,7 +137,7 @@ display_name = "shaper robes" path = /obj/item/clothing/suit/vaurca/shaper slot = slot_wear_suit - whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK) + whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK) sort_category = "Xenowear - Vaurca" cost = 1 flags = GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION @@ -145,7 +145,7 @@ /datum/gear/shoes/vaurca display_name = "vaurca shoes" path = /obj/item/clothing/shoes/vaurca - whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK) + whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK) sort_category = "Xenowear - Vaurca" flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION @@ -155,7 +155,7 @@ path = /obj/item/clothing/head/shroud cost = 1 slot = slot_head - whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK) + whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK) sort_category = "Xenowear - Vaurca" /datum/gear/suit/vaurca_shroud/New() @@ -174,7 +174,7 @@ path = /obj/item/clothing/head/shroud/colorable cost = 1 slot = slot_head - whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR) + whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT) sort_category = "Xenowear - Vaurca" flags = GEAR_HAS_COLOR_SELECTION @@ -182,7 +182,7 @@ display_name = "vaurcan mantle" path = /obj/item/clothing/accessory/poncho/vaurca cost = 1 - whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR) + whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT) sort_category = "Xenowear - Vaurca" flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION | GEAR_HAS_ACCENT_COLOR_SELECTION @@ -192,7 +192,7 @@ path = /obj/item/organ/internal/augment/language/mikuetz cost = 1 sort_category = "Xenowear - Vaurca" - whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BREEDER, SPECIES_VAURCA_BULWARK) + whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BREEDER, SPECIES_VAURCA_BULWARK) flags = GEAR_NO_SELECTION origin_restriction = list(/singleton/origin_item/origin/queenless_zora, /singleton/origin_item/origin/queenless_klax, /singleton/origin_item/origin/klatxatl, /singleton/origin_item/origin/mikuetz, /singleton/origin_item/origin/cthur, /singleton/origin_item/origin/mouv, /singleton/origin_item/origin/vytel, /singleton/origin_item/origin/xetl, /singleton/origin_item/origin/cthur_b, /singleton/origin_item/origin/mouv_b, /singleton/origin_item/origin/vytel_b) @@ -210,7 +210,7 @@ cost = 2 path = /obj/item/storage/toolbox/lunchbox sort_category = "Xenowear - Vaurca" - whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BREEDER, SPECIES_VAURCA_BULWARK) + whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BREEDER, SPECIES_VAURCA_BULWARK) /datum/gear/vaurca_lunchbox/New() ..() @@ -229,7 +229,7 @@ cost = 1 path = /obj/item/storage/box/fancy/mre/menu12 sort_category = "Xenowear - Vaurca" - whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BREEDER, SPECIES_VAURCA_BULWARK) + whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BREEDER, SPECIES_VAURCA_BULWARK) flags = GEAR_NO_SELECTION ABSTRACT_TYPE(/datum/gear/ears/vaurca) @@ -249,7 +249,7 @@ ABSTRACT_TYPE(/datum/gear/ears/vaurca) cost = 2 path = /obj/item/skrell_projector/vaurca_projector sort_category = "Xenowear - Vaurca" - whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BREEDER, SPECIES_VAURCA_BULWARK) + whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BREEDER, SPECIES_VAURCA_BULWARK) flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION /datum/gear/augment/vaurcatool @@ -258,7 +258,7 @@ ABSTRACT_TYPE(/datum/gear/ears/vaurca) cost = 5 path = /obj/item/organ/internal/augment/tool/combitool/vaurca sort_category = "Xenowear - Vaurca" - whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_WARRIOR) + whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT) /datum/gear/augment/vaurcatool/New() ..() @@ -272,7 +272,7 @@ ABSTRACT_TYPE(/datum/gear/ears/vaurca) description = "A Vaurca-designed robotic hand that can deliver a painful electric shock." cost = 2 path = /obj/item/organ/external/hand/right/vaurca/security - whitelisted = list(SPECIES_VAURCA_WARRIOR) + whitelisted = list(SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT) sort_category = "Xenowear - Vaurca" allowed_roles = list("Security Officer", "Warden", "Security Personnel") flags = GEAR_NO_SELECTION @@ -282,7 +282,7 @@ ABSTRACT_TYPE(/datum/gear/ears/vaurca) description = "A Vaurca-designed robotic hand capable of providing a medical scan of a target." cost = 2 path = /obj/item/organ/external/hand/right/vaurca/medical - whitelisted = list(SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER) + whitelisted = list(SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_WORKER) sort_category = "Xenowear - Vaurca" allowed_roles = list("Physician", "Surgeon", "Paramedic", "Medical Intern", "Psychiatrist", "Pharmacist", "Medical Personnel") flags = GEAR_NO_SELECTION @@ -293,7 +293,7 @@ ABSTRACT_TYPE(/datum/gear/ears/vaurca) cost = 2 path = /obj/item/organ/internal/augment/vaurca_mag sort_category = "Xenowear - Vaurca" - whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK) + whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK) allowed_roles = list("Shaft Miner", "Engineer", "Atmospheric Technician", "Engineering Apprentice", "Xenoarchaeologist", "Engineering Personnel", "Operations Personnel", "Paramedic", "Medical Personnel") /datum/gear/accessory/tret_passcard @@ -301,7 +301,7 @@ ABSTRACT_TYPE(/datum/gear/ears/vaurca) description = "A Hegemony-issued passcard for K'laxan Vaurcae." path = /obj/item/clothing/accessory/badge/passcard/tret cost = 1 - whitelisted = list(SPECIES_VAURCA_BREEDER, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER) + whitelisted = list(SPECIES_VAURCA_BREEDER, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_WORKER) culture_restriction = list(/singleton/origin_item/culture/klax, /singleton/origin_item/culture/klax_breeder) sort_category = "Xenowear - Vaurca" flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION @@ -399,5 +399,5 @@ ABSTRACT_TYPE(/datum/gear/ears/vaurca) cost = 1 sort_category = "Xenowear - Vaurca" flags = GEAR_HAS_COLOR_SELECTION - whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_UNATHI) + whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK, SPECIES_UNATHI) culture_restriction = list(/singleton/origin_item/culture/klax) diff --git a/code/modules/client/preference_setup/loadout/items/xeno/xeno.dm b/code/modules/client/preference_setup/loadout/items/xeno/xeno.dm index 1499a90d7ef..1b268fd9699 100644 --- a/code/modules/client/preference_setup/loadout/items/xeno/xeno.dm +++ b/code/modules/client/preference_setup/loadout/items/xeno/xeno.dm @@ -3,19 +3,19 @@ path = /obj/item/clothing/under/gearharness sort_category = "Xenowear" - whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_DIONA, SPECIES_DIONA_COEUS, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP) + whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK, SPECIES_DIONA, SPECIES_DIONA_COEUS, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP) /datum/gear/shoes/footwraps display_name = "cloth footwraps" path = /obj/item/clothing/shoes/footwraps sort_category = "Xenowear" - whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_UNATHI, SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI) + whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK, SPECIES_UNATHI, SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI) flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION /datum/gear/shoes/caligae display_name = "caligae selection" path = /obj/item/clothing/shoes/sandals/caligae - whitelisted = list(SPECIES_UNATHI, SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR) + whitelisted = list(SPECIES_UNATHI, SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT) sort_category = "Xenowear" flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION | GEAR_HAS_ACCENT_COLOR_SELECTION @@ -29,7 +29,7 @@ /datum/gear/shoes/toeless display_name = "toeless boot selection" path = /obj/item/clothing/shoes/jackboots/toeless - whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_UNATHI, SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI) + whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK, SPECIES_UNATHI, SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI) sort_category = "Xenowear" /datum/gear/shoes/toeless/New() @@ -48,7 +48,7 @@ /datum/gear/shoes/recolourable_toeless display_name = "toeless boot selection (colourable)" path = /obj/item/clothing/shoes/heeledboots/toeless - whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_UNATHI, SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI) + whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK, SPECIES_UNATHI, SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI) sort_category = "Xenowear" flags = GEAR_HAS_COLOR_SELECTION diff --git a/code/modules/ghostroles/spawner/human/admin/admin.dm b/code/modules/ghostroles/spawner/human/admin/admin.dm index 5ef759dfe2f..483e1f5a975 100644 --- a/code/modules/ghostroles/spawner/human/admin/admin.dm +++ b/code/modules/ghostroles/spawner/human/admin/admin.dm @@ -149,7 +149,7 @@ max_count = 4 outfit = /obj/outfit/admin/ert/legion/sentinel - possible_species = list(SPECIES_HUMAN, SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_UNATHI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER, SPECIES_IPC, SPECIES_DIONA) + possible_species = list(SPECIES_HUMAN, SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_UNATHI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_WORKER, SPECIES_IPC, SPECIES_DIONA) allow_appearance_change = APPEARANCE_PLASTICSURGERY assigned_role = "TCFL Sentinel" diff --git a/code/modules/ghostroles/spawner/human/emergencypod.dm b/code/modules/ghostroles/spawner/human/emergencypod.dm index 9b6d66a6c15..74043bcee4d 100644 --- a/code/modules/ghostroles/spawner/human/emergencypod.dm +++ b/code/modules/ghostroles/spawner/human/emergencypod.dm @@ -10,7 +10,7 @@ //Vars related to human mobs outfit = /obj/outfit/admin/random/visitor - possible_species = list(SPECIES_HUMAN,SPECIES_HUMAN_OFFWORLD,SPECIES_SKRELL, SPECIES_SKRELL_AXIORI,SPECIES_TAJARA,SPECIES_TAJARA_MSAI,SPECIES_TAJARA_ZHAN,SPECIES_UNATHI,SPECIES_VAURCA_WARRIOR,SPECIES_VAURCA_WORKER) + possible_species = list(SPECIES_HUMAN,SPECIES_HUMAN_OFFWORLD,SPECIES_SKRELL, SPECIES_SKRELL_AXIORI,SPECIES_TAJARA,SPECIES_TAJARA_MSAI,SPECIES_TAJARA_ZHAN,SPECIES_UNATHI,SPECIES_VAURCA_WARRIOR,SPECIES_VAURCA_ATTENDANT,SPECIES_VAURCA_WORKER) allow_appearance_change = APPEARANCE_PLASTICSURGERY assigned_role = "Pod Survivor" @@ -48,7 +48,7 @@ else if(t == "tcfl") welcome_message = "You are a stranded member of the Tau Ceti Foreign Legion!
Perhaps there was a training accident or maybe something went wrong during a routine operation in the Romanovich Cloud. The Prefect will never let you hear the end of this..." outfit = /obj/outfit/admin/pod/tcfl - possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_UNATHI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER, SPECIES_IPC, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_DIONA) // TCFL accepts everyone. G1 and G2 have been excluded because they can't wear the hardsuit, which has the suit cooler. + possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_UNATHI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_WORKER, SPECIES_IPC, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_DIONA) // TCFL accepts everyone. G1 and G2 have been excluded because they can't wear the hardsuit, which has the suit cooler. else if(t == "fsf") welcome_message = "You are a stranded Petty Officer of the Free Solarian Fleets!
Your skiff out of the FSFV Sforza was on a routine patrol when an accident or an attack forced you to abandon ship. Thankfully, you seem to be in friendly territory..." outfit = /obj/outfit/admin/pod/fsf diff --git a/code/modules/ghostroles/spawner/human/merchant.dm b/code/modules/ghostroles/spawner/human/merchant.dm index e6953425b0d..7b9214673b2 100644 --- a/code/modules/ghostroles/spawner/human/merchant.dm +++ b/code/modules/ghostroles/spawner/human/merchant.dm @@ -11,7 +11,7 @@ //Vars related to human mobs outfit = /obj/outfit/merchant_assistant - possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_UNATHI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_DIONA) + possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_UNATHI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_WORKER, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_DIONA) allow_appearance_change = APPEARANCE_PLASTICSURGERY assigned_role = "Merchants Assistant" diff --git a/code/modules/ghostroles/spawner/human/responseteams/ap_eridani.dm b/code/modules/ghostroles/spawner/human/responseteams/ap_eridani.dm index 1e41382a808..1a94d5fed9f 100644 --- a/code/modules/ghostroles/spawner/human/responseteams/ap_eridani.dm +++ b/code/modules/ghostroles/spawner/human/responseteams/ap_eridani.dm @@ -34,4 +34,4 @@ max_count = 2 desc = "An Eridani corpsman that can handle nursing duties as well. Trained to operate in combat environments if needed. Make sure to check your quarterlies." outfit = /obj/outfit/admin/ert/ap_eridani/corpsman - possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_UNATHI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER, SPECIES_IPC, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL) + possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_UNATHI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_WORKER, SPECIES_IPC, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL) diff --git a/code/modules/ghostroles/spawner/human/responseteams/human/biesel.dm b/code/modules/ghostroles/spawner/human/responseteams/human/biesel.dm index d870622b900..ba7afc480f0 100644 --- a/code/modules/ghostroles/spawner/human/responseteams/human/biesel.dm +++ b/code/modules/ghostroles/spawner/human/responseteams/human/biesel.dm @@ -4,7 +4,7 @@ desc = "A soldier of the Republican Fleet response team." max_count = 2 outfit = /obj/outfit/admin/ert/tcaf - possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_UNATHI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_DIONA, SPECIES_DIONA_COEUS) + possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_UNATHI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_WORKER, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_DIONA, SPECIES_DIONA_COEUS) mob_name_prefix = "Lgn. " welcome_message = "You are a soldier of the Tau Ceti Republican Fleet, assigned to respond to a distress call from the SCCV Horizon." assigned_role = "Republican Fleet Legionary" diff --git a/code/modules/ghostroles/spawner/human/responseteams/iac.dm b/code/modules/ghostroles/spawner/human/responseteams/iac.dm index e9fd013fd47..9c3e34c07f6 100644 --- a/code/modules/ghostroles/spawner/human/responseteams/iac.dm +++ b/code/modules/ghostroles/spawner/human/responseteams/iac.dm @@ -6,7 +6,7 @@ desc = "A highly trained doctor. Can do most medical procedures even under severe stress. The de-facto lead of the IAC response team." welcome_message = "You are part of the Interstellar Aid Corps, an intergalactic entity set on aiding all in need." outfit = /obj/outfit/admin/ert/iac - possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_DIONA, SPECIES_UNATHI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL) + possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_DIONA, SPECIES_UNATHI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_WORKER, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL) /datum/ghostspawner/human/ert/iac/bodyguard name = "IAC Bodyguard" diff --git a/code/modules/ghostroles/spawner/human/responseteams/mercenary.dm b/code/modules/ghostroles/spawner/human/responseteams/mercenary.dm index 292ec6b0b9d..5800b5fd3c7 100644 --- a/code/modules/ghostroles/spawner/human/responseteams/mercenary.dm +++ b/code/modules/ghostroles/spawner/human/responseteams/mercenary.dm @@ -5,7 +5,7 @@ desc = "Rank and file of a freelancer mercenary team." welcome_message = "Your crew has been hired by NanoTrasen to sort out a distress signal. While you wouldn't do anything violent to the crew, maybe they won't miss that one fancy artifact..." outfit = /obj/outfit/admin/ert/mercenary - possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_DIONA, SPECIES_UNATHI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL) + possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_DIONA, SPECIES_UNATHI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_WORKER, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL) /datum/ghostspawner/human/ert/mercenary/specialist name = "Mercenary Medical Specialist" diff --git a/code/modules/ghostroles/spawner/human/responseteams/skrell/qukala.dm b/code/modules/ghostroles/spawner/human/responseteams/skrell/qukala.dm index ba2857ac1d8..a0eaffef2fb 100644 --- a/code/modules/ghostroles/spawner/human/responseteams/skrell/qukala.dm +++ b/code/modules/ghostroles/spawner/human/responseteams/skrell/qukala.dm @@ -5,7 +5,7 @@ max_count = 2 outfit = /obj/outfit/admin/ert/qukala uses_species_whitelist = FALSE - possible_species = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_VAURCA_WARRIOR, SPECIES_DIONA) + possible_species = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_DIONA) welcome_message = "You are a soldier of the Nralakk Federation Qukala, assigned to respond to a distress call from the SCCV Horizon." assigned_role = "Qukala Responder" diff --git a/code/modules/ghostroles/spawner/human/responseteams/tcfl.dm b/code/modules/ghostroles/spawner/human/responseteams/tcfl.dm index 23856d16233..5173b255a65 100644 --- a/code/modules/ghostroles/spawner/human/responseteams/tcfl.dm +++ b/code/modules/ghostroles/spawner/human/responseteams/tcfl.dm @@ -6,7 +6,7 @@ max_count = 3 outfit = /obj/outfit/admin/ert/legion spawnpoints = list("TCFLERTSpawn") - possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_UNATHI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_DIONA, SPECIES_DIONA_COEUS) + possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_UNATHI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_WORKER, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_DIONA, SPECIES_DIONA_COEUS) mob_name_prefix = "Vol. " /datum/ghostspawner/human/ert/tcfl/specialist diff --git a/code/modules/ghostroles/spawner/human/responseteams/unathi/izweski.dm b/code/modules/ghostroles/spawner/human/responseteams/unathi/izweski.dm index d7dfaa61239..c3c9be56ede 100644 --- a/code/modules/ghostroles/spawner/human/responseteams/unathi/izweski.dm +++ b/code/modules/ghostroles/spawner/human/responseteams/unathi/izweski.dm @@ -24,7 +24,7 @@ desc = "A K'lax Vaurca Warrior, assigned to the Izweski Hegemony response team." max_count = 1 outfit = /obj/outfit/admin/ert/izweski/klax - possible_species = list(SPECIES_VAURCA_WARRIOR) + possible_species = list(SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT) extra_languages = list(LANGUAGE_VAURCA) /datum/ghostspawner/human/ert/izweski/leader diff --git a/code/modules/ghostroles/spawner/human/responseteams/unathi/kataphracts.dm b/code/modules/ghostroles/spawner/human/responseteams/unathi/kataphracts.dm index 07467ccfb29..3a542e23fb9 100644 --- a/code/modules/ghostroles/spawner/human/responseteams/unathi/kataphracts.dm +++ b/code/modules/ghostroles/spawner/human/responseteams/unathi/kataphracts.dm @@ -20,7 +20,7 @@ max_count = 1 outfit = /obj/outfit/admin/ert/kataphract/klax mob_name_prefix = "Zosaa " - possible_species = list(SPECIES_VAURCA_WARRIOR) + possible_species = list(SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT) extra_languages = list(LANGUAGE_VAURCA) /datum/ghostspawner/human/ert/kataphract/klax/New() diff --git a/code/modules/ghostroles/spawner/human/responseteams/vaurca/klax.dm b/code/modules/ghostroles/spawner/human/responseteams/vaurca/klax.dm index 0731ae7de92..4cc7272d118 100644 --- a/code/modules/ghostroles/spawner/human/responseteams/vaurca/klax.dm +++ b/code/modules/ghostroles/spawner/human/responseteams/vaurca/klax.dm @@ -5,7 +5,7 @@ outfit = /obj/outfit/admin/ert/klax mob_name_suffix = " K'lax" mob_name_pick_message = "Choose a Vaurca first name." - possible_species = list(SPECIES_VAURCA_WARRIOR) + possible_species = list(SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT) uses_species_whitelist = FALSE max_count = 2 assigned_role = "K'lax Warrior" diff --git a/code/modules/ghostroles/spawner/human/responseteams/vaurca/zora.dm b/code/modules/ghostroles/spawner/human/responseteams/vaurca/zora.dm index e02f81096d7..462c9b7ad09 100644 --- a/code/modules/ghostroles/spawner/human/responseteams/vaurca/zora.dm +++ b/code/modules/ghostroles/spawner/human/responseteams/vaurca/zora.dm @@ -5,7 +5,7 @@ outfit = /obj/outfit/admin/ert/zora mob_name_suffix = " Zo'ra" mob_name_pick_message = "Choose a Vaurca first name." - possible_species = list(SPECIES_VAURCA_WARRIOR) + possible_species = list(SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT) uses_species_whitelist = FALSE max_count = 2 assigned_role = "Zo'ra Warrior" diff --git a/code/modules/ghostroles/spawner/human/visitor.dm b/code/modules/ghostroles/spawner/human/visitor.dm index e571b942126..1d8e03e6f82 100644 --- a/code/modules/ghostroles/spawner/human/visitor.dm +++ b/code/modules/ghostroles/spawner/human/visitor.dm @@ -12,7 +12,7 @@ //Vars related to human mobs outfit = /obj/outfit/admin/random/visitor - possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_UNATHI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER, SPECIES_IPC, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_IPC_G1, SPECIES_IPC_G2) + possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_UNATHI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_WORKER, SPECIES_IPC, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_IPC_G1, SPECIES_IPC_G2) allow_appearance_change = APPEARANCE_PLASTICSURGERY assigned_role = "Visitor" diff --git a/code/modules/ghostroles/spawner/human/zenghu.dm b/code/modules/ghostroles/spawner/human/zenghu.dm index 36a5a040b41..6a23ab8ec93 100644 --- a/code/modules/ghostroles/spawner/human/zenghu.dm +++ b/code/modules/ghostroles/spawner/human/zenghu.dm @@ -12,7 +12,7 @@ away_site = TRUE outfit = /obj/outfit/admin/zenghu_survivor - possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP) + possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP) allow_appearance_change = APPEARANCE_PLASTICSURGERY assigned_role = "Zeng-Hu Survivor" diff --git a/code/modules/martial_arts/vaurca.dm b/code/modules/martial_arts/vaurca.dm index 372180542aa..fba6b1822af 100644 --- a/code/modules/martial_arts/vaurca.dm +++ b/code/modules/martial_arts/vaurca.dm @@ -95,7 +95,7 @@ icon = 'icons/obj/vaurca_items.dmi' icon_state = "harddisk" martial_art = /datum/martial_art/vkutet - species_restriction = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BREEDER, SPECIES_VAURCA_BULWARK) + species_restriction = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BREEDER, SPECIES_VAURCA_BULWARK) #undef PIERCING_STRIKE #undef SWIFT_BITE diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index 10396350d46..d480126948c 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -106,6 +106,10 @@ if(isbreeder) return FALSE return TRUE + if(SPECIES_VAURCA_ATTENDANT) + if(isbreeder) + return FALSE + return TRUE if(SPECIES_VAURCA_BREEDER) return TRUE if(SPECIES_VAURCA_BULWARK) diff --git a/code/modules/organs/robolimbs.dm b/code/modules/organs/robolimbs.dm index 756dc15bfe8..0cbcfd839d1 100644 --- a/code/modules/organs/robolimbs.dm +++ b/code/modules/organs/robolimbs.dm @@ -38,6 +38,7 @@ GLOBAL_DATUM(basic_robolimb, /datum/robolimb) SPECIES_UNATHI, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, + SPECIES_VAURCA_ATTENDANT, SPECIES_IPC, SPECIES_IPC_SHELL, SPECIES_IPC_BISHOP, @@ -193,13 +194,13 @@ GLOBAL_DATUM(basic_robolimb, /datum/robolimb) company = PROSTHETIC_VAURCA desc = "This limb design is from old Sedantis, still manufactured by the Hives when providing maintenance to most of the basic Vaurcesian bioforms." icon = 'icons/mob/human_races/vaurca/r_vaurcalimbs.dmi' - species_can_use = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR) + species_can_use = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT) allows_internal = FALSE /datum/robolimb/vaurca/warrior company = PROSTHETIC_VAURCA_WARRIOR icon = 'icons/mob/human_races/vaurca/r_vaurcawarriorlimbs.dmi' - species_can_use = list(SPECIES_VAURCA_WARRIOR) + species_can_use = list(SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT) allowed_external_organs = list(BP_L_HAND, BP_R_HAND) /datum/robolimb/hoplan diff --git a/code/modules/organs/subtypes/augment/augments/language_processor.dm b/code/modules/organs/subtypes/augment/augments/language_processor.dm index aa774611754..83bec6519c0 100644 --- a/code/modules/organs/subtypes/augment/augments/language_processor.dm +++ b/code/modules/organs/subtypes/augment/augments/language_processor.dm @@ -43,6 +43,7 @@ SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_WARFORM, SPECIES_VAURCA_WARRIOR, + SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_WORKER, ) @@ -54,6 +55,7 @@ SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_WARFORM, SPECIES_VAURCA_WARRIOR, + SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_WORKER, ) @@ -66,6 +68,7 @@ SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_WARFORM, SPECIES_VAURCA_WARRIOR, + SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_WORKER, ) @@ -78,6 +81,7 @@ SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_WARFORM, SPECIES_VAURCA_WARRIOR, + SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_WORKER, ) @@ -90,6 +94,7 @@ SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_WARFORM, SPECIES_VAURCA_WARRIOR, + SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_WORKER, ) @@ -101,6 +106,7 @@ SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_WARFORM, SPECIES_VAURCA_WARRIOR, + SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_WORKER, ) diff --git a/code/modules/organs/subtypes/vaurca.dm b/code/modules/organs/subtypes/vaurca.dm index 11bf2b48a05..55f4be89383 100644 --- a/code/modules/organs/subtypes/vaurca.dm +++ b/code/modules/organs/subtypes/vaurca.dm @@ -191,7 +191,7 @@ action_button_name = "Toggle Hivenet Defense Suite" action_button_icon = "augment-pda" activable = TRUE - species_restricted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BREEDER, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_WARFORM) + species_restricted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BREEDER, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_WARFORM) var/fullshield = FALSE /obj/item/organ/internal/augment/hiveshield/attack_self(var/mob/living/carbon/user) @@ -265,7 +265,7 @@ action_button_name = "Deploy Toolset" action_button_icon = "vaurcatool" augment_type = /obj/item/combitool/robotic/vaurca - species_restricted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK) + species_restricted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK) /obj/item/organ/internal/augment/tool/combitool/vaurca/left parent_organ = BP_L_HAND @@ -293,7 +293,7 @@ parent_organ = BP_GROIN organ_tag = BP_AUG_MAGBOOT activable = TRUE - species_restricted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BREEDER, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_WARFORM) + species_restricted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BREEDER, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_WARFORM) /obj/item/organ/internal/augment/vaurca_mag/attack_self(mob/user) if(use_check_and_message(owner)) diff --git a/code/modules/projectiles/guns/alien.dm b/code/modules/projectiles/guns/alien.dm index 64689892e02..c62271c0d14 100644 --- a/code/modules/projectiles/guns/alien.dm +++ b/code/modules/projectiles/guns/alien.dm @@ -46,7 +46,7 @@ /obj/item/gun/launcher/spikethrower/special_check(user) if(ishuman(user)) var/mob/living/carbon/human/H = user - if(H.species && H.species.name != SPECIES_VAURCA_WARRIOR) + if(H.species && H.species.name != SPECIES_VAURCA_WARRIOR || SPECIES_VAURCA_ATTENDANT) to_chat(user, SPAN_WARNING("\The [src] does not respond to you!")) return FALSE return ..() @@ -83,7 +83,7 @@ if(loc != user) var/mob/living/carbon/human/H = user if(istype(H)) - if(H.species.name == SPECIES_VAURCA_WARRIOR) + if(H.species.name == SPECIES_VAURCA_WARRIOR || SPECIES_VAURCA_ATTENDANT) ..() return to_chat(user, SPAN_WARNING("\The [src] is far too large for you to pick up.")) diff --git a/html/changelogs/hazelmouse-attendantstuff.yml b/html/changelogs/hazelmouse-attendantstuff.yml new file mode 100644 index 00000000000..26e564c278b --- /dev/null +++ b/html/changelogs/hazelmouse-attendantstuff.yml @@ -0,0 +1,62 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: hazelmouse + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Adds the new Vaurca Attendant subspecies to a number of ghostroles." + - bugfix: "Vaurca Attendants can now take species-specific items from the loadout, including clothing and augments." + - bugfix: "Vaurca Attendants can no longer join as consulars." + - bugfix: "Vaurca Attendants now work smoothly with a number of event outfits." + diff --git a/maps/away/away_site/pirate_base/pirate_base_ghostroles.dm b/maps/away/away_site/pirate_base/pirate_base_ghostroles.dm index d8d453e3dd9..de854d0d67c 100644 --- a/maps/away/away_site/pirate_base/pirate_base_ghostroles.dm +++ b/maps/away/away_site/pirate_base/pirate_base_ghostroles.dm @@ -27,7 +27,7 @@ enabled = FALSE outfit = /obj/outfit/admin/pirate - possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_UNATHI, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER, SPECIES_DIONA, SPECIES_DIONA_COEUS) + possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_UNATHI, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_WORKER, SPECIES_DIONA, SPECIES_DIONA_COEUS) allow_appearance_change = APPEARANCE_PLASTICSURGERY assigned_role = "Independent Spacer" @@ -53,6 +53,7 @@ SPECIES_TAJARA_MSAI = /obj/item/clothing/shoes/jackboots/toeless, SPECIES_TAJARA_ZHAN = /obj/item/clothing/shoes/jackboots/toeless, SPECIES_VAURCA_WARRIOR = /obj/item/clothing/shoes/jackboots/toeless, + SPECIES_VAURCA_ATTENDANT = /obj/item/clothing/shoes/jackboots/toeless, SPECIES_VAURCA_WORKER = /obj/item/clothing/shoes/jackboots/toeless ) @@ -97,7 +98,7 @@ enabled = FALSE outfit = /obj/outfit/admin/pirate - possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_UNATHI, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER, SPECIES_DIONA, SPECIES_DIONA_COEUS) + possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_UNATHI, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_WORKER, SPECIES_DIONA, SPECIES_DIONA_COEUS) allow_appearance_change = APPEARANCE_PLASTICSURGERY assigned_role = "Independent Spacer" @@ -114,6 +115,7 @@ SPECIES_TAJARA_MSAI = /obj/item/clothing/shoes/jackboots/toeless, SPECIES_TAJARA_ZHAN = /obj/item/clothing/shoes/jackboots/toeless, SPECIES_VAURCA_WARRIOR = /obj/item/clothing/shoes/jackboots/toeless, + SPECIES_VAURCA_ATTENDANT = /obj/item/clothing/shoes/jackboots/toeless, SPECIES_VAURCA_WORKER = /obj/item/clothing/shoes/jackboots/toeless ) @@ -136,7 +138,7 @@ enabled = FALSE outfit = /obj/outfit/admin/pirate_prisoner - possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_UNATHI, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER, SPECIES_DIONA, SPECIES_DIONA_COEUS) + possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_UNATHI, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_WORKER, SPECIES_DIONA, SPECIES_DIONA_COEUS) allow_appearance_change = APPEARANCE_PLASTICSURGERY assigned_role = "Independent Spacer" @@ -159,5 +161,6 @@ SPECIES_TAJARA_MSAI = /obj/item/clothing/shoes/jackboots/toeless, SPECIES_TAJARA_ZHAN = /obj/item/clothing/shoes/jackboots/toeless, SPECIES_VAURCA_WARRIOR = /obj/item/clothing/shoes/jackboots/toeless, + SPECIES_VAURCA_ATTENDANT = /obj/item/clothing/shoes/jackboots/toeless, SPECIES_VAURCA_WORKER = /obj/item/clothing/shoes/jackboots/toeless ) diff --git a/maps/away/away_site/romanovich/grand_romanovich_ghostroles.dm b/maps/away/away_site/romanovich/grand_romanovich_ghostroles.dm index 7840c71bd02..e179e2ac4e0 100644 --- a/maps/away/away_site/romanovich/grand_romanovich_ghostroles.dm +++ b/maps/away/away_site/romanovich/grand_romanovich_ghostroles.dm @@ -127,7 +127,7 @@ max_count = 4 outfit = /obj/outfit/admin/random/casino_patron - possible_species = list(SPECIES_HUMAN,SPECIES_HUMAN_OFFWORLD,SPECIES_SKRELL, SPECIES_SKRELL_AXIORI,SPECIES_TAJARA,SPECIES_TAJARA_MSAI,SPECIES_TAJARA_ZHAN,SPECIES_UNATHI,SPECIES_VAURCA_WARRIOR,SPECIES_VAURCA_WORKER) + possible_species = list(SPECIES_HUMAN,SPECIES_HUMAN_OFFWORLD,SPECIES_SKRELL, SPECIES_SKRELL_AXIORI,SPECIES_TAJARA,SPECIES_TAJARA_MSAI,SPECIES_TAJARA_ZHAN,SPECIES_UNATHI,SPECIES_VAURCA_WARRIOR,SPECIES_VAURCA_ATTENDANT,SPECIES_VAURCA_WORKER) allow_appearance_change = APPEARANCE_PLASTICSURGERY assigned_role = "Grand Romanovich" diff --git a/maps/away/away_site/uueoaesa/reclamation/ihss_reclamation_ghostroles.dm b/maps/away/away_site/uueoaesa/reclamation/ihss_reclamation_ghostroles.dm index bbc560b68b7..c9727d273d1 100644 --- a/maps/away/away_site/uueoaesa/reclamation/ihss_reclamation_ghostroles.dm +++ b/maps/away/away_site/uueoaesa/reclamation/ihss_reclamation_ghostroles.dm @@ -48,7 +48,7 @@ spawnpoints = list("ihss_security") max_count = 3 uses_species_whitelist = TRUE - possible_species = list(SPECIES_UNATHI, SPECIES_VAURCA_WARRIOR) + possible_species = list(SPECIES_UNATHI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT) welcome_message = "You are security personnel aboard the IHSS Reclamation, an Izweski Hegemony ecological monitoring and terraforming station for coordinating the restoration of the Moghes Wasteland." assigned_role = "IHSS Reclamation Security" special_role = "IHSS Reclamation Security" diff --git a/maps/away/away_site/uueoaesa/tret/tret_industrial_complex_ghostroles.dm b/maps/away/away_site/uueoaesa/tret/tret_industrial_complex_ghostroles.dm index 6712f2bd8d2..de5e70a503d 100644 --- a/maps/away/away_site/uueoaesa/tret/tret_industrial_complex_ghostroles.dm +++ b/maps/away/away_site/uueoaesa/tret/tret_industrial_complex_ghostroles.dm @@ -78,7 +78,7 @@ desc_ooc = null max_count = 2 - possible_species = list(SPECIES_VAURCA_WARRIOR) + possible_species = list(SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT) uses_species_whitelist = TRUE outfit = /obj/outfit/admin/tret_industrial/vaurca/warrior diff --git a/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette_ghostroles.dm b/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette_ghostroles.dm index fcc155bd1d9..b3d026ad03c 100644 --- a/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette_ghostroles.dm +++ b/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette_ghostroles.dm @@ -10,7 +10,7 @@ outfit = /obj/outfit/admin/tcaf_crewman // Vaurca workers are only playable as technicians, as it's a primarily non-combatatant role. Think engineers and ammo loaders. - possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_UNATHI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_DIONA, SPECIES_DIONA_COEUS) + possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_UNATHI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_WORKER, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_DIONA, SPECIES_DIONA_COEUS) allow_appearance_change = APPEARANCE_PLASTICSURGERY assigned_role = "Republican Fleet Legionnaire (Technician)" @@ -35,7 +35,8 @@ SPECIES_TAJARA_MSAI = /obj/item/clothing/shoes/jackboots/toeless, SPECIES_TAJARA_ZHAN = /obj/item/clothing/shoes/jackboots/toeless, SPECIES_VAURCA_WORKER = /obj/item/clothing/shoes/jackboots/toeless, // Vaurca shoes look odd with the uniforms. - SPECIES_VAURCA_WARRIOR = /obj/item/clothing/shoes/jackboots/toeless + SPECIES_VAURCA_WARRIOR = /obj/item/clothing/shoes/jackboots/toeless, + SPECIES_VAURCA_ATTENDANT = /obj/item/clothing/shoes/jackboots/toeless ) /obj/outfit/admin/tcaf_crewman/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) @@ -63,7 +64,7 @@ max_count = 2 outfit = /obj/outfit/admin/tcaf_crewman/armsman // Excludes vaurca workers, as it's a combatant role. - possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_UNATHI, SPECIES_VAURCA_WARRIOR, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_DIONA, SPECIES_DIONA_COEUS) + possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_UNATHI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_DIONA, SPECIES_DIONA_COEUS) mob_name_prefix = "Lgn. " desc = "It's been a long patrol. It's been months since you're felt firm ground beneath your feet, longer since you've eaten enviable food, and the rumbling of the hull is starting to get to you. You are a TCAF Legionnaire Armsman serving aboard a scout corvette, responsible to protect the crew of your ship in the event of a boarding action and to put yourself on the front lines in the event of combat. You may fight for patriotism, or for liberty, or perhaps only for yourself, but you will fight nonetheless; obey your commanding officer, clear the sector of pirate activity, and serve the Republic of Biesel." assigned_role = "Republican Fleet Legionnaire (Armsman)" @@ -81,7 +82,7 @@ max_count = 1 outfit = /obj/outfit/admin/tcaf_crewman/nco // Excludes vaurca workers, as it's a combatant role. - possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_UNATHI, SPECIES_VAURCA_WARRIOR, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_DIONA, SPECIES_DIONA_COEUS) + possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_UNATHI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_DIONA, SPECIES_DIONA_COEUS) mob_name_prefix = "Pfct. " desc = "It's been a long patrol. It's been months since you're felt firm ground beneath your feet, longer since you've eaten enviable food, and the rumbling of the hull is starting to get to you. You are a TCAF Prefect serving aboard a scout corvette, responsible for keeping the ship functioning smoothly in matters beneath the notice of the Decurion, your superior. You outrank the Legionnaires on-board, but you are not an officer. You may fight for patriotism, or for liberty, or perhaps only for yourself, but you will fight nonetheless; obey your commanding officer, clear the sector of pirate activity, and serve the Republic of Biesel." assigned_role = "Republican Fleet Prefect" @@ -101,7 +102,7 @@ spawnpoints = list("tcaf_officer") outfit = /obj/outfit/admin/tcaf_crewman/officer // More limited species selection than the non-officer roles - humans, skrell, IPCs, and vaurca warriors. - possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_VAURCA_WARRIOR) + possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT) mob_name_prefix = "Dcn. " desc = "You are a Decurion, an enlisted officer, serving with the Tau Ceti Armed Forces in command of a corvette. The Republican Fleets are stretched thin across too much territory, with too few ships and too few men, too divided and too disparate to ensure the safety of its own citizens. You may command only one small vessel, but the fate of the Republic may lie in you and officers like you. You are the eyes and ears of the Republic of Biesel - police your assigned sector for piracy and smuggling, monitor neighbouring powers, and above all else, keep your crew alive. They're counting on you." assigned_role = "Republican Fleet Decurion" diff --git a/maps/away/ships/freebooter/freebooter_ship_ghostroles.dm b/maps/away/ships/freebooter/freebooter_ship_ghostroles.dm index a7ee20a5573..19a475d7c90 100644 --- a/maps/away/ships/freebooter/freebooter_ship_ghostroles.dm +++ b/maps/away/ships/freebooter/freebooter_ship_ghostroles.dm @@ -8,7 +8,7 @@ max_count = 4 outfit = /obj/outfit/admin/freebooter_crew - possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_UNATHI, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER, SPECIES_DIONA, SPECIES_DIONA_COEUS) + possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_UNATHI, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_WORKER, SPECIES_DIONA, SPECIES_DIONA_COEUS) allow_appearance_change = APPEARANCE_PLASTICSURGERY assigned_role = "Independent Spacer" @@ -34,7 +34,8 @@ SPECIES_TAJARA_MSAI = /obj/item/clothing/shoes/jackboots/toeless, SPECIES_TAJARA_ZHAN = /obj/item/clothing/shoes/jackboots/toeless, SPECIES_VAURCA_WARRIOR = /obj/item/clothing/shoes/jackboots/toeless, - SPECIES_VAURCA_WORKER = /obj/item/clothing/shoes/jackboots/toeless + SPECIES_VAURCA_WORKER = /obj/item/clothing/shoes/jackboots/toeless, + SPECIES_VAURCA_ATTENDANT = /obj/item/clothing/shoes/jackboots/toeless ) /obj/outfit/admin/freebooter_crew/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) diff --git a/maps/away/ships/hegemony/fishing_trawler/fishing_league_trawler_ghostroles.dm b/maps/away/ships/hegemony/fishing_trawler/fishing_league_trawler_ghostroles.dm index aeb365f4ef9..613c1abebf0 100644 --- a/maps/away/ships/hegemony/fishing_trawler/fishing_league_trawler_ghostroles.dm +++ b/maps/away/ships/hegemony/fishing_trawler/fishing_league_trawler_ghostroles.dm @@ -9,7 +9,7 @@ max_count = 4 outfit = /obj/outfit/admin/fishing_trawler_crewman - possible_species = list(SPECIES_UNATHI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER) + possible_species = list(SPECIES_UNATHI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_ATTENDANT) uses_species_whitelist = FALSE allow_appearance_change = APPEARANCE_PLASTICSURGERY @@ -38,7 +38,8 @@ species_shoes = list( SPECIES_UNATHI = /obj/item/clothing/shoes/workboots/toeless, SPECIES_VAURCA_WARRIOR = /obj/item/clothing/shoes/workboots/toeless, - SPECIES_VAURCA_WORKER = /obj/item/clothing/shoes/workboots/toeless + SPECIES_VAURCA_WORKER = /obj/item/clothing/shoes/workboots/toeless, + SPECIES_VAURCA_ATTENDANT = /obj/item/clothing/shoes/workboots/toeless ) species_suit = list( SPECIES_UNATHI = /obj/item/clothing/accessory/poncho/unathimantle/fisher diff --git a/maps/away/ships/hegemony/hegemony_corvette/hegemony_ghostroles.dm b/maps/away/ships/hegemony/hegemony_corvette/hegemony_ghostroles.dm index e708599e303..70a9a175557 100644 --- a/maps/away/ships/hegemony/hegemony_corvette/hegemony_ghostroles.dm +++ b/maps/away/ships/hegemony/hegemony_corvette/hegemony_ghostroles.dm @@ -28,7 +28,7 @@ uses_species_whitelist = TRUE outfit = /obj/outfit/admin/izweski/klax spawnpoints = list("hegemony_klax") - possible_species = list(SPECIES_VAURCA_WARRIOR) + possible_species = list(SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT) extra_languages = list(LANGUAGE_VAURCA) welcome_message = "As a K'laxan auxiliary, you are fundamentally an outsider to the ship and the crew you have been assigned to. Attempt to act according to Unathi codes of honor, even if you do not fully understand them yourself." diff --git a/maps/away/ships/heph/cyclops/cyclops_ghostroles.dm b/maps/away/ships/heph/cyclops/cyclops_ghostroles.dm index 15cdbdd83d6..dda4b6d71b7 100644 --- a/maps/away/ships/heph/cyclops/cyclops_ghostroles.dm +++ b/maps/away/ships/heph/cyclops/cyclops_ghostroles.dm @@ -37,7 +37,8 @@ SPECIES_TAJARA_ZHAN = /obj/item/clothing/shoes/workboots/toeless, SPECIES_VAURCA_WARRIOR = /obj/item/clothing/shoes/vaurca, SPECIES_VAURCA_WORKER = /obj/item/clothing/shoes/vaurca, - SPECIES_VAURCA_BULWARK = /obj/item/clothing/shoes/vaurca + SPECIES_VAURCA_BULWARK = /obj/item/clothing/shoes/vaurca, + SPECIES_VAURCA_ATTENDANT = /obj/item/clothing/shoes/vaurca ) /obj/outfit/admin/cyclops_crew/miner/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) @@ -68,7 +69,7 @@ max_count = 1 outfit = /obj/outfit/admin/cyclops_crew/security - possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_UNATHI, SPECIES_VAURCA_WARRIOR) + possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_UNATHI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT) allow_appearance_change = APPEARANCE_PLASTICSURGERY assigned_role = "Hephaestus Security Officer" diff --git a/maps/away/ships/heph/heph_security/heph_security_ghostroles.dm b/maps/away/ships/heph/heph_security/heph_security_ghostroles.dm index af5868bad05..30c46d3b55a 100644 --- a/maps/away/ships/heph/heph_security/heph_security_ghostroles.dm +++ b/maps/away/ships/heph/heph_security/heph_security_ghostroles.dm @@ -10,7 +10,7 @@ max_count = 4 outfit = /obj/outfit/admin/heph_security - possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_SHELL, SPECIES_IPC_XION, SPECIES_UNATHI, SPECIES_VAURCA_WARRIOR) + possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_SHELL, SPECIES_IPC_XION, SPECIES_UNATHI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT) uses_species_whitelist = TRUE allow_appearance_change = APPEARANCE_PLASTICSURGERY @@ -30,7 +30,8 @@ backpack_contents = list(/obj/item/storage/box/survival = 1) species_shoes = list( SPECIES_UNATHI = /obj/item/clothing/shoes/sandals/caligae/socks, - SPECIES_VAURCA_WARRIOR = /obj/item/clothing/shoes/vaurca + SPECIES_VAURCA_WARRIOR = /obj/item/clothing/shoes/vaurca, + SPECIES_VAURCA_ATTENDANT = /obj/item/clothing/shoes/vaurca ) species_suit = list( SPECIES_UNATHI = /obj/item/clothing/accessory/poncho/unathimantle/hephaestus diff --git a/maps/away/ships/iac/iac_rescue_ship_ghostroles.dm b/maps/away/ships/iac/iac_rescue_ship_ghostroles.dm index ddf13aa34b0..0b5971ced67 100644 --- a/maps/away/ships/iac/iac_rescue_ship_ghostroles.dm +++ b/maps/away/ships/iac/iac_rescue_ship_ghostroles.dm @@ -10,7 +10,7 @@ max_count = 2 outfit = /obj/outfit/admin/iac_volunteer - possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_UNATHI, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER, SPECIES_DIONA, SPECIES_DIONA_COEUS) + possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_UNATHI, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_WORKER, SPECIES_DIONA, SPECIES_DIONA_COEUS) allow_appearance_change = APPEARANCE_PLASTICSURGERY assigned_role = "IAC Volunteer" @@ -37,7 +37,8 @@ SPECIES_TAJARA_MSAI = /obj/item/clothing/shoes/workboots/toeless, SPECIES_TAJARA_ZHAN = /obj/item/clothing/shoes/workboots/toeless, SPECIES_VAURCA_WARRIOR = /obj/item/clothing/shoes/workboots/toeless, - SPECIES_VAURCA_WORKER = /obj/item/clothing/shoes/workboots/toeless + SPECIES_VAURCA_WORKER = /obj/item/clothing/shoes/workboots/toeless, + SPECIES_VAURCA_ATTENDANT = /obj/item/clothing/shoes/workboots/toeless ) /obj/outfit/admin/iac_volunteer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) @@ -68,7 +69,7 @@ max_count = 2 outfit = /obj/outfit/admin/iac_volunteer/technician - possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_UNATHI, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER, SPECIES_DIONA, SPECIES_DIONA_COEUS) + possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_UNATHI, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_ATTENDANT, SPECIES_DIONA, SPECIES_DIONA_COEUS) allow_appearance_change = APPEARANCE_PLASTICSURGERY assigned_role = "IAC Technician" @@ -86,7 +87,8 @@ SPECIES_TAJARA_MSAI = /obj/item/clothing/shoes/workboots/toeless/grey, SPECIES_TAJARA_ZHAN = /obj/item/clothing/shoes/workboots/toeless/grey, SPECIES_VAURCA_WARRIOR = /obj/item/clothing/shoes/workboots/toeless, - SPECIES_VAURCA_WORKER = /obj/item/clothing/shoes/workboots/toeless + SPECIES_VAURCA_WORKER = /obj/item/clothing/shoes/workboots/toeless, + SPECIES_VAURCA_ATTENDANT = /obj/item/clothing/shoes/workboots/toeless ) /datum/ghostspawner/human/iac_volunteer/coordinator diff --git a/maps/away/ships/kataphracts/kataphract_ship_ghostroles.dm b/maps/away/ships/kataphracts/kataphract_ship_ghostroles.dm index 81dba618a03..41a7e408aec 100644 --- a/maps/away/ships/kataphracts/kataphract_ship_ghostroles.dm +++ b/maps/away/ships/kataphracts/kataphract_ship_ghostroles.dm @@ -32,7 +32,7 @@ spawnpoints = list("kataphract_klax") outfit = /obj/outfit/admin/kataphract/klax - possible_species = list(SPECIES_VAURCA_WARRIOR) + possible_species = list(SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT) extra_languages = list(LANGUAGE_VAURCA) /datum/ghostspawner/human/kataphract/knight diff --git a/maps/away/ships/lone_spacer/lone_spacer_ghostroles.dm b/maps/away/ships/lone_spacer/lone_spacer_ghostroles.dm index 5c5390e266c..edb4b58dbee 100644 --- a/maps/away/ships/lone_spacer/lone_spacer_ghostroles.dm +++ b/maps/away/ships/lone_spacer/lone_spacer_ghostroles.dm @@ -8,7 +8,7 @@ max_count = 1 outfit = /obj/outfit/admin/lone_spacer - possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_UNATHI, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER, SPECIES_DIONA, SPECIES_DIONA_COEUS) + possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_UNATHI, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_WORKER, SPECIES_DIONA, SPECIES_DIONA_COEUS) allow_appearance_change = APPEARANCE_PLASTICSURGERY assigned_role = "Independent Spacer" @@ -34,7 +34,8 @@ SPECIES_TAJARA_MSAI = /obj/item/clothing/shoes/jackboots/toeless, SPECIES_TAJARA_ZHAN = /obj/item/clothing/shoes/jackboots/toeless, SPECIES_VAURCA_WARRIOR = /obj/item/clothing/shoes/jackboots/toeless, - SPECIES_VAURCA_WORKER = /obj/item/clothing/shoes/jackboots/toeless + SPECIES_VAURCA_WORKER = /obj/item/clothing/shoes/jackboots/toeless, + SPECIES_VAURCA_ATTENDANT = /obj/item/clothing/shoes/jackboots/toeless ) /obj/outfit/admin/lone_spacer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) diff --git a/maps/away/ships/orion/orion_express_ship_ghostroles.dm b/maps/away/ships/orion/orion_express_ship_ghostroles.dm index bfb2e73ee5a..b53b9921bdc 100644 --- a/maps/away/ships/orion/orion_express_ship_ghostroles.dm +++ b/maps/away/ships/orion/orion_express_ship_ghostroles.dm @@ -10,7 +10,7 @@ max_count = 3 outfit = /obj/outfit/admin/orion_express_courier - possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_UNATHI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER, SPECIES_DIONA, SPECIES_DIONA_COEUS, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL) + possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_UNATHI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_WORKER, SPECIES_DIONA, SPECIES_DIONA_COEUS, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL) allow_appearance_change = APPEARANCE_PLASTICSURGERY assigned_role = "Orion Express Courier" @@ -36,7 +36,8 @@ SPECIES_TAJARA_MSAI = /obj/item/clothing/shoes/workboots/toeless, SPECIES_TAJARA_ZHAN = /obj/item/clothing/shoes/workboots/toeless, SPECIES_VAURCA_WORKER = /obj/item/clothing/shoes/workboots/toeless, - SPECIES_VAURCA_WARRIOR =/obj/item/clothing/shoes/workboots/toeless + SPECIES_VAURCA_WARRIOR =/obj/item/clothing/shoes/workboots/toeless, + SPECIES_VAURCA_ATTENDANT =/obj/item/clothing/shoes/workboots/toeless ) /obj/outfit/admin/orion_express_courier/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) diff --git a/maps/away/ships/scc/scc_scout_ship_ghostroles.dm b/maps/away/ships/scc/scc_scout_ship_ghostroles.dm index a77259b2b4b..90d6d08db51 100644 --- a/maps/away/ships/scc/scc_scout_ship_ghostroles.dm +++ b/maps/away/ships/scc/scc_scout_ship_ghostroles.dm @@ -51,7 +51,7 @@ SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, \ SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, \ SPECIES_UNATHI, \ - SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, \ + SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK, \ ) allow_appearance_change = APPEARANCE_PLASTICSURGERY @@ -77,7 +77,7 @@ SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, \ SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, \ SPECIES_UNATHI, \ - SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, \ + SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK, \ ) allow_appearance_change = APPEARANCE_PLASTICSURGERY @@ -101,7 +101,7 @@ SPECIES_IPC, SPECIES_IPC_BISHOP, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_SHELL, SPECIES_IPC_UNBRANDED, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, \ SPECIES_DIONA, SPECIES_DIONA_COEUS, \ SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, \ - SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, \ + SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK, \ ) allow_appearance_change = APPEARANCE_PLASTICSURGERY @@ -127,7 +127,7 @@ SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, \ SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, \ SPECIES_UNATHI, \ - SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, \ + SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK, \ ) allow_appearance_change = APPEARANCE_PLASTICSURGERY @@ -152,7 +152,7 @@ SPECIES_DIONA, SPECIES_DIONA_COEUS, \ SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, \ SPECIES_UNATHI, \ - SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, \ + SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK, \ ) allow_appearance_change = APPEARANCE_PLASTICSURGERY @@ -178,7 +178,8 @@ SPECIES_TAJARA_MSAI = /obj/item/clothing/shoes/jackboots/toeless, SPECIES_TAJARA_ZHAN = /obj/item/clothing/shoes/jackboots/toeless, SPECIES_VAURCA_WORKER = /obj/item/clothing/shoes/jackboots/toeless, - SPECIES_VAURCA_WARRIOR = /obj/item/clothing/shoes/jackboots/toeless + SPECIES_VAURCA_WARRIOR = /obj/item/clothing/shoes/jackboots/toeless, + SPECIES_VAURCA_ATTENDANT = /obj/item/clothing/shoes/jackboots/toeless ) /obj/outfit/admin/scc_scout_ship_crew/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) diff --git a/maps/away/ships/tramp_freighter/tramp_freighter_ghostroles.dm b/maps/away/ships/tramp_freighter/tramp_freighter_ghostroles.dm index 3bcd46ac10b..df0c401fad1 100644 --- a/maps/away/ships/tramp_freighter/tramp_freighter_ghostroles.dm +++ b/maps/away/ships/tramp_freighter/tramp_freighter_ghostroles.dm @@ -8,7 +8,7 @@ max_count = 3 outfit = /obj/outfit/admin/freighter_crew - possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_UNATHI, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER, SPECIES_DIONA, SPECIES_DIONA_COEUS) + possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_UNATHI, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_WORKER, SPECIES_DIONA, SPECIES_DIONA_COEUS) allow_appearance_change = APPEARANCE_PLASTICSURGERY assigned_role = "Freighter Crewman" @@ -34,7 +34,8 @@ SPECIES_TAJARA_MSAI = /obj/item/clothing/shoes/workboots/toeless, SPECIES_TAJARA_ZHAN = /obj/item/clothing/shoes/workboots/toeless, SPECIES_VAURCA_WARRIOR = /obj/item/clothing/shoes/workboots/toeless, - SPECIES_VAURCA_WORKER = /obj/item/clothing/shoes/workboots/toeless + SPECIES_VAURCA_WORKER = /obj/item/clothing/shoes/workboots/toeless, + SPECIES_VAURCA_ATTENDANT = /obj/item/clothing/shoes/jackboots/toeless ) /obj/outfit/admin/freighter_crew/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) diff --git a/maps/random_ruins/exoplanets/grove/crashsurvivors/crashsurvivors.dm b/maps/random_ruins/exoplanets/grove/crashsurvivors/crashsurvivors.dm index e9e8a4f68bc..b5cdfbcb6df 100644 --- a/maps/random_ruins/exoplanets/grove/crashsurvivors/crashsurvivors.dm +++ b/maps/random_ruins/exoplanets/grove/crashsurvivors/crashsurvivors.dm @@ -10,7 +10,7 @@ max_count = 3 outfit = /obj/outfit/admin/freighter_crew - possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_UNATHI, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER, SPECIES_DIONA, SPECIES_DIONA_COEUS) + possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_UNATHI, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_WORKER, SPECIES_DIONA, SPECIES_DIONA_COEUS) allow_appearance_change = APPEARANCE_PLASTICSURGERY assigned_role = "Survivor" @@ -36,6 +36,7 @@ SPECIES_TAJARA_MSAI = /obj/item/clothing/shoes/workboots/toeless, SPECIES_TAJARA_ZHAN = /obj/item/clothing/shoes/workboots/toeless, SPECIES_VAURCA_WARRIOR = /obj/item/clothing/shoes/workboots/toeless, + SPECIES_VAURCA_ATTENDANT = /obj/item/clothing/shoes/workboots/toeless, SPECIES_VAURCA_WORKER = /obj/item/clothing/shoes/workboots/toeless ) diff --git a/maps/random_ruins/exoplanets/moghes/moghes_wasteland_klax.dm b/maps/random_ruins/exoplanets/moghes/moghes_wasteland_klax.dm index fc0c32e0313..4b2763526f1 100644 --- a/maps/random_ruins/exoplanets/moghes/moghes_wasteland_klax.dm +++ b/maps/random_ruins/exoplanets/moghes/moghes_wasteland_klax.dm @@ -52,7 +52,7 @@ outfit = /obj/outfit/admin/moghes_wasteland_klax/warrior max_count = 2 uses_species_whitelist = TRUE - possible_species = list(SPECIES_VAURCA_WARRIOR) + possible_species = list(SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT) mob_name_pick_message = "Pick a Vaurca Warrior name." assigned_role = "K'laxan Warrior" diff --git a/maps/random_ruins/exoplanets/moghes/moghes_wasteland_mikuetz.dm b/maps/random_ruins/exoplanets/moghes/moghes_wasteland_mikuetz.dm index f09b5c2acd8..9a5869603ad 100644 --- a/maps/random_ruins/exoplanets/moghes/moghes_wasteland_mikuetz.dm +++ b/maps/random_ruins/exoplanets/moghes/moghes_wasteland_mikuetz.dm @@ -34,7 +34,7 @@ extra_languages = list(LANGUAGE_VAURCA) outfit = /obj/outfit/admin/moghes_mikuetz - possible_species = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR) + possible_species = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT) allow_appearance_change = APPEARANCE_PLASTICSURGERY assigned_role = "Mi'kuetz Wanderer" diff --git a/maps/random_ruins/exoplanets/ouerea/ouerea_freewater.dm b/maps/random_ruins/exoplanets/ouerea/ouerea_freewater.dm index cc7506492d1..50dcd5c0695 100644 --- a/maps/random_ruins/exoplanets/ouerea/ouerea_freewater.dm +++ b/maps/random_ruins/exoplanets/ouerea/ouerea_freewater.dm @@ -30,7 +30,7 @@ max_count = 4 spawnpoints = list("ouerea_freewater") - possible_species = list(SPECIES_UNATHI, SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_VAURCA_WARRIOR) + possible_species = list(SPECIES_UNATHI, SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT) allow_appearance_change = APPEARANCE_PLASTICSURGERY outfit = /obj/outfit/admin/freewater @@ -60,7 +60,8 @@ l_pocket = /obj/item/storage/wallet/random l_ear = null species_shoes = list( - SPECIES_VAURCA_WARRIOR = /obj/item/clothing/shoes/vaurca + SPECIES_VAURCA_WARRIOR = /obj/item/clothing/shoes/vaurca, + SPECIES_VAURCA_ATTENDANT = /obj/item/clothing/shoes/vaurca ) /obj/outfit/admin/freewater/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) diff --git a/maps/random_ruins/exoplanets/uueoaesa/pid_kois_farm.dm b/maps/random_ruins/exoplanets/uueoaesa/pid_kois_farm.dm index 3ed48b718ff..dd364268a2c 100644 --- a/maps/random_ruins/exoplanets/uueoaesa/pid_kois_farm.dm +++ b/maps/random_ruins/exoplanets/uueoaesa/pid_kois_farm.dm @@ -51,7 +51,7 @@ max_count = 1 uses_species_whitelist = TRUE - possible_species = list(SPECIES_VAURCA_WARRIOR) + possible_species = list(SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT) mob_name_pick_message = "Pick a Vaurca Warrior name." welcome_message = "You are a Warrior of the Hive K'lax, tasked with protecting a k'ois farm on Pid. Ensure the safety of the Workers and Bulwarks at this location."