Vaurca Breeder Resprite (#14368)

This commit is contained in:
Wowzewow (Wezzy)
2022-07-02 18:26:50 +08:00
committed by GitHub
parent 1c527e8b67
commit 197eb2bbaa
22 changed files with 189 additions and 106 deletions
+2 -1
View File
@@ -1573,6 +1573,7 @@
#include "code\modules\clothing\head\xenos\skrell.dm"
#include "code\modules\clothing\head\xenos\tajara.dm"
#include "code\modules\clothing\head\xenos\unathi.dm"
#include "code\modules\clothing\head\xenos\vaurca.dm"
#include "code\modules\clothing\masks\boxing.dm"
#include "code\modules\clothing\masks\breath.dm"
#include "code\modules\clothing\masks\gasmask.dm"
@@ -1591,8 +1592,8 @@
#include "code\modules\clothing\shoes\jobs.dm"
#include "code\modules\clothing\shoes\magboots.dm"
#include "code\modules\clothing\shoes\miscellaneous.dm"
#include "code\modules\clothing\shoes\vaurca.dm"
#include "code\modules\clothing\shoes\xeno\tajara.dm"
#include "code\modules\clothing\shoes\xeno\vaurca.dm"
#include "code\modules\clothing\spacesuits\breaches.dm"
#include "code\modules\clothing\spacesuits\miscellaneous.dm"
#include "code\modules\clothing\spacesuits\spacesuits.dm"
@@ -493,7 +493,7 @@
/obj/item/storage/backpack/typec
icon = 'icons/mob/species/breeder/inventory.dmi'
name = "type c zo'ra wings"
name = "breeder zo'ra wings"
desc = "The wings of a CB Caste Vaurca. They are far too small at this stage to permit sustained periods of flight in most situations."
icon_state = "wings"
item_state = "wings"
@@ -503,32 +503,38 @@
canremove = 0
species_restricted = list(BODYTYPE_VAURCA_BREEDER)
sprite_sheets = list(BODYTYPE_VAURCA_BREEDER = 'icons/mob/species/breeder/back.dmi')
var/wings
/obj/item/storage/backpack/typec_klax
/obj/item/storage/backpack/typec/klax
icon = 'icons/mob/species/breeder/inventory.dmi'
name = "type c k'lax wings"
name = "breeder k'lax wings"
desc = "The wings of a CB Caste Vaurca. They are far too small at this stage to permit sustained periods of flight in most situations."
icon_state = "wings_klax"
item_state = "wings_klax"
w_class = ITEMSIZE_HUGE
slot_flags = SLOT_BACK
max_storage_space = 12
canremove = 0
species_restricted = list(BODYTYPE_VAURCA_BREEDER)
sprite_sheets = list(BODYTYPE_VAURCA_BREEDER = 'icons/mob/species/breeder/back.dmi')
/obj/item/storage/backpack/typec_cthur
/obj/item/storage/backpack/typec/cthur
icon = 'icons/mob/species/breeder/inventory.dmi'
name = "type c c'thur wings"
name = "breeder c'thur wings"
desc = "The wings of a CB Caste Vaurca. They are far too small at this stage to permit sustained periods of flight in most situations."
icon_state = "wings_cthur"
item_state = "wings_cthur"
w_class = ITEMSIZE_HUGE
slot_flags = SLOT_BACK
max_storage_space = 12
canremove = 0
species_restricted = list(BODYTYPE_VAURCA_BREEDER)
sprite_sheets = list(BODYTYPE_VAURCA_BREEDER = 'icons/mob/species/breeder/back.dmi')
/obj/item/storage/backpack/typec/verb/toggle_wings()
set name = "Spread Wings"
set desc = "Spread your wings."
set category = "Object"
set src in usr
if(use_check_and_message(usr))
return 0
wings = !wings
playsound(src.loc, 'sound/items/storage/wings.ogg', 50)
to_chat(usr, "You [wings ? "extend" : "collapse"] your [src].")
icon_state = "[initial(icon_state)][wings ? "_open" : ""]"
item_state = "icon_state"
var/mob/living/carbon/human/H = src.loc
H.update_icon()
H.update_inv_back()
/obj/item/storage/backpack/service
name = "idris service backpack"
+14 -2
View File
@@ -27,8 +27,7 @@
SPECIES_UNATHI,
SPECIES_VAURCA_WORKER,
SPECIES_VAURCA_WARRIOR,
SPECIES_VAURCA_BULWARK,
SPECIES_VAURCA_BREEDER
SPECIES_VAURCA_BULWARK
)
)
@@ -56,6 +55,19 @@
uniform = /obj/item/clothing/under/skrell
/datum/outfit/job/representative/consular/jargon/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
if(H && !visualsOnly)
if(isvaurca(H)) // there should be a system for this but for now this will have to do i guess
H.equip_to_slot_or_del(new /obj/item/clothing/under/gearharness(H), slot_w_uniform)
H.equip_to_slot_or_del(new /obj/item/clothing/head/vaurca_breeder/jargon(H), slot_head)
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/vaurca/breeder/jargon(H), slot_shoes)
H.equip_to_slot_or_del(new /obj/item/clothing/mask/breath/vaurca/filter(H), slot_wear_mask)
H.equip_to_slot_or_del(new /obj/item/clothing/suit/vaurca/breeder/jargon(H), slot_wear_suit)
H.equip_to_slot_or_del(new /obj/item/storage/backpack/typec/cthur(H), slot_back)
else
addtimer(CALLBACK(src, .proc/send_representative_mission, H), 5 MINUTES)
return TRUE
/datum/citizenship/epsilon
name = CITIZENSHIP_EUM
description = "An independent nation on the edge of Skrell space, the Co-Operative Territories of Epsilon Ursae Minoris, \
@@ -128,16 +128,16 @@
uniform = /obj/item/clothing/under/gearharness
glasses = null
head = /obj/item/clothing/head/klax_breeder
shoes = /obj/item/clothing/shoes/vaurca/breeder_klax
head = /obj/item/clothing/head/vaurca_breeder/klax
shoes = /obj/item/clothing/shoes/vaurca/breeder/klax
mask = /obj/item/clothing/mask/breath/vaurca/filter
suit = /obj/item/clothing/suit/vaurca/breeder_klax
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)
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
@@ -199,14 +199,14 @@
uniform = /obj/item/clothing/under/gearharness
glasses = null
head = /obj/item/clothing/head/cthur_breeder
shoes = /obj/item/clothing/shoes/vaurca/breeder_cthur
head = /obj/item/clothing/head/vaurca_breeder/cthur
shoes = /obj/item/clothing/shoes/vaurca/breeder/cthur
mask = /obj/item/clothing/mask/breath/vaurca/filter
suit = /obj/item/clothing/suit/vaurca/breeder_cthur
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)
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
return TRUE
@@ -11,19 +11,19 @@
name = "C'thur Brood"
desc = "The brood of the High Queen C'thur. Due to the Queen's health, many remain near Diulszi."
possible_accents = list(ACCENT_CTHUR, ACCENT_TTS)
possible_citizenships = list(CITIZENSHIP_CTHUR)
possible_citizenships = list(CITIZENSHIP_CTHUR, CITIZENSHIP_JARGON)
possible_religions = list(RELIGION_HIVEPANTHEON, RELIGION_PREIMMINENNCE, RELIGION_NONE)
/decl/origin_item/origin/mouv_b
name = "Mouv Brood"
desc = "Her brood leads Vaurca scientific research in Skrellian space, and is also brokering deals with the Eridani Federation. She is also known for purchasing a portion of Einstein Engines."
possible_accents = list(ACCENT_CTHUR, ACCENT_TTS)
possible_citizenships = list(CITIZENSHIP_CTHUR)
possible_citizenships = list(CITIZENSHIP_CTHUR, CITIZENSHIP_JARGON)
possible_religions = list(RELIGION_HIVEPANTHEON, RELIGION_PREIMMINENNCE, RELIGION_NONE)
/decl/origin_item/origin/vytel_b
name = "Vytel Brood"
desc = "Known for upholding the law, Vytel is the Warrior brood of the C'thur. They are spread within Jargon space, the Eridani Federation, and the Corporate Reconstruction Zone."
possible_accents = list(ACCENT_CTHUR, ACCENT_TTS)
possible_citizenships = list(CITIZENSHIP_CTHUR)
possible_citizenships = list(CITIZENSHIP_CTHUR, CITIZENSHIP_JARGON)
possible_religions = list(RELIGION_HIVEPANTHEON, RELIGION_PREIMMINENNCE, RELIGION_NONE)
@@ -3,6 +3,7 @@
desc = "The new High Queen of the K'lax, the Zkaii Brood is often mocked for their eccentric Mother Dream religion. Many still remain within Tret and other Izweski territories."
possible_origins = list(
/decl/origin_item/origin/zkaii_b,
/decl/origin_item/origin/leto_b,
/decl/origin_item/origin/vedhra_b,
/decl/origin_item/origin/tupii_b
)
@@ -14,7 +15,7 @@
possible_citizenships = list(CITIZENSHIP_KLAX)
possible_religions = list(RELIGION_PILOTDREAM)
/decl/origin_item/origin/leto_b
/decl/origin_item/origin/leto_b
name = "Leto Brood" //jared?
desc = "The brood is mostly known for their archeological work and their production of k'ois in Pid, a moon near Tret."
possible_accents = list(ACCENT_KLAX, ACCENT_TTS)
-30
View File
@@ -537,36 +537,6 @@
cold_protection = HEAD
min_cold_protection_temperature = SPACE_HELMET_MIN_COLD_PROTECTION_TEMPERATURE
/obj/item/clothing/head/vaurca_breeder
name = "zo'ra representative shroud"
desc = "Large shroud used by Zo'ra representatives."
icon = 'icons/mob/species/breeder/inventory.dmi'
item_state = "shroud"
icon_state = "shroud"
contained_sprite = FALSE
species_restricted = list(BODYTYPE_VAURCA_BREEDER)
sprite_sheets = list(BODYTYPE_VAURCA_BREEDER = 'icons/mob/species/breeder/head.dmi')
/obj/item/clothing/head/klax_breeder
name = "k'lax represenatitve shroud"
desc = "Large shroud used by K'lax representatives."
icon = 'icons/mob/species/breeder/inventory.dmi'
item_state = "shroud_klax"
icon_state = "shroud_klax"
contained_sprite = FALSE
species_restricted = list(BODYTYPE_VAURCA_BREEDER)
sprite_sheets = list(BODYTYPE_VAURCA_BREEDER = 'icons/mob/species/breeder/head.dmi')
/obj/item/clothing/head/cthur_breeder
name = "c'thur representative shroud"
desc = "Large shroud used by C'thur representatives."
icon = 'icons/mob/species/breeder/inventory.dmi'
item_state = "shroud_cthur"
icon_state = "shroud_cthur"
contained_sprite = FALSE
species_restricted = list(BODYTYPE_VAURCA_BREEDER)
sprite_sheets = list(BODYTYPE_VAURCA_BREEDER = 'icons/mob/species/breeder/head.dmi')
/obj/item/clothing/head/sol
name = "sol navy utility cover"
desc = "A military cover issued to Sol Alliance navy members as part of their field uniform."
@@ -0,0 +1,27 @@
/obj/item/clothing/head/vaurca_breeder
name = "zo'ra representative shroud"
desc = "Large shroud used by Zo'ra representatives."
icon = 'icons/mob/species/breeder/inventory.dmi'
item_state = "hive_rep_shroud"
icon_state = "hive_rep_shroud"
contained_sprite = FALSE
species_restricted = list(BODYTYPE_VAURCA_BREEDER)
sprite_sheets = list(BODYTYPE_VAURCA_BREEDER = 'icons/mob/species/breeder/head.dmi')
/obj/item/clothing/head/vaurca_breeder/klax
name = "k'lax represenatitve shroud"
desc = "Large shroud used by K'lax representatives."
item_state = "hive_rep_shroud_klax"
icon_state = "hive_rep_shroud_klax"
/obj/item/clothing/head/vaurca_breeder/cthur
name = "c'thur representative shroud"
desc = "Large shroud used by C'thur representatives."
item_state = "hive_rep_shroud_cthur"
icon_state = "hive_rep_shroud_cthur"
/obj/item/clothing/head/vaurca_breeder/jargon
name = "jargon representative shroud"
desc = "Large shroud used by Jargon representatives."
item_state = "hive_rep_shroud_jargon"
icon_state = "hive_rep_shroud_jargon"
@@ -23,34 +23,28 @@
name = "zo'ra representative shoes"
desc = "Large shoes used by Zo'ra representatives."
icon = 'icons/mob/species/breeder/inventory.dmi'
item_state = "typec_shoes"
icon_state = "typec_shoes"
item_state = "hive_rep_shoes"
icon_state = "hive_rep_shoes"
contained_sprite = FALSE
species_restricted = list(BODYTYPE_VAURCA_BREEDER)
sprite_sheets = list(BODYTYPE_VAURCA_BREEDER = 'icons/mob/species/breeder/shoes.dmi')
worn_overlay = null
build_from_parts = FALSE
/obj/item/clothing/shoes/vaurca/breeder_klax
/obj/item/clothing/shoes/vaurca/breeder/klax
name = "k'lax representative shoes"
desc = "Large shoes used by K'lax representatives."
icon = 'icons/mob/species/breeder/inventory.dmi'
item_state = "typec_shoes_klax"
icon_state = "typec_shoes_klax"
contained_sprite = FALSE
species_restricted = list(BODYTYPE_VAURCA_BREEDER)
sprite_sheets = list(BODYTYPE_VAURCA_BREEDER = 'icons/mob/species/breeder/shoes.dmi')
worn_overlay = null
build_from_parts = FALSE
item_state = "hive_rep_shoes_klax"
icon_state = "hive_rep_shoes_klax"
/obj/item/clothing/shoes/vaurca/breeder_cthur
/obj/item/clothing/shoes/vaurca/breeder/cthur
name = "c'thur representative shoes"
desc = "Large shoes used by C'thur representatives."
icon = 'icons/mob/species/breeder/inventory.dmi'
item_state = "typec_shoes_cthur"
icon_state = "typec_shoes_cthur"
contained_sprite = FALSE
species_restricted = list(BODYTYPE_VAURCA_BREEDER)
sprite_sheets = list(BODYTYPE_VAURCA_BREEDER = 'icons/mob/species/breeder/shoes.dmi')
worn_overlay = null
build_from_parts = FALSE
item_state = "hive_rep_shoes_cthur"
icon_state = "hive_rep_shoes_cthur"
/obj/item/clothing/shoes/vaurca/breeder/jargon
name = "jargon representative shoes"
desc = "Large shoes used by Jargon representatives."
item_state = "hive_rep_shoes_jargon"
icon_state = "hive_rep_shoes_jargon"
+14 -17
View File
@@ -36,28 +36,25 @@
name = "zo'ra representative clothes"
desc = "A large piece of clothing used by Zo'ra representatives."
icon = 'icons/mob/species/breeder/inventory.dmi'
item_state = "representative_clothes"
icon_state = "representative_clothes"
item_state = "hive_rep_clothes"
icon_state = "hive_rep_clothes"
contained_sprite = FALSE
species_restricted = list(BODYTYPE_VAURCA_BREEDER)
sprite_sheets = list(BODYTYPE_VAURCA_BREEDER = 'icons/mob/species/breeder/suit.dmi')
/obj/item/clothing/suit/vaurca/breeder_klax
/obj/item/clothing/suit/vaurca/breeder/klax
name = "k'lax representative clothes"
desc = "A large piece of clothing used by K'lax representatives."
icon = 'icons/mob/species/breeder/inventory.dmi'
item_state = "representative_clothes_klax"
icon_state = "representative_clothes_klax"
contained_sprite = FALSE
species_restricted = list(BODYTYPE_VAURCA_BREEDER)
sprite_sheets = list(BODYTYPE_VAURCA_BREEDER = 'icons/mob/species/breeder/suit.dmi')
/obj/item/clothing/suit/vaurca/breeder_cthur
item_state = "hive_rep_clothes_klax"
icon_state = "hive_rep_clothes_klax"
/obj/item/clothing/suit/vaurca/breeder/cthur
name = "c'thur representative clothes"
desc = "A large piece of clothing used by C'thur representatives."
icon = 'icons/mob/species/breeder/inventory.dmi'
item_state = "representative_clothes_cthur"
icon_state = "representative_clothes_cthur"
contained_sprite = FALSE
species_restricted = list(BODYTYPE_VAURCA_BREEDER)
sprite_sheets = list(BODYTYPE_VAURCA_BREEDER = 'icons/mob/species/breeder/suit.dmi')
item_state = "hive_rep_clothes_cthur"
icon_state = "hive_rep_clothes_cthur"
/obj/item/clothing/suit/vaurca/breeder/jargon
name = "jargon representative clothes"
desc = "A large piece of clothing used by Jargon representatives."
item_state = "hive_rep_clothes_jargon"
icon_state = "hive_rep_clothes_jargon"
@@ -1784,7 +1784,7 @@ Follow by example and make good judgement based on length which list to include
icon = 'icons/mob/hair_gradients.dmi'
species_allowed = list(/datum/species/human,/datum/species/human/offworlder,/datum/species/machine/shell,/datum/species/machine/shell/rogue,/datum/species/zombie,
/datum/species/tajaran,/datum/species/tajaran/zhan_khazan,/datum/species/tajaran/m_sai,/datum/species/zombie/tajara,
/datum/species/skrell, /datum/species/skrell/axiori, /datum/species/zombie/skrell, /datum/species/bug, /datum/species/bug/type_b, /datum/species/unathi,/datum/species/zombie/unathi)
/datum/species/skrell, /datum/species/skrell/axiori, /datum/species/zombie/skrell, /datum/species/bug, /datum/species/bug/type_b, /datum/species/unathi, /datum/species/zombie/unathi)
none
name = "None"
@@ -1793,6 +1793,12 @@ Follow by example and make good judgement based on length which list to include
/datum/species/tajaran,/datum/species/tajaran/zhan_khazan,/datum/species/tajaran/m_sai,/datum/species/zombie/tajara,/datum/species/skrell,/datum/species/skrell/axiori,/datum/species/zombie/skrell, /datum/species/bug,
/datum/species/bug/type_b)
none_48
name = "None"
icon = "icons/mob/base_48.dmi"
icon_state = "none"
species_allowed = list(/datum/species/bug/type_e, /datum/species/bug/type_c)
fade_up
name = "Fade (Up)"
icon_state = "fadeup"
@@ -1846,11 +1852,6 @@ Follow by example and make good judgement based on length which list to include
icon_state = "skr_headtail_mid"
species_allowed = list(/datum/species/skrell, /datum/species/skrell/axiori, /datum/species/zombie/skrell)
bulwark_default
name = "Bulwark Horn"
icon = "icons/mob/base_48.dmi"
icon_state = "blank"
species_allowed = list(/datum/species/bug/type_e)
/*
///////////////////////////////////
@@ -3220,6 +3221,36 @@ Follow by example and make good judgement based on length which list to include
chatname = "antennae"
length = 6
//Breeder antennae
breeder_standard
icon = 'icons/mob/human_face/breeder_hair.dmi'
name = "Breeder Standard Antennae"
icon_state = "breeder_standard"
species_allowed = list(/datum/species/bug/type_c)
gender = NEUTER
chatname = "antennae"
length = 3
breeder_quad
name = "Breeder Quad Antennae"
icon_state = "breeder_quad"
length = 3
breeder_crownedcrest
name = "Breeder Crowned Crest"
icon_state = "breeder_crownedcrest"
length = 1
breeder_hammerhead
name = "Breeder Hammerhead"
icon_state = "breeder_hammerhead"
length = 1
breeder_princess
name = "Breeder Princess Antennae"
icon_state = "breeder_princess"
length = 2
/datum/sprite_accessory/facial_hair
taj_goatee
icon = 'icons/mob/human_face/tajara_facial_hair.dmi'
+44
View File
@@ -0,0 +1,44 @@
################################
# 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
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
# balance
# admin
# backend
# security
# refactor
#################################
# Your name.
author: Wowzewow (Wezzy), Desven, Xev
# 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, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- imageadd: "Resprites the Vaurca Breeder and their clothes."
- rscadd: "Adds new Vaurca Breeder hairstyles."
- rscadd: "Vaurca Breeder wings can now open and close."
- bugfix: "Fixes Vaurca breeders having wrong origin cultures to choose from."
Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 366 B

After

Width:  |  Height:  |  Size: 363 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.1 KiB

After

Width:  |  Height:  |  Size: 9.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 6.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.9 KiB

After

Width:  |  Height:  |  Size: 6.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.7 KiB

After

Width:  |  Height:  |  Size: 7.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 696 B

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.