Makes Vaurca Breeders selectable in character setup (#12658)

This commit is contained in:
Casper3667
2021-10-29 12:59:35 -03:00
committed by GitHub
parent e943d29332
commit e9251a3155
26 changed files with 252 additions and 60 deletions
+11 -4
View File
@@ -9,7 +9,8 @@
job_species_blacklist = list(
"Consular Officer" = list(
SPECIES_VAURCA_WORKER,
SPECIES_VAURCA_WARRIOR
SPECIES_VAURCA_WARRIOR,
SPECIES_VAURCA_BULWARK
)
)
@@ -73,7 +74,9 @@
SPECIES_TAJARA_ZHAN,
SPECIES_UNATHI,
SPECIES_VAURCA_WORKER,
SPECIES_VAURCA_WARRIOR
SPECIES_VAURCA_WARRIOR,
SPECIES_VAURCA_BULWARK,
SPECIES_VAURCA_BREEDER
)
)
@@ -127,7 +130,9 @@
SPECIES_TAJARA_ZHAN,
SPECIES_UNATHI,
SPECIES_VAURCA_WORKER,
SPECIES_VAURCA_WARRIOR
SPECIES_VAURCA_WARRIOR,
SPECIES_VAURCA_BULWARK,
SPECIES_VAURCA_BREEDER
)
)
@@ -180,7 +185,9 @@
SPECIES_TAJARA_MSAI,
SPECIES_TAJARA_ZHAN,
SPECIES_VAURCA_WORKER,
SPECIES_VAURCA_WARRIOR
SPECIES_VAURCA_WARRIOR,
SPECIES_VAURCA_BULWARK,
SPECIES_VAURCA_BREEDER
)
)
+3 -1
View File
@@ -25,7 +25,9 @@
SPECIES_TAJARA_ZHAN,
SPECIES_UNATHI,
SPECIES_VAURCA_WORKER,
SPECIES_VAURCA_WARRIOR
SPECIES_VAURCA_WARRIOR,
SPECIES_VAURCA_BULWARK,
SPECIES_VAURCA_BREEDER
)
)
@@ -27,7 +27,9 @@
SPECIES_TAJARA_ZHAN,
SPECIES_UNATHI,
SPECIES_VAURCA_WORKER,
SPECIES_VAURCA_WARRIOR
SPECIES_VAURCA_WARRIOR,
SPECIES_VAURCA_BULWARK,
SPECIES_VAURCA_BREEDER
)
)
@@ -26,6 +26,8 @@
SPECIES_UNATHI,
SPECIES_VAURCA_WORKER,
SPECIES_VAURCA_WARRIOR,
SPECIES_VAURCA_BULWARK,
SPECIES_VAURCA_BREEDER,
SPECIES_TAJARA_ZHAN,
SPECIES_TAJARA_MSAI
)
@@ -80,6 +82,8 @@
SPECIES_UNATHI,
SPECIES_VAURCA_WORKER,
SPECIES_VAURCA_WARRIOR,
SPECIES_VAURCA_BULWARK,
SPECIES_VAURCA_BREEDER,
SPECIES_TAJARA_ZHAN,
SPECIES_TAJARA_MSAI
)
@@ -135,6 +139,8 @@
SPECIES_UNATHI,
SPECIES_VAURCA_WORKER,
SPECIES_VAURCA_WARRIOR,
SPECIES_VAURCA_BULWARK,
SPECIES_VAURCA_BREEDER,
SPECIES_TAJARA_ZHAN,
SPECIES_TAJARA_MSAI
)
@@ -26,7 +26,9 @@
SPECIES_TAJARA_MSAI,
SPECIES_TAJARA_ZHAN,
SPECIES_VAURCA_WORKER,
SPECIES_VAURCA_WARRIOR
SPECIES_VAURCA_WARRIOR,
SPECIES_VAURCA_BULWARK,
SPECIES_VAURCA_BREEDER
)
)
+149 -25
View File
@@ -26,7 +26,10 @@
SPECIES_TAJARA,
SPECIES_TAJARA_MSAI,
SPECIES_TAJARA_ZHAN,
SPECIES_UNATHI
SPECIES_UNATHI,
SPECIES_VAURCA_WORKER,
SPECIES_VAURCA_WARRIOR,
SPECIES_VAURCA_BULWARK
)
)
@@ -45,8 +48,7 @@
"Sell [rand(3,6)] copies of the Tau Ceti Foreign Legion pamphlets, 10 credits each")
else
rep_objectives = pick("Question Non-Vaurcan employees about Vaurcan employees, looking for areas of improvement",
"Protect and promote the public image of the Zo'ra hive to all Nanotrasen employees",
"Question Non-Vaurcan employees about Vaurcan employees, looking for areas of improvement")
"Protect and promote the public image of the Zo'ra hive to all Nanotrasen employees")
return rep_objectives
@@ -56,35 +58,157 @@
uniform = /obj/item/clothing/under/gearharness
glasses = null
l_hand = null
backpack_contents = list()
head = /obj/item/clothing/head/vaurca_breeder
shoes = /obj/item/clothing/shoes/vaurca/breeder
mask = /obj/item/clothing/mask/breath/vaurca/filter
suit = /obj/item/clothing/suit/vaurca/breeder
/datum/outfit/job/representative/consular/zora/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
if(H && !visualsOnly)
if(isvaurca(H))
var/r = H.r_skin
var/g = H.g_skin
var/b = H.b_skin
H.set_species(SPECIES_VAURCA_BREEDER)
H.unEquip(H.back)
H.unEquip(H.shoes)
qdel(H.wear_mask)
H.equip_to_slot_or_del(new /obj/item/storage/backpack/typec(H), slot_back)
H.equip_to_slot_or_del(new /obj/item/clothing/mask/breath/vaurca/filter(H), slot_wear_mask)
var/obj/item/organ/vaurca/preserve/preserve = H.internal_organs_by_name[BP_PHORON_RESERVE]
H.internal = preserve
H.internals.icon_state = "internal1"
H.equip_to_slot_or_del(new /obj/item/clothing/head/vaurca_breeder(H), slot_head)
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/vaurca/breeder(H), slot_shoes)
H.equip_to_slot_or_del(new /obj/item/clothing/suit/vaurca/breeder(H), slot_wear_suit)
H.equip_to_slot_or_del(new /obj/item/storage/box/tcfl_pamphlet(H), slot_in_backpack)
H.change_skin_color(r, g, b)
H.update_dna()
addtimer(CALLBACK(src, .proc/send_representative_mission, H), 5 MINUTES)
return TRUE
/datum/citizenship/klax
name = CITIZENSHIP_KLAX
description = "The second Hive discovered by humanity, Hiveship, Klozxera, appeared in the Skrellian system of Glorashi. \
Klax is known as a client state of the Zora, but since the Exodus from Sedantis they have struggled for political independence. \
Now parting their own ways, both Hives have developed differently. the Klax became the newest vassal of the Izweski Nation, and have largely settled in Tret. \
They maintain subtly warm, if terse relations with the Hegemony as a whole, and have committed to its terraforming agenda, being instrumental in the implementation of such a monumental undertaking. \
The Klax are the most technologically developed Hive, and are leading the way in reconstructing the species superior technology."
consular_outfit = /datum/outfit/job/representative/consular/klax
job_species_blacklist = list(
"Consular Officer" = list(
SPECIES_HUMAN,
SPECIES_HUMAN_OFFWORLD,
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_SKRELL,
SPECIES_SKRELL_AXIORI,
SPECIES_TAJARA,
SPECIES_TAJARA_MSAI,
SPECIES_TAJARA_ZHAN,
SPECIES_UNATHI,
SPECIES_VAURCA_WORKER,
SPECIES_VAURCA_WARRIOR,
SPECIES_VAURCA_BULWARK
)
)
/datum/citizenship/klax/get_objectives(mission_level, var/mob/living/carbon/human/H)
var/rep_objectives
switch(mission_level)
if(REPRESENTATIVE_MISSION_HIGH)
rep_objectives = pick("Collect evidence of Nanotrasen being unfair or bigoted to Vaurca employees, to be used as leverage in future hive labor negotiations",
"Develop a metric to grade the performance of different Vaurca broods that share a job")
if(REPRESENTATIVE_MISSION_MEDIUM)
rep_objectives = pick("Assist K'lax Nanotrasen personnel in their avowal process",
"Promote [rand(3,6)] amount of K'laxan products, be it energy drinks or merchandise")
else
rep_objectives = pick("Question Non-Vaurcan employees about Vaurcan employees, looking for areas of improvement",
"Protect and promote the public image of the K'lax hive to all Nanotrasen employees")
return rep_objectives
/datum/outfit/job/representative/consular/klax
name = "K'lax Consular Officer"
uniform = /obj/item/clothing/under/gearharness
glasses = null
head = /obj/item/clothing/head/klax_breeder
shoes = /obj/item/clothing/shoes/vaurca/breeder_klax
mask = /obj/item/clothing/mask/breath/vaurca/filter
suit = /obj/item/clothing/suit/vaurca/breeder_klax
/datum/outfit/job/representative/consular/klax/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
if(H && !visualsOnly)
if(isvaurca(H))
H.equip_to_slot_or_del(new /obj/item/storage/backpack/typec_klax(H), slot_back)
addtimer(CALLBACK(src, .proc/send_representative_mission, H), 5 MINUTES)
return TRUE
/datum/citizenship/cthur
name = CITIZENSHIP_CTHUR
description = "They are the third Hive that has developed relationships with other sophonts of the Orion Spur. \
While their arrival was kept in secret by the Jargon Federation, the revelation has reignited diplomatic disputes between Klax and Cthur, with outright hostility met by the Klax towards the Cthur. \
Unlike all other hives, the Cthur are led by their original Hive Queen, who, with a council of three other Lesser Queens, leads the Hive in this new age. \
In this effort, the Hive has begun dealing with the multitude of governments and corporations of the galaxy, all under the auspices of their Skrellian saviors. \
The Cthur are the most economically developed hive, having stakes in Einstein Engines and Zeng-Hu Pharmaceuticals."
consular_outfit = /datum/outfit/job/representative/consular/cthur
job_species_blacklist = list(
"Consular Officer" = list(
SPECIES_HUMAN,
SPECIES_HUMAN_OFFWORLD,
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_SKRELL,
SPECIES_SKRELL_AXIORI,
SPECIES_TAJARA,
SPECIES_TAJARA_MSAI,
SPECIES_TAJARA_ZHAN,
SPECIES_UNATHI,
SPECIES_VAURCA_WORKER,
SPECIES_VAURCA_WARRIOR,
SPECIES_VAURCA_BULWARK
)
)
/datum/citizenship/cthur/get_objectives(mission_level, var/mob/living/carbon/human/H)
var/rep_objectives
switch(mission_level)
if(REPRESENTATIVE_MISSION_HIGH)
rep_objectives = pick("Collect evidence of Nanotrasen being unfair or bigoted to Vaurca employees, to be used as leverage in future hive labor negotiations",
"Develop a metric to grade the performance of different Vaurca broods that share a job")
if(REPRESENTATIVE_MISSION_MEDIUM)
rep_objectives = pick("Assist C'thur Nanotrasen personnel in their avowal process",
"Promote [rand(3,6)] amount of C'thuric products, be it energy drinks or merchandise")
else
rep_objectives = pick("Question Non-Vaurcan employees about Vaurcan employees, looking for areas of improvement",
"Protect and promote the public image of the C'thur hive to all Nanotrasen employees")
return rep_objectives
/datum/outfit/job/representative/consular/cthur
name = "C'thur Consular Officer"
uniform = /obj/item/clothing/under/gearharness
glasses = null
head = /obj/item/clothing/head/cthur_breeder
shoes = /obj/item/clothing/shoes/vaurca/breeder_cthur
mask = /obj/item/clothing/mask/breath/vaurca/filter
suit = /obj/item/clothing/suit/vaurca/breeder_cthur
/datum/outfit/job/representative/consular/cthur/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
if(H && !visualsOnly)
if(isvaurca(H))
H.equip_to_slot_or_del(new /obj/item/storage/backpack/typec_cthur(H), slot_back)
addtimer(CALLBACK(src, .proc/send_representative_mission, H), 5 MINUTES)
return TRUE
+2
View File
@@ -15,6 +15,8 @@
#define CITIZENSHIP_NKA "New Kingdom of Adhomai"
#define CITIZENSHIP_ZORA "Zo'ra Hive"
#define CITIZENSHIP_KLAX "K'lax Hive"
#define CITIZENSHIP_CTHUR "C'thur Hive"
#define CITIZENSHIP_NONE "None"
#define CITIZENSHIP_GOLDEN "Golden Deep"