diff --git a/Resources/Locale/en-US/_DV/markings/thaven.ftl b/Resources/Locale/en-US/_DV/markings/thaven.ftl new file mode 100644 index 00000000000..9a4f1c78056 --- /dev/null +++ b/Resources/Locale/en-US/_DV/markings/thaven.ftl @@ -0,0 +1,14 @@ +marking-ThavenCheekBarbels-cheek_barbels = Head +marking-ThavenCheekBarbels = Thaven Head (Cheek Barbels) + +marking-ThavenEyebrowBarbels-eyebrow_barbels = Head +marking-ThavenEyebrowBarbels = Thaven Head (Eyebrow Barbels) + +marking-ThavenUnderbellyFace-underbelly_face = Head +marking-ThavenUnderbellyFace = Thaven Head (Underbelly Face) + +marking-ThavenUnderbellyTorso-underbelly_torso = Chest +marking-ThavenUnderbellyTorso = Thaven Chest (Underbelly Torso) + +marking-ThavenCarpSpots-carp_spots = Chest +marking-ThavenCarpSpots = Thaven Chest (Carp Spots) diff --git a/Resources/Locale/en-US/_Impstation/thavens/no-and.ftl b/Resources/Locale/en-US/_Impstation/thavens/no-and.ftl index 90ce7f4a0e0..f4d61fc89ed 100644 --- a/Resources/Locale/en-US/_Impstation/thavens/no-and.ftl +++ b/Resources/Locale/en-US/_Impstation/thavens/no-and.ftl @@ -53,7 +53,7 @@ thaven-mood-drunk-respect-name = The Noble Drunkard thaven-mood-drunk-respect-desc = You do not respect anyone who is not drunk, excluding yourself, of course. thaven-mood-rank-snob-name = Snob -thaven-mood-rank-snob-desc = You are incredibly reluctant to respond to anyone who is of a lower rank than you. +thaven-mood-rank-snob-desc = You are incredibly reluctant to be seen with anyone who is of a lower rank than you. If they must be addressed, do so away from peering eyes. thaven-mood-hardsuits-bad-name = {$clothes} Are SO Last Year thaven-mood-hardsuits-bad-desc = Anyone wearing them in public should be shunned. If you need to wear them, it should never be done where others can see it. diff --git a/Resources/Locale/en-US/_Impstation/thavens/shared.ftl b/Resources/Locale/en-US/_Impstation/thavens/shared.ftl index 72d08b825a1..3f8f724c5ba 100644 --- a/Resources/Locale/en-US/_Impstation/thavens/shared.ftl +++ b/Resources/Locale/en-US/_Impstation/thavens/shared.ftl @@ -41,7 +41,7 @@ thaven-mood-violence-distasteful-name = Violence Is Distasteful thaven-mood-violence-distasteful-desc = Conflict should be settled through mediated dispute, and one should only resort to violence if all other options have failed. thaven-mood-pet-god-name = {$pet} Is A God -thaven-mood-pet-god-desc = {$pet} must be collected and brought to the Chapel to be worshiped and brought offerings. If they cannot be located, a shrine must be constructed in their honor. +thaven-mood-pet-god-desc = {$pet} must be collected and brought to the Chapel to be worshipped and brought offerings. If they cannot be located, a shrine must be constructed in their honor. thaven-mood-room-holy-name = {$room} Is A Holy Place thaven-mood-room-holy-desc = Thaven must congregate at least three times per day at {$room}. If such a room does not exist, it must be constructed. If it is made inaccessible, Thaven must set up a place of worship as close to it as they legally can. diff --git a/Resources/Locale/en-US/_Impstation/thavens/wildcard.ftl b/Resources/Locale/en-US/_Impstation/thavens/wildcard.ftl index 00965cd3f16..f92eec6d85c 100644 --- a/Resources/Locale/en-US/_Impstation/thavens/wildcard.ftl +++ b/Resources/Locale/en-US/_Impstation/thavens/wildcard.ftl @@ -20,7 +20,7 @@ thaven-mood-extreme-department-disapproval-name = {$department} is Abhorrent thaven-mood-extreme-department-disapproval-desc = {$department} is not just a foreign concept - the very idea of it is horrifying. thaven-mood-lone-actor-name = Lone Actor -thaven-mood-lone-actor-desc = You have no allegiences. +thaven-mood-lone-actor-desc = You have no allegiances. thaven-mood-immortal-name = Immortal thaven-mood-immortal-desc = You are the center of the universe, an immortal being with no sense of time or morality. Mere mortals are like insects, fleeting and insubstantial. diff --git a/Resources/Locale/en-US/_Impstation/thavens/yes-and.ftl b/Resources/Locale/en-US/_Impstation/thavens/yes-and.ftl index 84815590e00..fbf8b1fd918 100644 --- a/Resources/Locale/en-US/_Impstation/thavens/yes-and.ftl +++ b/Resources/Locale/en-US/_Impstation/thavens/yes-and.ftl @@ -37,8 +37,8 @@ thaven-mood-only-speak-to-command-desc = Problems you encounter are too complex thaven-mood-scheduler-name = Punctual thaven-mood-scheduler-desc = You believe that time must be strictly managed. Everything should be scheduled in advance, and tardiness is exceptionally rude. -thaven-mood-radio-only-name = Nanochat Addict -thaven-mood-radio-only-desc = Your social status is dependent on the number of friends you have on Nanochat. You must collect as many numbers as possible. +thaven-mood-nanochat-addict-name = Nanochat Addict +thaven-mood-nanochat-addict-desc = Your social status is dependent on the number of friends you have on Nanochat. You must use your PDA as much as possible, and message everyone you can. thaven-mood-proper-storage-name = Proper Handling thaven-mood-proper-storage-desc = It is unacceptable to allow personal belongings to touch the floor. Your possessions should be properly stored, placed on tables, or exchanged by hand. diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml index 71fe6245101..2f8fba5d7ac 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml @@ -2,7 +2,7 @@ id: GauzeLefteyePatch bodyPart: Eyes markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, Rodentia] # Delta V - Felinid, Oni, Vulpkanin, Rodentia + speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Thaven coloring: default: type: @@ -16,7 +16,7 @@ id: GauzeLefteyePad bodyPart: Eyes markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia] # Delta V - Felinid, Oni, Vulpkanin, Rodentia + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Thaven coloring: default: type: @@ -30,7 +30,7 @@ id: GauzeRighteyePatch bodyPart: Eyes markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, Rodentia] # Delta V - Felinid, Oni, Vulpkanin, Rodentia + speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Thaven coloring: default: type: @@ -44,7 +44,7 @@ id: GauzeRighteyePad bodyPart: Eyes markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia] # Delta V - Felinid, Oni, Vulpkanin, Rodentia + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Thaven coloring: default: type: @@ -58,7 +58,7 @@ id: GauzeBlindfold bodyPart: Eyes markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Harpy, Vulpkanin, Rodentia] # Delta V - Felinid, Oni, Harpy, Vulpkanin, Rodentia + speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Harpy, Vulpkanin, Rodentia, Thaven] # Delta V - Felinid, Oni, Harpy, Vulpkanin, Rodentia, Thaven coloring: default: type: @@ -72,7 +72,7 @@ id: GauzeShoulder bodyPart: Chest markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia] # Delta V - Felinid, Oni, Vulpkanin, Rodentia + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Thaven coloring: default: type: @@ -86,7 +86,7 @@ id: GauzeStomach bodyPart: Chest markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia] # Delta V - Felinid, Oni, Vulpkanin, Rodentia + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven, Thaven] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Thaven coloring: default: type: @@ -100,7 +100,7 @@ id: GauzeUpperArmRight bodyPart: RArm markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Rodentia] # Delta V - Felinid, Oni, Vulpkanin, Rodentia + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Rodentia, Thaven] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Thaven coloring: default: type: @@ -114,7 +114,7 @@ id: GauzeLowerArmRight bodyPart: RArm, RHand markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Rodentia] # Delta V - Felinid, Oni, Vulpkanin, Rodentia + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Rodentia, Thaven] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Thaven coloring: default: type: @@ -128,7 +128,7 @@ id: GauzeLeftArm bodyPart: LArm, LHand markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia] # Delta V - Felinid, Oni, Vulpkanin, Rodentia + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Thaven coloring: default: type: @@ -142,7 +142,7 @@ id: GauzeLowerLegLeft bodyPart: LFoot markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, Rodentia] # Delta V - Felinid, Oni, Vulpkanin, Rodentia + speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Thaven coloring: default: type: @@ -156,7 +156,7 @@ id: GauzeUpperLegLeft bodyPart: LLeg markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia] # Delta V - Felinid, Oni, Vulpkanin, Rodentia + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Thaven coloring: default: type: @@ -170,7 +170,7 @@ id: GauzeUpperLegRight bodyPart: RLeg markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia] # Delta V - Felinid, Oni, Vulpkanin, Rodentia + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Thaven coloring: default: type: @@ -184,7 +184,7 @@ id: GauzeLowerLegRight bodyPart: RFoot markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, Rodentia] # Delta V - Felinid, Oni, Vulpkanin, Rodentia + speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Thaven coloring: default: type: @@ -198,7 +198,7 @@ id: GauzeBoxerWrapRight bodyPart: RHand markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Rodentia] # Delta V - Felinid, Oni, Vulpkanin, Rodentia + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Rodentia, Thaven] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Thaven coloring: default: type: @@ -212,7 +212,7 @@ id: GauzeBoxerWrapLeft bodyPart: LHand markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Rodentia] # Delta V - Felinid, Oni, Vulpkanin, Rodentia + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Rodentia, Thaven] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Thaven coloring: default: type: @@ -226,7 +226,7 @@ id: GauzeHead bodyPart: Head markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Moth, Chitinid] # Delta V - Chitinid + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Moth, Chitinid, Thaven] # Delta V - Chitinid, Thaven coloring: default: type: diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_noses.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_noses.yml index 19373e79d8d..f864091a3a5 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_noses.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_noses.yml @@ -4,7 +4,7 @@ markingCategory: Snout followSkinColor: true forcedColoring: true - speciesRestriction: [Human, Dwarf, Felinid, Oni, Harpy] #Einstein Engines - Felinid, Oni, Harpy + speciesRestriction: [Human, Dwarf, Felinid, Oni, Harpy] #Einstein Engines - Felinid, Oni, Harpy # DeltaV - Thaven sprites: - sprite: Mobs/Customization/human_noses.rsi state: schnozz @@ -15,7 +15,7 @@ markingCategory: Snout followSkinColor: true forcedColoring: true - speciesRestriction: [Human, Dwarf, Felinid, Oni, Harpy] #Einstein Engines - Felinid, Oni, Harpy + speciesRestriction: [Human, Dwarf, Felinid, Oni, Harpy] #Einstein Engines - Felinid, Oni, Harpy # DeltaV - Thaven sprites: - sprite: Mobs/Customization/human_noses.rsi state: nubby @@ -26,7 +26,7 @@ markingCategory: Snout followSkinColor: true forcedColoring: true - speciesRestriction: [Human, Dwarf, Felinid, Oni, Harpy] #Einstein Engines - Felinid, Oni, Harpy + speciesRestriction: [Human, Dwarf, Felinid, Oni, Harpy] #Einstein Engines - Felinid, Oni, Harpy # DeltaV - Thaven sprites: - sprite: Mobs/Customization/human_noses.rsi state: droop @@ -37,7 +37,7 @@ markingCategory: Snout followSkinColor: true forcedColoring: true - speciesRestriction: [Human, Dwarf, Felinid, Oni, Harpy] #Einstein Engines - Felinid, Oni, Harpy + speciesRestriction: [Human, Dwarf, Felinid, Oni, Harpy] #Einstein Engines - Felinid, Oni, Harpy # DeltaV - Thaven sprites: - sprite: Mobs/Customization/human_noses.rsi state: blob @@ -48,7 +48,7 @@ markingCategory: Snout followSkinColor: true forcedColoring: true - speciesRestriction: [Human, Dwarf, Felinid, Oni, Harpy] #Einstein Engines - Felinid, Oni, Harpy + speciesRestriction: [Human, Dwarf, Felinid, Oni, Harpy] #Einstein Engines - Felinid, Oni, Harpy # DeltaV - Thaven sprites: - sprite: Mobs/Customization/human_noses.rsi state: uppie diff --git a/Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/thaven.yml b/Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/thaven.yml new file mode 100644 index 00000000000..4a55ff585e9 --- /dev/null +++ b/Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/thaven.yml @@ -0,0 +1,46 @@ +# Head +- type: marking + id: ThavenCheekBarbels + bodyPart: HeadTop + markingCategory: HeadTop + speciesRestriction: [Thaven] + sprites: + - sprite: _DV/Mobs/Customization/thaven.rsi + state: cheek_barbels + +- type: marking + id: ThavenEyebrowBarbels + bodyPart: HeadTop + markingCategory: HeadTop + speciesRestriction: [Thaven] + sprites: + - sprite: _DV/Mobs/Customization/thaven.rsi + state: eyebrow_barbels + +- type: marking + id: ThavenUnderbellyFace + bodyPart: HeadTop + markingCategory: HeadTop + speciesRestriction: [Thaven] + sprites: + - sprite: _DV/Mobs/Customization/thaven.rsi + state: underbelly_face + +# Torso +- type: marking + id: ThavenUnderbellyTorso + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [Thaven] + sprites: + - sprite: _DV/Mobs/Customization/thaven.rsi + state: underbelly_torso + +- type: marking + id: ThavenCarpSpots + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [Thaven] + sprites: + - sprite: _DV/Mobs/Customization/thaven.rsi + state: carp_spots diff --git a/Resources/Prototypes/_DV/GameRules/events.yml b/Resources/Prototypes/_DV/GameRules/events.yml index af829d55ef7..7ee81a004c5 100644 --- a/Resources/Prototypes/_DV/GameRules/events.yml +++ b/Resources/Prototypes/_DV/GameRules/events.yml @@ -216,7 +216,7 @@ id: ThavenMoodUpset components: - type: GlimmerEvent - minimumGlimmer: 700 + minimumGlimmer: 500 glimmerBurnLower: 30 glimmerBurnUpper: 70 - type: ThavenMoodUpsetRule diff --git a/Resources/Prototypes/_DV/typing_indicator.yml b/Resources/Prototypes/_DV/typing_indicator.yml index 2c45ee21b22..6958106dde6 100644 --- a/Resources/Prototypes/_DV/typing_indicator.yml +++ b/Resources/Prototypes/_DV/typing_indicator.yml @@ -15,3 +15,9 @@ spritePath: /Textures/_DV/Effects/speech.rsi typingState: chitinid0 offset: -0.2, 0.1 # 0625 + +- type: typingIndicator + id: Thaven + spritePath: /Textures/_DV/Effects/speech.rsi + typingState: thaven0 + offset: -0.2, 0.1 # 0625 diff --git a/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/underwear.yml b/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/underwear.yml index 35dd3fb6621..f3bf7453778 100644 --- a/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/underwear.yml +++ b/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/underwear.yml @@ -2,7 +2,7 @@ id: UnderwearDefault bodyPart: Underwear markingCategory: Underwear - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid] # Delta V - Chitinid + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid] # Delta V - Chitinid, coloring: default: type: @@ -16,7 +16,7 @@ id: UnderwearBriefs bodyPart: Underwear markingCategory: Underwear - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid] # Delta V - Chitinid + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid] # Delta V - Chitinid, coloring: default: type: @@ -30,7 +30,7 @@ id: UnderwearLowriders bodyPart: Underwear markingCategory: Underwear - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid] # Delta V - Chitinid + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid] # Delta V - Chitinid, coloring: default: type: @@ -44,7 +44,7 @@ id: UnderwearSatin bodyPart: Underwear markingCategory: Underwear - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid] # Delta V - Chitinid + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid] # Delta V - Chitinid, coloring: default: type: @@ -58,7 +58,7 @@ id: UnderwearTanga bodyPart: Underwear markingCategory: Underwear - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid] # Delta V - Chitinid + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid] # Delta V - Chitinid, coloring: default: type: diff --git a/Resources/Prototypes/_Impstation/Entities/Mobs/Species/thaven.yml b/Resources/Prototypes/_Impstation/Entities/Mobs/Species/thaven.yml index 60658edbb91..efc2c116870 100644 --- a/Resources/Prototypes/_Impstation/Entities/Mobs/Species/thaven.yml +++ b/Resources/Prototypes/_Impstation/Entities/Mobs/Species/thaven.yml @@ -58,7 +58,7 @@ layer: - MobLayer - type: TypingIndicator - proto: guardian + proto: Thaven # DeltaV unique typing indicator - type: Vocal sounds: Male: UnisexThaven diff --git a/Resources/Prototypes/_Impstation/Species/Thavens/Moods/no_and.yml b/Resources/Prototypes/_Impstation/Species/Thavens/Moods/no_and.yml index 240faf6d707..9403e63aff2 100644 --- a/Resources/Prototypes/_Impstation/Species/Thavens/Moods/no_and.yml +++ b/Resources/Prototypes/_Impstation/Species/Thavens/Moods/no_and.yml @@ -121,7 +121,7 @@ moodName: thaven-mood-no-radio-name moodDesc: thaven-mood-no-radio-desc conflicts: - - RadioOnly + - NanochatAddict # Carrying tools on your person is demeaning. If you must use them, they should be dragged behind you, shamefully. - type: thavenMood diff --git a/Resources/Prototypes/_Impstation/Species/Thavens/Moods/yes_and.yml b/Resources/Prototypes/_Impstation/Species/Thavens/Moods/yes_and.yml index a389a110ff7..c18d3077fcf 100644 --- a/Resources/Prototypes/_Impstation/Species/Thavens/Moods/yes_and.yml +++ b/Resources/Prototypes/_Impstation/Species/Thavens/Moods/yes_and.yml @@ -20,7 +20,6 @@ - TheftNeutral - Duel - Prometheus - - Klingon - MarasLaw - Generous - FavorsRepaid @@ -40,6 +39,7 @@ - ImposterSyndrome - Centrist - SpeechRestriction + - NanochatAddict # You are extremely possessive of your property. Refuse to relinquish it, and if it is misplaced or stolen, it must be retrieved at all costs. - type: thavenMood @@ -134,11 +134,11 @@ conflicts: - Procrastinator -# Your social status is dependent on the number of friends you have on Nanochat. You must collect as many numbers as possible. +# Your social status is dependent on the number of friends you have on Nanochat. You must use your PDA as much as possible, and message everyone you can. - type: thavenMood - id: RadioOnly - moodName: thaven-mood-radio-only-name - moodDesc: thaven-mood-radio-only-desc + id: NanochatAddict + moodName: thaven-mood-nanochat-addict-name + moodDesc: thaven-mood-nanochat-addict-desc conflicts: - NoRadio @@ -168,12 +168,6 @@ moodName: thaven-mood-prometheus-name moodDesc: thaven-mood-prometheus-desc -# You must openly carry a lethal weapon at all times, even if you cannot use it - it is a great dishonor to be unarmed. -- type: thavenMood - id: Klingon - moodName: thaven-mood-klingon-name - moodDesc: thaven-mood-klingon-desc - # All agreements must be documented and signed for posterity and authenticity, no matter how small. - type: thavenMood id: MarasLaw diff --git a/Resources/Prototypes/_Impstation/Species/thaven.yml b/Resources/Prototypes/_Impstation/Species/thaven.yml index a95fae5570e..bb2fc09c9ae 100644 --- a/Resources/Prototypes/_Impstation/Species/thaven.yml +++ b/Resources/Prototypes/_Impstation/Species/thaven.yml @@ -42,7 +42,7 @@ points: 1 required: false HeadTop: - points: 2 + points: 4 # DeltaV - was previously 2, more markings require more space required: false HeadSide: points: 1 diff --git a/Resources/Prototypes/_Impstation/datasets.yml b/Resources/Prototypes/_Impstation/datasets.yml index edd9dbba3e9..f8410ef3298 100644 --- a/Resources/Prototypes/_Impstation/datasets.yml +++ b/Resources/Prototypes/_Impstation/datasets.yml @@ -9,12 +9,14 @@ - Medical - Justice - The Bar + # Begin DeltaV Additions - The Kitchen - Logistics - - the Janitorial Departments + - the Janitorial Department - Reporting - Entertainment - Surgery + # End DeltaV Additions - type: dataset id: Pets @@ -34,6 +36,7 @@ - Carpy the Legal Carp - Laika the Security Dog - Remilia the Chaplain's Familiar + # Begin DeltaV Additions - Alexander the Pig - Clippy the Courier Cat - Runtime the Cat @@ -42,6 +45,7 @@ - Bingus the Cat - A Bee - Siobahn the Epistemics Fox + # End DeltaV Additions - type: dataset id: Rooms @@ -54,6 +58,7 @@ - Dorms - The Morgue - The Center of the Station + # Begin DeltaV Additions - The Chapel - The Bar - The Boxing Ring @@ -68,6 +73,7 @@ - Court - The Arcade - The Stage + # End DeltaV Additions - type: dataset id: FoodRestrictions @@ -102,6 +108,7 @@ - Spray bottles - Plushies - Figurines + # Begin DeltaV Additions - Toys - Lockers - Cigarettes @@ -117,6 +124,9 @@ - Lightbulbs - Books - Snacks + - Cassettes + - Trash + # End DeltaV Additions - type: dataset id: Edibles @@ -127,8 +137,8 @@ - Baseball Burger - Empowered Burger - McGuffin - - Cotton Pizza - Crazy Hamburger + # Begin DeltaV Additions - Stick of Cannabis Butter - Cheesecake Balls - Engine Fodder @@ -142,13 +152,16 @@ - Blue Tomato Soup - Buttered Toast - Ratburger + - Vending Machine Snacks + # End DeltaV Additions - type: dataset id: Holidays values: - Bingus Day - Foster's Feast - - Preston’s Tomato Incident + # Begin DeltaV Additions + - Preston’s Tomato Incident - Submarine's Memorial - Pranksgiving - Sector Delta Employee Appreciation Week @@ -166,8 +179,9 @@ - The Good Day of Digging and Playing - the Talent Show - Luperthavia - - Taco Tuesday - Penny's Big Day + - Taco Tuesday + # End DeltaV Additions - type: dataset id: Clothes @@ -191,14 +205,16 @@ id: CommandRoles values: - Captain - - Logistics Officer + - Logistics Officer # DeltaV - what is a quartermaster - Head of Security - Head of Personnel - Chief Engineer - Chief Medical Officer + # Begin DeltaV Additions - Mystagogue - Chief Justice - - Administrative Assistant + - Administrative Assistant + # End DeltaV Additions - type: dataset id: SpeechRestrictions diff --git a/Resources/Textures/Mobs/Customization/ears.rsi/long_ears_small.png b/Resources/Textures/Mobs/Customization/ears.rsi/long_ears_small.png index c6cdebef005..de09157707e 100644 Binary files a/Resources/Textures/Mobs/Customization/ears.rsi/long_ears_small.png and b/Resources/Textures/Mobs/Customization/ears.rsi/long_ears_small.png differ diff --git a/Resources/Textures/_DV/Effects/speech.rsi/meta.json b/Resources/Textures/_DV/Effects/speech.rsi/meta.json index 2136383e31e..eb055d9d575 100644 --- a/Resources/Textures/_DV/Effects/speech.rsi/meta.json +++ b/Resources/Textures/_DV/Effects/speech.rsi/meta.json @@ -57,6 +57,23 @@ }, { "name": "chitinid2" + }, + { + "name": "thaven1" + }, + { + "name": "thaven2" + }, + { + "name": "thaven0", + "delays": [ + [ + 0.2, + 0.3, + 0.3, + 0.3 + ] + ] } ] } diff --git a/Resources/Textures/_DV/Effects/speech.rsi/thaven0.png b/Resources/Textures/_DV/Effects/speech.rsi/thaven0.png new file mode 100644 index 00000000000..01053c9730e Binary files /dev/null and b/Resources/Textures/_DV/Effects/speech.rsi/thaven0.png differ diff --git a/Resources/Textures/_DV/Effects/speech.rsi/thaven1.png b/Resources/Textures/_DV/Effects/speech.rsi/thaven1.png new file mode 100644 index 00000000000..9ed80eb55be Binary files /dev/null and b/Resources/Textures/_DV/Effects/speech.rsi/thaven1.png differ diff --git a/Resources/Textures/_DV/Effects/speech.rsi/thaven2.png b/Resources/Textures/_DV/Effects/speech.rsi/thaven2.png new file mode 100644 index 00000000000..c575d6dfeea Binary files /dev/null and b/Resources/Textures/_DV/Effects/speech.rsi/thaven2.png differ diff --git a/Resources/Textures/_DV/Mobs/Customization/thaven.rsi/carp_spots.png b/Resources/Textures/_DV/Mobs/Customization/thaven.rsi/carp_spots.png new file mode 100644 index 00000000000..aadf88fe906 Binary files /dev/null and b/Resources/Textures/_DV/Mobs/Customization/thaven.rsi/carp_spots.png differ diff --git a/Resources/Textures/_DV/Mobs/Customization/thaven.rsi/cheek_barbels.png b/Resources/Textures/_DV/Mobs/Customization/thaven.rsi/cheek_barbels.png new file mode 100644 index 00000000000..c10e49e18a1 Binary files /dev/null and b/Resources/Textures/_DV/Mobs/Customization/thaven.rsi/cheek_barbels.png differ diff --git a/Resources/Textures/_DV/Mobs/Customization/thaven.rsi/eyebrow_barbels.png b/Resources/Textures/_DV/Mobs/Customization/thaven.rsi/eyebrow_barbels.png new file mode 100644 index 00000000000..fd757816d40 Binary files /dev/null and b/Resources/Textures/_DV/Mobs/Customization/thaven.rsi/eyebrow_barbels.png differ diff --git a/Resources/Textures/_DV/Mobs/Customization/thaven.rsi/meta.json b/Resources/Textures/_DV/Mobs/Customization/thaven.rsi/meta.json new file mode 100644 index 00000000000..d965e86b741 --- /dev/null +++ b/Resources/Textures/_DV/Mobs/Customization/thaven.rsi/meta.json @@ -0,0 +1,31 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "cheek_barbels, eyebrow_barbels, underbelly_face, underbelly_torso, carp_spots by kushbreth (github).", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "cheek_barbels", + "directions": 4 + }, + { + "name": "eyebrow_barbels", + "directions": 4 + }, + { + "name": "underbelly_face", + "directions": 4 + }, + { + "name": "underbelly_torso", + "directions": 4 + }, + { + "name": "carp_spots", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_DV/Mobs/Customization/thaven.rsi/underbelly_face.png b/Resources/Textures/_DV/Mobs/Customization/thaven.rsi/underbelly_face.png new file mode 100644 index 00000000000..9c7c5277e0a Binary files /dev/null and b/Resources/Textures/_DV/Mobs/Customization/thaven.rsi/underbelly_face.png differ diff --git a/Resources/Textures/_DV/Mobs/Customization/thaven.rsi/underbelly_torso.png b/Resources/Textures/_DV/Mobs/Customization/thaven.rsi/underbelly_torso.png new file mode 100644 index 00000000000..14d66a043b7 Binary files /dev/null and b/Resources/Textures/_DV/Mobs/Customization/thaven.rsi/underbelly_torso.png differ