diff --git a/aurorastation.dme b/aurorastation.dme index dc3a005e7bd..9c6cb19dac5 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -1486,6 +1486,7 @@ #include "code\modules\clothing\clothing_accessories.dm" #include "code\modules\clothing\ears\antennae.dm" #include "code\modules\clothing\ears\bandanna.dm" +#include "code\modules\clothing\ears\bulwark.dm" #include "code\modules\clothing\ears\earmuffs.dm" #include "code\modules\clothing\ears\earrings.dm" #include "code\modules\clothing\ears\skrell.dm" diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index 521b410b4d4..8f4ea9f5cd2 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -658,6 +658,9 @@ icon_state = "cape" item_state = "cape" sprite_sheets = list(BODYTYPE_VAURCA = 'icons/mob/species/vaurca/back.dmi') + sprite_sheets = list( + BODYTYPE_VAURCA_BULWARK = 'icons/mob/species/bulwark/back.dmi' + ) var/hooded = FALSE /obj/item/storage/backpack/cloak/verb/toggle_cloak_hood() diff --git a/code/game/objects/items/weapons/vaurca_items.dm b/code/game/objects/items/weapons/vaurca_items.dm index 5a503c948ff..5d6f656d454 100644 --- a/code/game/objects/items/weapons/vaurca_items.dm +++ b/code/game/objects/items/weapons/vaurca_items.dm @@ -27,7 +27,10 @@ icon_state = "shaper_helmet" item_state = "shaper_helmet" contained_sprite = TRUE - species_restricted = list(BODYTYPE_VAURCA) + sprite_sheets = list( + BODYTYPE_VAURCA_BULWARK = 'icons/mob/species/bulwark/head.dmi' + ) + species_restricted = list(BODYTYPE_VAURCA, BODYTYPE_VAURCA_BULWARK) body_parts_covered = HEAD|FACE|EYES /obj/item/clothing/head/expression diff --git a/code/modules/client/preference_setup/loadout/loadout_augments.dm b/code/modules/client/preference_setup/loadout/loadout_augments.dm index ea01c8bc46a..ecd38897c4d 100644 --- a/code/modules/client/preference_setup/loadout/loadout_augments.dm +++ b/code/modules/client/preference_setup/loadout/loadout_augments.dm @@ -5,7 +5,7 @@ cost = 1 augment = TRUE sort_category = "Augments" - 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) + 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) flags = GEAR_NO_SELECTION /datum/gear/augment/eye_sensors @@ -100,27 +100,27 @@ 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_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, 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_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, 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_SKRELL, SPECIES_SKRELL_AXIORI) + whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI) faction = "Zeng-Hu Pharmaceuticals" /datum/gear/augment/emotional_manipulator 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_SKRELL, SPECIES_SKRELL_AXIORI) + whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI) faction = "Zeng-Hu Pharmaceuticals" /datum/gear/augment/enhanced_vision 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_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_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 @@ -128,7 +128,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_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_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 @@ -136,7 +136,7 @@ display_name = "zeng-hu veterancy plate" 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/zenghu_plate - whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, 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_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" /datum/gear/augment/corrective_lenses diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno.dm b/code/modules/client/preference_setup/loadout/loadout_xeno.dm index 5f9d5b3cf8a..fd9bdadca87 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno.dm @@ -9,14 +9,14 @@ display_name = "cloth footwraps" path = /obj/item/clothing/shoes/footwraps sort_category = "Xenowear" - whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_UNATHI, SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI) + whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, 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/toeless display_name = "toe-less jackboots" path = /obj/item/clothing/shoes/jackboots/toeless sort_category = "Xenowear" - whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_UNATHI, SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI) + whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_UNATHI, SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI) /datum/gear/shoes/caligae display_name = "caligae selection" @@ -37,7 +37,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_UNATHI, SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI) + whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_UNATHI, SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI) sort_category = "Xenowear" /datum/gear/shoes/toeless/New() diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno/skrell.dm b/code/modules/client/preference_setup/loadout/loadout_xeno/skrell.dm index c23c4ac90fe..4986542f614 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno/skrell.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno/skrell.dm @@ -57,7 +57,7 @@ /datum/gear/accessory/capes display_name = "shoulder capes" path = /obj/item/clothing/accessory/poncho/shouldercape - whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI) + whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_DIONA, SPECIES_DIONA_COEUS) sort_category = "Xenowear - Skrell" /datum/gear/accessory/capes/New() @@ -85,7 +85,7 @@ /datum/gear/skrell_projector display_name = "nralakk projector" path = /obj/item/skrell_projector - whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI) + whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_DIONA, SPECIES_DIONA_COEUS) sort_category = "Xenowear - Skrell" /datum/gear/ears/skrell/goop @@ -120,7 +120,7 @@ display_name = "jargon federation passport" path = /obj/item/clothing/accessory/badge/passport/jargon sort_category = "Xenowear - Skrell" - whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER, SPECIES_DIONA) + whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_BULWARK, SPECIES_DIONA, SPECIES_DIONA_COEUS) flags = GEAR_NO_SELECTION cost = 0 @@ -138,14 +138,14 @@ // 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_DIONA) + 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) 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/jargon/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_DIONA = "_d") + 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/tag = species_name_to_tag[H.species.name] if(tag) J.species_tag = tag diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno/vaurca.dm b/code/modules/client/preference_setup/loadout/loadout_xeno/vaurca.dm index 05421579fc4..95610be6450 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno/vaurca.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno/vaurca.dm @@ -36,7 +36,7 @@ /datum/gear/head/shaper display_name = "shaper helmet" path = /obj/item/clothing/head/shaper - whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR) + whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK) sort_category = "Xenowear - Vaurca" flags = GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION @@ -44,7 +44,7 @@ display_name = "tunnel cloak (recolourable)" path = /obj/item/storage/backpack/cloak cost = 1 - whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR) + whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK) sort_category = "Xenowear - Vaurca" flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION @@ -52,7 +52,7 @@ display_name = "tunnel cloak selection" path = /obj/item/storage/backpack/cloak cost = 1 - whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR) + whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK) sort_category = "Xenowear - Vaurca" flags = GEAR_HAS_DESC_SELECTION @@ -96,7 +96,7 @@ display_name = "shaper robes" path = /obj/item/clothing/suit/vaurca/shaper slot = slot_wear_suit - whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR) + whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK) sort_category = "Xenowear - Vaurca" cost = 1 flags = GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION @@ -168,3 +168,12 @@ sortTim(lunchboxes, /proc/cmp_text_asc) gear_tweaks += new /datum/gear_tweak/path(lunchboxes) gear_tweaks += new /datum/gear_tweak/contents(lunchables_vaurca(), lunchables_vaurca_snack(), lunchables_drinks(), lunchables_utensil()) + +/datum/gear/ears/vaurca/rings + display_name = "bulwark horn rings" + description = "Rings worn by Bulwarks to decorate their horns." + cost = 1 + path = /obj/item/clothing/ears/bulwark/rings + sort_category = "Xenowear - Vaurca" + whitelisted = list(SPECIES_VAURCA_BULWARK) + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION \ No newline at end of file diff --git a/code/modules/clothing/ears/bulwark.dm b/code/modules/clothing/ears/bulwark.dm new file mode 100644 index 00000000000..10cefa6ddba --- /dev/null +++ b/code/modules/clothing/ears/bulwark.dm @@ -0,0 +1,21 @@ +/obj/item/clothing/ears/bulwark + name = "bulwark horn wear" + desc = "Some stuff worn by Bulwarks to adorn their horns." + icon = 'icons/obj/vaurca_items.dmi' + sprite_sheets = list( + BODYTYPE_VAURCA_BULWARK = 'icons/mob/species/bulwark/horns.dmi' + ) + w_class = ITEMSIZE_TINY + slot_flags = SLOT_HEAD | SLOT_EARS + species_restricted = list(BODYTYPE_VAURCA_BULWARK) + +/obj/item/clothing/ears/bandanna/get_ear_examine_text(var/mob/user, var/ear_text = "left") + return "around [user.get_pronoun("his")] horns" + +/obj/item/clothing/ears/bulwark/rings + name = "bulwark horn rings" + desc = "Rings worn by Bulwarks to decorate their horns." + icon_state = "horn_rings" + item_state = "horn_rings" + drop_sound = 'sound/items/drop/accessory.ogg' + pickup_sound = 'sound/items/pickup/accessory.ogg' \ No newline at end of file diff --git a/code/modules/clothing/ears/earrings.dm b/code/modules/clothing/ears/earrings.dm index 3f966c9f684..1cfa7262cc2 100644 --- a/code/modules/clothing/ears/earrings.dm +++ b/code/modules/clothing/ears/earrings.dm @@ -14,4 +14,4 @@ name = "dangle earrings" desc = "A pair of small dangle earrings." icon_state = "ear_dangle" - item_state = "ear_dangle" + item_state = "ear_dangle" \ No newline at end of file diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index 0eec562ff4a..3d70dd16055 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -603,6 +603,9 @@ BLIND // can't see anything icon = 'icons/obj/vaurca_items.dmi' icon_state = "blinders" item_state = "blinders" + sprite_sheets = list( + BODYTYPE_VAURCA_BULWARK = 'icons/mob/species/bulwark/eyes.dmi' + ) contained_sprite = TRUE shatter_material = FALSE drop_sound = 'sound/items/drop/gloves.ogg' diff --git a/code/modules/clothing/shoes/jobs.dm b/code/modules/clothing/shoes/jobs.dm index 15b146a7632..3714b4b76e6 100644 --- a/code/modules/clothing/shoes/jobs.dm +++ b/code/modules/clothing/shoes/jobs.dm @@ -50,6 +50,9 @@ icon_state = "jackboots_toeless" species_restricted = null sprite_sheets = list(BODYTYPE_TAJARA = 'icons/mob/species/tajaran/shoes.dmi') + sprite_sheets = list( + BODYTYPE_VAURCA_BULWARK = 'icons/mob/species/bulwark/shoes.dmi' + ) /obj/item/clothing/shoes/jackboots/toeless/knee name = "knee-high toeless black boots" @@ -90,6 +93,9 @@ icon_state = "workboots_toeless" species_restricted = null sprite_sheets = list(BODYTYPE_TAJARA = 'icons/mob/species/tajaran/shoes.dmi') + sprite_sheets = list( + BODYTYPE_VAURCA_BULWARK = 'icons/mob/species/bulwark/shoes.dmi' + ) /obj/item/clothing/shoes/workboots/grey name = "grey workboots" diff --git a/code/modules/clothing/suits/xeno/vaurca.dm b/code/modules/clothing/suits/xeno/vaurca.dm index e0afe4e5135..f7479231345 100644 --- a/code/modules/clothing/suits/xeno/vaurca.dm +++ b/code/modules/clothing/suits/xeno/vaurca.dm @@ -27,7 +27,10 @@ desc = "Commonly worn by Preimmients, these robes are meant to catch pheromones, obfuscating hive affiliation." icon_state = "shaper_robes" item_state = "shaper_robes" - species_restricted = list(BODYTYPE_VAURCA) + sprite_sheets = list( + BODYTYPE_VAURCA_BULWARK = 'icons/mob/species/bulwark/suit.dmi' + ) + species_restricted = list(BODYTYPE_VAURCA, BODYTYPE_VAURCA_BULWARK) /obj/item/clothing/suit/vaurca/breeder name = "zo'ra representative clothes" diff --git a/code/modules/organs/subtypes/augment.dm b/code/modules/organs/subtypes/augment.dm index e1bccbd60ee..a1f28e8be75 100644 --- a/code/modules/organs/subtypes/augment.dm +++ b/code/modules/organs/subtypes/augment.dm @@ -624,6 +624,9 @@ desc = " 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." icon_state = "zenghu_plate" on_mob_icon = 'icons/mob/human_races/augments_external.dmi' + sprite_sheets = list( + BODYTYPE_VAURCA_BULWARK = 'icons/mob/species/bulwark/augments_external.dmi' + ) parent_organ = BP_HEAD /obj/item/organ/internal/augment/head_fluff diff --git a/html/changelogs/desven-morebully.yml b/html/changelogs/desven-morebully.yml new file mode 100644 index 00000000000..e873be250bf --- /dev/null +++ b/html/changelogs/desven-morebully.yml @@ -0,0 +1,14 @@ +author: Desven +delete-after: True +changes: + - rscadd: "Added work overalls and the skirtsuit for Bulwark Vaurca." + - rscadd: "Added Shaper sprites and cloak tunnels for the Bulwark Vaurca." + - rscadd: "Added the veterancy plate for the Bulwark Vaurca." + - rscadd: "Added a new type of item, the horn adorns, for Bulwark Vaurca. Currently you can choose recolourable rings from the loadout." + - rscadd: "Both Diona subspecies can choose Skrell shoulder capes and projector from the loadout." + - bugfix: "Fixed toeless workboots not working for Bulwark Vaurca." + - bugfix: "Fixed augments not working for Bulwark Vaurca." + - bugfix: "Fixed the Jargon passport not being selectable for Bulwark Vaurca and Diona Coeus." + - bugfix: "Fixed blinders not properly working for the Bulwark Vaurca." + - bugfix: "Fixed the purple suit not showing for the Bulwark Vaurca." + - bugfix: "Fixed some stray pixels in the miner's cloak tunnel sprite." \ No newline at end of file diff --git a/icons/mob/species/bulwark/augments_external.dmi b/icons/mob/species/bulwark/augments_external.dmi new file mode 100644 index 00000000000..853fcbbc1cd Binary files /dev/null and b/icons/mob/species/bulwark/augments_external.dmi differ diff --git a/icons/mob/species/bulwark/back.dmi b/icons/mob/species/bulwark/back.dmi index 58b6717eb86..dba6f421cad 100644 Binary files a/icons/mob/species/bulwark/back.dmi and b/icons/mob/species/bulwark/back.dmi differ diff --git a/icons/mob/species/bulwark/eyes.dmi b/icons/mob/species/bulwark/eyes.dmi new file mode 100644 index 00000000000..471e7b6d6c0 Binary files /dev/null and b/icons/mob/species/bulwark/eyes.dmi differ diff --git a/icons/mob/species/bulwark/head.dmi b/icons/mob/species/bulwark/head.dmi index ad8640bff88..15346ef6852 100644 Binary files a/icons/mob/species/bulwark/head.dmi and b/icons/mob/species/bulwark/head.dmi differ diff --git a/icons/mob/species/bulwark/horns.dmi b/icons/mob/species/bulwark/horns.dmi new file mode 100644 index 00000000000..c5734993620 Binary files /dev/null and b/icons/mob/species/bulwark/horns.dmi differ diff --git a/icons/mob/species/bulwark/suit.dmi b/icons/mob/species/bulwark/suit.dmi index 24be809ab2d..24b84d34c7b 100644 Binary files a/icons/mob/species/bulwark/suit.dmi and b/icons/mob/species/bulwark/suit.dmi differ diff --git a/icons/mob/species/bulwark/uniform.dmi b/icons/mob/species/bulwark/uniform.dmi index ccc41a74344..bbfb2cdea57 100644 Binary files a/icons/mob/species/bulwark/uniform.dmi and b/icons/mob/species/bulwark/uniform.dmi differ diff --git a/icons/mob/species/vaurca/back.dmi b/icons/mob/species/vaurca/back.dmi index d392c0d00df..e1bfdd63b2a 100644 Binary files a/icons/mob/species/vaurca/back.dmi and b/icons/mob/species/vaurca/back.dmi differ diff --git a/icons/obj/vaurca_items.dmi b/icons/obj/vaurca_items.dmi index 677d924075f..c7925b251d0 100644 Binary files a/icons/obj/vaurca_items.dmi and b/icons/obj/vaurca_items.dmi differ