From d393a757f7ea520f0b9f97f7aeac3fdc17e3a769 Mon Sep 17 00:00:00 2001 From: kushbreth Date: Sat, 1 Mar 2025 19:29:20 -0600 Subject: [PATCH 1/9] mood sync, moodupset glimmer 500, speech bubble --- .../Locale/en-US/_DV/markings/thaven.ftl | 14 ++++++ .../en-US/_Impstation/thavens/no-and.ftl | 2 +- .../en-US/_Impstation/thavens/shared.ftl | 2 +- .../en-US/_Impstation/thavens/wildcard.ftl | 2 +- .../Mobs/Customization/Markings/gauze.yml | 34 ++++++------- .../Customization/Markings/human_noses.yml | 10 ++-- .../Mobs/Customization/Markings/thaven.yml | 46 ++++++++++++++++++ Resources/Prototypes/_DV/GameRules/events.yml | 2 +- Resources/Prototypes/_DV/typing_indicator.yml | 6 +++ .../Customization/Markings/undershirt.yml | 20 ++++---- .../Mobs/Customization/Markings/underwear.yml | 10 ++-- .../Entities/Mobs/Species/thaven.yml | 2 +- .../Species/Thavens/Moods/yes_and.yml | 6 --- .../Prototypes/_Impstation/Species/thaven.yml | 2 +- Resources/Prototypes/_Impstation/datasets.yml | 4 +- .../Textures/_DV/Effects/speech.rsi/meta.json | 17 +++++++ .../_DV/Effects/speech.rsi/thaven0.png | Bin 0 -> 758 bytes .../_DV/Effects/speech.rsi/thaven1.png | Bin 0 -> 626 bytes .../_DV/Effects/speech.rsi/thaven2.png | Bin 0 -> 626 bytes .../Customization/Thaven.rsi/carp_spots.png | Bin 0 -> 224 bytes .../Thaven.rsi/cheek_barbels.png | Bin 0 -> 180 bytes .../Thaven.rsi/eyebrow_barbels.png | Bin 0 -> 164 bytes .../Mobs/Customization/Thaven.rsi/meta.json | 31 ++++++++++++ .../Thaven.rsi/underbelly_face.png | Bin 0 -> 234 bytes .../Thaven.rsi/underbelly_torso.png | Bin 0 -> 406 bytes 25 files changed, 160 insertions(+), 50 deletions(-) create mode 100644 Resources/Locale/en-US/_DV/markings/thaven.ftl create mode 100644 Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/thaven.yml create mode 100644 Resources/Textures/_DV/Effects/speech.rsi/thaven0.png create mode 100644 Resources/Textures/_DV/Effects/speech.rsi/thaven1.png create mode 100644 Resources/Textures/_DV/Effects/speech.rsi/thaven2.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Thaven.rsi/carp_spots.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Thaven.rsi/cheek_barbels.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Thaven.rsi/eyebrow_barbels.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Thaven.rsi/meta.json create mode 100644 Resources/Textures/_DV/Mobs/Customization/Thaven.rsi/underbelly_face.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Thaven.rsi/underbelly_torso.png 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..786fa6ce70d --- /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) \ No newline at end of file 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/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..5bfb413a8a3 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, Thaven] #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, Thaven] #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, Thaven] #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, Thaven] #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, Thaven] #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..fdcdba4e091 --- /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/undershirt.yml b/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/undershirt.yml index 5161d4cb9bf..08239a24153 100644 --- a/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/undershirt.yml +++ b/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/undershirt.yml @@ -2,7 +2,7 @@ id: UndershirtDefault bodyPart: Undershirt markingCategory: Undershirt - 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, Thaven] # Delta V - Chitinid, Thaven coloring: default: type: @@ -16,7 +16,7 @@ id: UndershirtRolled bodyPart: Undershirt markingCategory: Undershirt - 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, Thaven] # Delta V - Chitinid, Thaven coloring: default: type: @@ -30,7 +30,7 @@ id: UndershirtSleeveless bodyPart: Undershirt markingCategory: Undershirt - 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, Thaven] # Delta V - Chitinid, Thaven coloring: default: type: @@ -44,7 +44,7 @@ id: UndershirtRolledSleeveless bodyPart: Undershirt markingCategory: Undershirt - 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, Thaven] # Delta V - Chitinid, Thaven coloring: default: type: @@ -58,7 +58,7 @@ id: UndershirtGrossSleeveless bodyPart: Undershirt markingCategory: Undershirt - 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, Thaven] # Delta V - Chitinid, Thaven coloring: default: type: @@ -72,7 +72,7 @@ id: UndershirtNanotrasen bodyPart: Undershirt markingCategory: Undershirt - 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, Thaven] # Delta V - Chitinid, Thaven coloring: default: type: @@ -86,7 +86,7 @@ id: UndershirtBinder bodyPart: Undershirt markingCategory: Undershirt - 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, Thaven] # Delta V - Chitinid, Thaven coloring: default: type: @@ -100,7 +100,7 @@ id: UndershirtBraClassic bodyPart: Undershirt markingCategory: Undershirt - 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, Thaven] # Delta V - Chitinid, Thaven coloring: default: type: @@ -114,7 +114,7 @@ id: UndershirtBraSports bodyPart: Undershirt markingCategory: Undershirt - 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, Thaven] # Delta V - Chitinid, Thaven coloring: default: type: @@ -128,7 +128,7 @@ id: UndershirtBraStrapless bodyPart: Undershirt markingCategory: Undershirt - 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, Thaven] # Delta V - Chitinid, Thaven coloring: default: type: diff --git a/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/underwear.yml b/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/underwear.yml index 35dd3fb6621..89979665cc7 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, Thaven] # Delta V - Chitinid, Thaven 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, Thaven] # Delta V - Chitinid, Thaven 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, Thaven] # Delta V - Chitinid, Thaven 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, Thaven] # Delta V - Chitinid, Thaven 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, Thaven] # Delta V - Chitinid, Thaven 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/yes_and.yml b/Resources/Prototypes/_Impstation/Species/Thavens/Moods/yes_and.yml index a389a110ff7..da84de1e35e 100644 --- a/Resources/Prototypes/_Impstation/Species/Thavens/Moods/yes_and.yml +++ b/Resources/Prototypes/_Impstation/Species/Thavens/Moods/yes_and.yml @@ -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..020d6fcb0c6 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 required: false HeadSide: points: 1 diff --git a/Resources/Prototypes/_Impstation/datasets.yml b/Resources/Prototypes/_Impstation/datasets.yml index edd9dbba3e9..76bfa1ea6b7 100644 --- a/Resources/Prototypes/_Impstation/datasets.yml +++ b/Resources/Prototypes/_Impstation/datasets.yml @@ -117,6 +117,8 @@ - Lightbulbs - Books - Snacks + - Cassettes + - Trash - type: dataset id: Edibles @@ -127,7 +129,6 @@ - Baseball Burger - Empowered Burger - McGuffin - - Cotton Pizza - Crazy Hamburger - Stick of Cannabis Butter - Cheesecake Balls @@ -142,6 +143,7 @@ - Blue Tomato Soup - Buttered Toast - Ratburger + - Vending Machine Snacks - type: dataset id: Holidays 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 0000000000000000000000000000000000000000..01053c9730e25e727abe64c086fdb429f37f9753 GIT binary patch literal 758 zcmV4Tx04R}lk-JO7P!z_0)<>l(9dr-<1J{FO{Ay^ONFincozR8K8i!|56}a;_!ZCmgf#1*0;L z`jS@Do}H1}CA%AsBnjeZq$#jM9-jfJwq*9VZ}7)A&8m0|c{>zw#gQc^-hNRF($$oj z5#5w0Pf_LmJ5Mh&JXG%98i&TmAb9P8@HTvvg5dKo2)>S>{sGSIs()2-8hsbNRMlep z5Z!>&i>j91fwN8Mymxe0|B>othcX#>If1r$XupQYVmYhIImdU9T9;pR1-pCDEBB*I z-_bc|^rP5V%K!iYJV``BRCt{2+A(f}Fcik|56ESz_5#gRsarM%gmR6pSy;N}8WCb( z%Mo&;E|n^}Zp5)PwDA-?`(<`7}9q38C`u7Pa8K zEWRYEt(z?5hYy|KFFXu(4U5?B_MPvdV&!ja!LeX-eb!yhr{p?UHuh0O%>2w*FrB*| zo*wn_nO1pOsI41s@8mH5SRK;mm)BtVsU)>^^W#JdZR8&@cK`qY07*qoM6N<$f*46?<^TWy literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..9ed80eb55be8076575053c81a7823da3d7045438 GIT binary patch literal 626 zcmV-&0*(ENP)9r@1E~)@40|KsWZdwhyjM_@Kho$t!CGx z;5&Ti!7!%KB{SPvN-t*6Hhvzdn&KfUdbO`>8GSj`W`M7oc$Qh*A)Y5rZaJ3VJ>nr& zkaNT*#1T#hB)%28;_;i{yvJXHc_y_0_(e}C-^5B2vjR7WCyB#`USjq0h?|5|b0tlA zl-3w*q>w-y5)_oM2^|iiluephYhSG9TSk#QjQ$qN;N-}oK;8(cCF-hD)<{?B(@_?4 z|36P#o0;~yhvGoztLuJ_1HpZuT5;XqQ`fDY0f86b+HClXG^e?5(kl%ud<+ci0GBrn zO*sIrc7c&+OXhM-3efUv8t`!e^k;#=d!TpSn^k=u=TAUpo1W+nI6ML-sD5DM58Ux* z`YQX7ga7~lyh%hsR9J=Wlrav2FbqXMg;Q|^HU@;a2MY@W3k&x^QHE?Bfm@+;!IcxB zs#>>8{WdGs|39)5;NMBE4)UV$yk3|2vR55fD0a&`VQ?dK5Azy%DRFxR%|D3B>ajw4-qfvyJYMp z!5Fyt4&MW@9SB6uUO-$+zlc*Y3PNVT`V$Tzq~@$BilQirqA1U}11*eaes_v}5&!@I M07*qoM6N<$f{6qaB>(^b literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..c575d6dfeeab0405a3297485ba08f39dde5832db GIT binary patch literal 626 zcmV-&0*(ENP)9r@1E~)@40|KsWZdwhyjM_@Kho$t!CGx z;5&Ti!7!%KB{SPvN-t*6Hhvzdn&KfUdbO`>8GSj`W`M7oc$Qh*A)Y5rZaJ3VJ>nr& zkaNT*#1T#hB)%28;_;i{yvJXHc_y_0_(e}C-^5B2vjR7WCyB#`USjq0h?|5|b0tlA zl-3w*q>w-y5)_oM2^|iiluephYhSG9TSk#QjQ$qN;N-}oK;8(cCF-hD)<{?B(@_?4 z|36P#o0;~yhvGoztLuJ_1HpZuT5;XqQ`fDY0f86b+HClXG^e?5(kl%ud<+ci0GBrn zO*sIrc7c&+OXhM-3efUv8t`!e^k;#=d!TpSn^k=u=TAUpo1W+nI6ML-sD5DM58Ux* z`YQX7ga7~lyh%hsR9J=Wlrav&AP@xC!LRZY+)*Ipf22v1B8{8;BSI8(c|v}LNRx}s z7`uorX>wD6IPI>?V&LEDwho4IDt!OA-!^AO1CX)xE(1Uc(R|B%5ui5a)FFm(DpH{i zBxt?M-28ez8CqNKG6j6iuCC})dJ+U+8s|I&02J#TQix)m=-8*<9ZVs<*ODQ6CQ|Av zI9_Jn2i^m*4lG1kFQDE_zlf$71tGIv{S#Ipq?)cMilQirq9}Vj0p3_*5N?fs!2kdN M07*qoM6N<$g7Cx^#{d8T literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..aadf88fe9069ca3bd138b62101ff49b83b578d83 GIT binary patch literal 224 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|W_h|ehE&XX zd&`jTumTV3g**RO$u#-sOyzpj@b=XE+>@W)N;Hamv|(Vdmqufm_Nn{( zepS_1o6h-kJA${}td47UtWQ~;gTe~DWM4fcMDfz literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..c10e49e18a164d003880b41cb394a78c16d96e3a GIT binary patch literal 180 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|@;qG}Ln`LH zy=BPPV!*@V@bAB;eS*B;t;>M|Dk{P=GK1Gl)}5QnJY!0Vie&itY130eu3mY%>eaXQ z7w7DGKFfc2^{syHR)gD@R{aDT1_TG(OY>W!KhNLNnLB^!;@0DT++WoE{q~FzB-gO? X&AGn3i|mSx%pk6(tDnm{r-UW|Jb6V& literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..25be996ed40c29a649c1313ef15cd3cfe0852a00 GIT binary patch literal 164 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|;yhg(Ln`LH zy=BOCz<`7G!iC@WFEZ~)+a8^{Jjlb7>Ah}K^ZnT9-x|i+#;@0YpMLY_^o|wPcdr^& zGXgb(K$!Vcz5N0Ik|)L*xBp@Pa?iad(oPs6l@P7o73NsV5_o(UNWjz8&t;ucLK6VB CLO1gO literal 0 HcmV?d00001 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..d7fa153bb89 --- /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 kush.", + "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 + } + ] +} \ No newline at end of file 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 0000000000000000000000000000000000000000..9c7c5277e0af86a8d5c00749bfce9a5edb8556ba GIT binary patch literal 234 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|mUy~2hE&XX zd&`i!*+8J}VfM=)ub2P->z|zAsb0?NC^M(W%lvogYaOXAOW!k_Kl`C~ry`AkK}T#) zaBSGCSz&2uv6olrX|ujBDcN?H<^2`Yx6A7)f1JM6e*L#@Dj(2%7}z&=NnKCjcIie# zx3i!BcwKzGXKUk%Ip4II(^Jo93>olh3 z%H;=eyys*Dn)kuq^M0f6+LO8K`qt~ieo93@)UDM`M1`bA4BExzgwA1 zo4mDJ_s+rH5;d%<57c&ZOUk)s@M!e6^VqeYn{c62L4z^q)Y7-r+vFM#M$J_5ykJ;i t?qxMIXwqW)gbiV7UT3#Ci-KKKQOorAX6L;t0rQ1Hd{0+Dmvv4FO#tMQr0W0x literal 0 HcmV?d00001 From 2183473a6d70e5db8bb65365e8780339ea2fb55c Mon Sep 17 00:00:00 2001 From: kushbreth Date: Sat, 1 Mar 2025 19:59:06 -0600 Subject: [PATCH 2/9] addressed issues --- .../Locale/en-US/_DV/markings/thaven.ftl | 2 +- .../Mobs/Customization/Markings/thaven.yml | 10 +- .../Species/Thavens/Moods/yes_and.yml | 6 + .../Prototypes/_Impstation/Species/thaven.yml | 2 +- Resources/Prototypes/_Impstation/datasets.yml | 143 +++++++++--------- .../Mobs/Customization/Thaven.rsi/meta.json | 4 +- 6 files changed, 87 insertions(+), 80 deletions(-) diff --git a/Resources/Locale/en-US/_DV/markings/thaven.ftl b/Resources/Locale/en-US/_DV/markings/thaven.ftl index 786fa6ce70d..9a4f1c78056 100644 --- a/Resources/Locale/en-US/_DV/markings/thaven.ftl +++ b/Resources/Locale/en-US/_DV/markings/thaven.ftl @@ -11,4 +11,4 @@ marking-ThavenUnderbellyTorso-underbelly_torso = Chest marking-ThavenUnderbellyTorso = Thaven Chest (Underbelly Torso) marking-ThavenCarpSpots-carp_spots = Chest -marking-ThavenCarpSpots = Thaven Chest (Carp Spots) \ No newline at end of file +marking-ThavenCarpSpots = Thaven Chest (Carp Spots) diff --git a/Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/thaven.yml b/Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/thaven.yml index fdcdba4e091..4a55ff585e9 100644 --- a/Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/thaven.yml +++ b/Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/thaven.yml @@ -5,7 +5,7 @@ markingCategory: HeadTop speciesRestriction: [Thaven] sprites: - - sprite: _DV/Mobs/Customization/Thaven.rsi + - sprite: _DV/Mobs/Customization/thaven.rsi state: cheek_barbels - type: marking @@ -14,7 +14,7 @@ markingCategory: HeadTop speciesRestriction: [Thaven] sprites: - - sprite: _DV/Mobs/Customization/Thaven.rsi + - sprite: _DV/Mobs/Customization/thaven.rsi state: eyebrow_barbels - type: marking @@ -23,7 +23,7 @@ markingCategory: HeadTop speciesRestriction: [Thaven] sprites: - - sprite: _DV/Mobs/Customization/Thaven.rsi + - sprite: _DV/Mobs/Customization/thaven.rsi state: underbelly_face # Torso @@ -33,7 +33,7 @@ markingCategory: Chest speciesRestriction: [Thaven] sprites: - - sprite: _DV/Mobs/Customization/Thaven.rsi + - sprite: _DV/Mobs/Customization/thaven.rsi state: underbelly_torso - type: marking @@ -42,5 +42,5 @@ markingCategory: Chest speciesRestriction: [Thaven] sprites: - - sprite: _DV/Mobs/Customization/Thaven.rsi + - sprite: _DV/Mobs/Customization/thaven.rsi state: carp_spots diff --git a/Resources/Prototypes/_Impstation/Species/Thavens/Moods/yes_and.yml b/Resources/Prototypes/_Impstation/Species/Thavens/Moods/yes_and.yml index da84de1e35e..e286501670c 100644 --- a/Resources/Prototypes/_Impstation/Species/Thavens/Moods/yes_and.yml +++ b/Resources/Prototypes/_Impstation/Species/Thavens/Moods/yes_and.yml @@ -168,6 +168,12 @@ 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. #DeltaV - removed for moderation reasons +# - 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 020d6fcb0c6..f0ab727a1e8 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: 4 + points: 4 #DeltaV - 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 76bfa1ea6b7..74317cd1018 100644 --- a/Resources/Prototypes/_Impstation/datasets.yml +++ b/Resources/Prototypes/_Impstation/datasets.yml @@ -11,10 +11,10 @@ - The Bar - The Kitchen - Logistics - - the Janitorial Departments - - Reporting - - Entertainment - - Surgery + - the Janitorial Department #DeltaV - more things for fun + - Reporting #DeltaV - more things for fun + - Entertainment #DeltaV - more things for fun + - Surgery #DeltaV - more things for fun - type: dataset id: Pets @@ -24,24 +24,24 @@ - Shiva the Spider - Ian the Corgi - Morticia the Raccoon - - Morty the Possum - - Paperwork the Sloth + - Morty the Possum #DeltaV - more things for fun + - Paperwork the Sloth #DeltaV - more things for fun - Walter the Dog - Renault the Fox - Willow the Kangaroo - Smile the Slime - Tropico the Crab - Carpy the Legal Carp - - Laika the Security Dog + - Laika the Security Dog #DeltaV - more things for fun - Remilia the Chaplain's Familiar - - Alexander the Pig - - Clippy the Courier Cat - - Runtime the Cat - - Exception the Cat - - Silvia the Medical Snake - - Bingus the Cat - - A Bee - - Siobahn the Epistemics Fox + - Alexander the Pig #DeltaV - more things for fun + - Clippy the Courier Cat #DeltaV - more things for fun + - Runtime the Cat #DeltaV - more things for fun + - Exception the Cat #DeltaV - more things for fun + - Silvia the Medical Snake #DeltaV - more things for fun + - Bingus the Cat #DeltaV - more things for fun + - A Bee #DeltaV - more things for fun + - Siobahn the Epistemics Fox #DeltaV - more things for fun - type: dataset id: Rooms @@ -53,21 +53,21 @@ - The Restroom - Dorms - The Morgue - - The Center of the Station + - The Center of the Station #DeltaV - more things for fun - The Chapel - The Bar - - The Boxing Ring - - The Logistics Front Desk + - The Boxing Ring #DeltaV - more things for fun + - The Logistics Front Desk #DeltaV - more things for fun - The Tool Room - Evac - Solars - Arrivals - - The Laundry Room + - The Laundry Room #DeltaV - more things for fun - The Station Anchor - - The Park - - Court - - The Arcade - - The Stage + - The Park #DeltaV - more things for fun + - Court #DeltaV - more things for fun + - The Arcade #DeltaV - more things for fun + - The Stage #DeltaV - more things for fun - type: dataset id: FoodRestrictions @@ -102,74 +102,75 @@ - Spray bottles - Plushies - Figurines - - Toys - - Lockers - - Cigarettes - - Lighters - - Candles - - Signatures - - Empty bottles - - Paper - - Crayons - - Toys - - Lamps - - Pens - - Lightbulbs - - Books - - Snacks - - Cassettes - - Trash + - Toys #DeltaV - more things for fun + - Lockers #DeltaV - more things for fun + - Cigarettes #DeltaV - more things for fun + - Lighters #DeltaV - more things for fun + - Candles #DeltaV - more things for fun + - Signatures #DeltaV - more things for fun + - Empty bottles #DeltaV - more things for fun + - Paper #DeltaV - more things for fun + - Crayons #DeltaV - more things for fun + - Toys #DeltaV - more things for fun + - Lamps #DeltaV - more things for fun + - Pens #DeltaV - more things for fun + - Lightbulbs #DeltaV - more things for fun + - Books #DeltaV - more things for fun + - Snacks #DeltaV - more things for fun + - Cassettes #DeltaV - more things for fun + - Trash #DeltaV - more things for fun - type: dataset id: Edibles values: - - Enchiladas + - Enchiladas #DeltaV - more things for fun - Copypasta - Moldy Bread Slice - Baseball Burger - Empowered Burger - McGuffin - Crazy Hamburger - - Stick of Cannabis Butter - - Cheesecake Balls - - Engine Fodder + - Stick of Cannabis Butter #DeltaV - more things for fun + - Cheesecake Balls #DeltaV - more things for fun + - Engine Fodder #DeltaV - more things for fun - Bread Dog - Camel's Soup - - Chili Con Carnival + - Chili Con Carnival #DeltaV - more things for fun - Salty Sweet Miso Cola Soup - - Ketchup - - Chicken Nuggets - - Borito Pie - - Blue Tomato Soup - - Buttered Toast - - Ratburger - - Vending Machine Snacks + - Ketchup #DeltaV - more things for fun + - Chicken Nuggets #DeltaV - more things for fun + - Borito Pie #DeltaV - more things for fun + - Blue Tomato Soup #DeltaV - more things for fun + - Buttered Toast #DeltaV - more things for fun + - Ratburger #DeltaV - more things for fun + - Vending Machine Snacks #DeltaV - more things for fun + # - Cotton Pizza #DeltaV - thaven cannot ingest cotton items - type: dataset id: Holidays values: - Bingus Day - Foster's Feast - - Preston’s Tomato Incident - - Submarine's Memorial - - Pranksgiving - - Sector Delta Employee Appreciation Week + - Preston’s Tomato Incident #DeltaV - more things for fun + - Submarine's Memorial #DeltaV - more things for fun + - Pranksgiving #DeltaV - more things for fun + - Sector Delta Employee Appreciation Week #DeltaV - more things for fun - Intergalactic Hug A Robot Day - - Todaybor Day + - Todaybor Day #DeltaV - more things for fun - Teo's First Contact Day - - Wear Pajamas to Work Day - - Roy’s Birthday + - Wear Pajamas to Work Day #DeltaV - more things for fun + - Roy’s Birthday #DeltaV - more things for fun - NT Corporate Mindfulness Day - - Night of Holy Herbs - - Logistics Appreciation Week - - Big Ear Syndrome Awareness Day - - Gunchday - - Gerry Patrick's Ascension + - Night of Holy Herbs #DeltaV - more things for fun + - Logistics Appreciation Week #DeltaV - more things for fun + - Big Ear Syndrome Awareness Day #DeltaV - more things for fun + - Gunchday #DeltaV - more things for fun + - Gerry Patrick's Ascension #DeltaV - more things for fun - The Good Day of Digging and Playing - the Talent Show - - Luperthavia - - Taco Tuesday - - Penny's Big Day + - Luperthavia #DeltaV - more things for fun + - Taco Tuesday #DeltaV - more things for fun + - Penny's Big Day #DeltaV - more things for fun - type: dataset id: Clothes @@ -193,14 +194,14 @@ id: CommandRoles values: - Captain - - Logistics Officer + - Logistics Officer #DeltaV - what is a quartermaster - Head of Security - Head of Personnel - Chief Engineer - Chief Medical Officer - - Mystagogue - - Chief Justice - - Administrative Assistant + - Mystagogue #DeltaV - more things for fun + - Chief Justice #DeltaV - more things for fun + - Administrative Assistant #DeltaV - more things for fun - type: dataset id: SpeechRestrictions diff --git a/Resources/Textures/_DV/Mobs/Customization/Thaven.rsi/meta.json b/Resources/Textures/_DV/Mobs/Customization/Thaven.rsi/meta.json index d7fa153bb89..67e9e64024b 100644 --- a/Resources/Textures/_DV/Mobs/Customization/Thaven.rsi/meta.json +++ b/Resources/Textures/_DV/Mobs/Customization/Thaven.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "cheek_barbels, eyebrow_barbels, underbelly_face, underbelly_torso, carp_spots by kush.", + "copyright": "cheek_barbels, eyebrow_barbels, underbelly_face, underbelly_torso, carp_spots by kushbreth (github).", "size": { "x": 32, "y": 32 @@ -28,4 +28,4 @@ "directions": 4 } ] -} \ No newline at end of file +} From dba348cd0da08a3078ca86dcb0d1bc50bc2e6543 Mon Sep 17 00:00:00 2001 From: kushbreth Date: Sat, 1 Mar 2025 20:49:57 -0600 Subject: [PATCH 3/9] stop not working --- .../{Thaven.rsi => thaven.rsi}/carp_spots.png | Bin .../{Thaven.rsi => thaven.rsi}/cheek_barbels.png | Bin .../{Thaven.rsi => thaven.rsi}/eyebrow_barbels.png | Bin .../{Thaven.rsi => thaven.rsi}/meta.json | 0 .../{Thaven.rsi => thaven.rsi}/underbelly_face.png | Bin .../{Thaven.rsi => thaven.rsi}/underbelly_torso.png | Bin 6 files changed, 0 insertions(+), 0 deletions(-) rename Resources/Textures/_DV/Mobs/Customization/{Thaven.rsi => thaven.rsi}/carp_spots.png (100%) rename Resources/Textures/_DV/Mobs/Customization/{Thaven.rsi => thaven.rsi}/cheek_barbels.png (100%) rename Resources/Textures/_DV/Mobs/Customization/{Thaven.rsi => thaven.rsi}/eyebrow_barbels.png (100%) rename Resources/Textures/_DV/Mobs/Customization/{Thaven.rsi => thaven.rsi}/meta.json (100%) rename Resources/Textures/_DV/Mobs/Customization/{Thaven.rsi => thaven.rsi}/underbelly_face.png (100%) rename Resources/Textures/_DV/Mobs/Customization/{Thaven.rsi => thaven.rsi}/underbelly_torso.png (100%) diff --git a/Resources/Textures/_DV/Mobs/Customization/Thaven.rsi/carp_spots.png b/Resources/Textures/_DV/Mobs/Customization/thaven.rsi/carp_spots.png similarity index 100% rename from Resources/Textures/_DV/Mobs/Customization/Thaven.rsi/carp_spots.png rename to Resources/Textures/_DV/Mobs/Customization/thaven.rsi/carp_spots.png diff --git a/Resources/Textures/_DV/Mobs/Customization/Thaven.rsi/cheek_barbels.png b/Resources/Textures/_DV/Mobs/Customization/thaven.rsi/cheek_barbels.png similarity index 100% rename from Resources/Textures/_DV/Mobs/Customization/Thaven.rsi/cheek_barbels.png rename to Resources/Textures/_DV/Mobs/Customization/thaven.rsi/cheek_barbels.png diff --git a/Resources/Textures/_DV/Mobs/Customization/Thaven.rsi/eyebrow_barbels.png b/Resources/Textures/_DV/Mobs/Customization/thaven.rsi/eyebrow_barbels.png similarity index 100% rename from Resources/Textures/_DV/Mobs/Customization/Thaven.rsi/eyebrow_barbels.png rename to Resources/Textures/_DV/Mobs/Customization/thaven.rsi/eyebrow_barbels.png diff --git a/Resources/Textures/_DV/Mobs/Customization/Thaven.rsi/meta.json b/Resources/Textures/_DV/Mobs/Customization/thaven.rsi/meta.json similarity index 100% rename from Resources/Textures/_DV/Mobs/Customization/Thaven.rsi/meta.json rename to Resources/Textures/_DV/Mobs/Customization/thaven.rsi/meta.json diff --git a/Resources/Textures/_DV/Mobs/Customization/Thaven.rsi/underbelly_face.png b/Resources/Textures/_DV/Mobs/Customization/thaven.rsi/underbelly_face.png similarity index 100% rename from Resources/Textures/_DV/Mobs/Customization/Thaven.rsi/underbelly_face.png rename to Resources/Textures/_DV/Mobs/Customization/thaven.rsi/underbelly_face.png diff --git a/Resources/Textures/_DV/Mobs/Customization/Thaven.rsi/underbelly_torso.png b/Resources/Textures/_DV/Mobs/Customization/thaven.rsi/underbelly_torso.png similarity index 100% rename from Resources/Textures/_DV/Mobs/Customization/Thaven.rsi/underbelly_torso.png rename to Resources/Textures/_DV/Mobs/Customization/thaven.rsi/underbelly_torso.png From 8818c147f98e3d10a170e2e3efb188685f334303 Mon Sep 17 00:00:00 2001 From: kushbreth Date: Sat, 1 Mar 2025 21:14:10 -0600 Subject: [PATCH 4/9] epic yml moment --- .../Prototypes/_Impstation/Species/Thavens/Moods/yes_and.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_Impstation/Species/Thavens/Moods/yes_and.yml b/Resources/Prototypes/_Impstation/Species/Thavens/Moods/yes_and.yml index e286501670c..acfe7cbc299 100644 --- a/Resources/Prototypes/_Impstation/Species/Thavens/Moods/yes_and.yml +++ b/Resources/Prototypes/_Impstation/Species/Thavens/Moods/yes_and.yml @@ -20,7 +20,7 @@ - TheftNeutral - Duel - Prometheus - - Klingon + #- Klingon # DeltaV - removed for moderation purposes - MarasLaw - Generous - FavorsRepaid From be268ca8ed57c0929b740814006db1c26c6de01d Mon Sep 17 00:00:00 2001 From: kushbreth Date: Sun, 2 Mar 2025 12:29:15 -0600 Subject: [PATCH 5/9] minor edits --- Resources/Prototypes/_Impstation/datasets.yml | 147 +++++++++--------- .../thaven.rsi/eyebrow_barbels.png | Bin 164 -> 180 bytes .../Mobs/Customization/thaven.rsi/meta.json | 2 +- 3 files changed, 75 insertions(+), 74 deletions(-) diff --git a/Resources/Prototypes/_Impstation/datasets.yml b/Resources/Prototypes/_Impstation/datasets.yml index 74317cd1018..16e0333b3b7 100644 --- a/Resources/Prototypes/_Impstation/datasets.yml +++ b/Resources/Prototypes/_Impstation/datasets.yml @@ -9,12 +9,12 @@ - Medical - Justice - The Bar - - The Kitchen + - The Kitchen # DeltaV begin - additions for DeltaV - Logistics - - the Janitorial Department #DeltaV - more things for fun - - Reporting #DeltaV - more things for fun - - Entertainment #DeltaV - more things for fun - - Surgery #DeltaV - more things for fun + - the Janitorial Department + - Reporting + - Entertainment + - Surgery # DeltaV end - additions for DeltaV - type: dataset id: Pets @@ -24,24 +24,24 @@ - Shiva the Spider - Ian the Corgi - Morticia the Raccoon - - Morty the Possum #DeltaV - more things for fun - - Paperwork the Sloth #DeltaV - more things for fun + - Morty the Possum + - Paperwork the Sloth - Walter the Dog - Renault the Fox - Willow the Kangaroo - Smile the Slime - Tropico the Crab - Carpy the Legal Carp - - Laika the Security Dog #DeltaV - more things for fun + - Laika the Security Dog - Remilia the Chaplain's Familiar - - Alexander the Pig #DeltaV - more things for fun - - Clippy the Courier Cat #DeltaV - more things for fun - - Runtime the Cat #DeltaV - more things for fun - - Exception the Cat #DeltaV - more things for fun - - Silvia the Medical Snake #DeltaV - more things for fun - - Bingus the Cat #DeltaV - more things for fun - - A Bee #DeltaV - more things for fun - - Siobahn the Epistemics Fox #DeltaV - more things for fun + - Alexander the Pig # DeltaV begin - additions for DeltaV + - Clippy the Courier Cat + - Runtime the Cat + - Exception the Cat + - Silvia the Medical Snake + - Bingus the Cat + - A Bee + - Siobahn the Epistemics Fox # DeltaV end - additions for DeltaV - type: dataset id: Rooms @@ -53,21 +53,21 @@ - The Restroom - Dorms - The Morgue - - The Center of the Station #DeltaV - more things for fun + - The Center of the Station # DeltaV begin - additions for DeltaV - The Chapel - The Bar - - The Boxing Ring #DeltaV - more things for fun - - The Logistics Front Desk #DeltaV - more things for fun + - The Boxing Ring + - The Logistics Front Desk - The Tool Room - Evac - Solars - Arrivals - - The Laundry Room #DeltaV - more things for fun + - The Laundry Room - The Station Anchor - - The Park #DeltaV - more things for fun - - Court #DeltaV - more things for fun - - The Arcade #DeltaV - more things for fun - - The Stage #DeltaV - more things for fun + - The Park + - Court + - The Arcade + - The Stage # DeltaV end - additions for DeltaV - type: dataset id: FoodRestrictions @@ -100,50 +100,50 @@ - Scarves - Folders - Spray bottles - - Plushies - - Figurines - - Toys #DeltaV - more things for fun - - Lockers #DeltaV - more things for fun - - Cigarettes #DeltaV - more things for fun - - Lighters #DeltaV - more things for fun - - Candles #DeltaV - more things for fun - - Signatures #DeltaV - more things for fun - - Empty bottles #DeltaV - more things for fun - - Paper #DeltaV - more things for fun - - Crayons #DeltaV - more things for fun - - Toys #DeltaV - more things for fun - - Lamps #DeltaV - more things for fun - - Pens #DeltaV - more things for fun - - Lightbulbs #DeltaV - more things for fun - - Books #DeltaV - more things for fun - - Snacks #DeltaV - more things for fun - - Cassettes #DeltaV - more things for fun - - Trash #DeltaV - more things for fun + - Plushies + - Figurines # DeltaV begin - additions for DeltaV + - Toys + - Lockers + - Cigarettes + - Lighters + - Candles + - Signatures + - Empty bottles + - Paper + - Crayons + - Toys + - Lamps + - Pens + - Lightbulbs + - Books + - Snacks + - Cassettes + - Trash # DeltaV end - additions for DeltaV - type: dataset id: Edibles values: - - Enchiladas #DeltaV - more things for fun + - Enchiladas - Copypasta - Moldy Bread Slice - Baseball Burger - Empowered Burger - McGuffin - Crazy Hamburger - - Stick of Cannabis Butter #DeltaV - more things for fun - - Cheesecake Balls #DeltaV - more things for fun - - Engine Fodder #DeltaV - more things for fun + - Stick of Cannabis Butter # DeltaV begin - additions for DeltaV + - Cheesecake Balls + - Engine Fodder - Bread Dog - Camel's Soup - - Chili Con Carnival #DeltaV - more things for fun + - Chili Con Carnival - Salty Sweet Miso Cola Soup - - Ketchup #DeltaV - more things for fun - - Chicken Nuggets #DeltaV - more things for fun - - Borito Pie #DeltaV - more things for fun - - Blue Tomato Soup #DeltaV - more things for fun - - Buttered Toast #DeltaV - more things for fun - - Ratburger #DeltaV - more things for fun - - Vending Machine Snacks #DeltaV - more things for fun + - Ketchup + - Chicken Nuggets + - Borito Pie + - Blue Tomato Soup + - Buttered Toast + - Ratburger + - Vending Machine Snacks # DeltaV end - additions for DeltaV # - Cotton Pizza #DeltaV - thaven cannot ingest cotton items - type: dataset @@ -151,26 +151,27 @@ values: - Bingus Day - Foster's Feast - - Preston’s Tomato Incident #DeltaV - more things for fun - - Submarine's Memorial #DeltaV - more things for fun - - Pranksgiving #DeltaV - more things for fun - - Sector Delta Employee Appreciation Week #DeltaV - more things for fun + - Preston’s Tomato Incident # DeltaV begin - additions for DeltaV + - Submarine's Memorial + - Pranksgiving + - Sector Delta Employee Appreciation Week - Intergalactic Hug A Robot Day - - Todaybor Day #DeltaV - more things for fun + - Todaybor Day - Teo's First Contact Day - - Wear Pajamas to Work Day #DeltaV - more things for fun - - Roy’s Birthday #DeltaV - more things for fun + - Wear Pajamas to Work Day + - Roy’s Birthday - NT Corporate Mindfulness Day - - Night of Holy Herbs #DeltaV - more things for fun - - Logistics Appreciation Week #DeltaV - more things for fun - - Big Ear Syndrome Awareness Day #DeltaV - more things for fun - - Gunchday #DeltaV - more things for fun - - Gerry Patrick's Ascension #DeltaV - more things for fun + - Night of Holy Herbs + - Logistics Appreciation Week + - Big Ear Syndrome Awareness Day + - Gunchday + - Gerry Patrick's Ascension - The Good Day of Digging and Playing - the Talent Show - - Luperthavia #DeltaV - more things for fun - - Taco Tuesday #DeltaV - more things for fun - - Penny's Big Day #DeltaV - more things for fun + - Luperthavia + - Penny's Big Day + - Taco Tuesday # DeltaV end - additions for DeltaV + - type: dataset id: Clothes @@ -199,9 +200,9 @@ - Head of Personnel - Chief Engineer - Chief Medical Officer - - Mystagogue #DeltaV - more things for fun - - Chief Justice #DeltaV - more things for fun - - Administrative Assistant #DeltaV - more things for fun + - Mystagogue # DeltaV begin - additions for DeltaV + - Chief Justice + - Administrative Assistant # DeltaV end - additions for DeltaV - type: dataset id: SpeechRestrictions diff --git a/Resources/Textures/_DV/Mobs/Customization/thaven.rsi/eyebrow_barbels.png b/Resources/Textures/_DV/Mobs/Customization/thaven.rsi/eyebrow_barbels.png index 25be996ed40c29a649c1313ef15cd3cfe0852a00..fd757816d40f220fd489ff39ae9490d5fde27296 100644 GIT binary patch delta 139 zcmZ3&xP@_oVSS#bi(^Q|oVT|&avm|@akyCU`~3^2rDg?-OWK)tDjhr$Q?Xu9qJ{0l z{cYVwo0S$F+upI_%$j&>crv}$ZEC(B8~t0u zSljsZ+V9hE{+!;iqWbPt!)itb2naKOs<%JjU-HCQ Date: Sun, 2 Mar 2025 18:27:27 -0600 Subject: [PATCH 6/9] nya~ --- .../Species/Thavens/Moods/yes_and.yml | 7 ----- .../Prototypes/_Impstation/Species/thaven.yml | 2 +- Resources/Prototypes/_Impstation/datasets.yml | 29 +++++++++--------- .../ears.rsi/long_ears_small.png | Bin 753 -> 761 bytes 4 files changed, 15 insertions(+), 23 deletions(-) diff --git a/Resources/Prototypes/_Impstation/Species/Thavens/Moods/yes_and.yml b/Resources/Prototypes/_Impstation/Species/Thavens/Moods/yes_and.yml index acfe7cbc299..c15680223c6 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 # DeltaV - removed for moderation purposes - MarasLaw - Generous - FavorsRepaid @@ -168,12 +167,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. #DeltaV - removed for moderation reasons -# - 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 f0ab727a1e8..a8c59781254 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: 4 #DeltaV - more markings require more space + 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 16e0333b3b7..bc578e50ba4 100644 --- a/Resources/Prototypes/_Impstation/datasets.yml +++ b/Resources/Prototypes/_Impstation/datasets.yml @@ -9,12 +9,12 @@ - Medical - Justice - The Bar - - The Kitchen # DeltaV begin - additions for DeltaV + - The Kitchen # Begin DeltaV Additions - Logistics - the Janitorial Department - Reporting - Entertainment - - Surgery # DeltaV end - additions for DeltaV + - Surgery # End DeltaV Additions - type: dataset id: Pets @@ -34,14 +34,14 @@ - Carpy the Legal Carp - Laika the Security Dog - Remilia the Chaplain's Familiar - - Alexander the Pig # DeltaV begin - additions for DeltaV + - Alexander the Pig # Begin DeltaV Additions - Clippy the Courier Cat - Runtime the Cat - Exception the Cat - Silvia the Medical Snake - Bingus the Cat - A Bee - - Siobahn the Epistemics Fox # DeltaV end - additions for DeltaV + - Siobahn the Epistemics Fox # End DeltaV Additions - type: dataset id: Rooms @@ -53,7 +53,7 @@ - The Restroom - Dorms - The Morgue - - The Center of the Station # DeltaV begin - additions for DeltaV + - The Center of the Station # Begin DeltaV Additions - The Chapel - The Bar - The Boxing Ring @@ -67,7 +67,7 @@ - The Park - Court - The Arcade - - The Stage # DeltaV end - additions for DeltaV + - The Stage # End DeltaV Additions - type: dataset id: FoodRestrictions @@ -101,7 +101,7 @@ - Folders - Spray bottles - Plushies - - Figurines # DeltaV begin - additions for DeltaV + - Figurines # Begin DeltaV Additions - Toys - Lockers - Cigarettes @@ -118,7 +118,7 @@ - Books - Snacks - Cassettes - - Trash # DeltaV end - additions for DeltaV + - Trash # End DeltaV Additions - type: dataset id: Edibles @@ -130,7 +130,7 @@ - Empowered Burger - McGuffin - Crazy Hamburger - - Stick of Cannabis Butter # DeltaV begin - additions for DeltaV + - Stick of Cannabis Butter # Begin DeltaV Additions - Cheesecake Balls - Engine Fodder - Bread Dog @@ -143,15 +143,14 @@ - Blue Tomato Soup - Buttered Toast - Ratburger - - Vending Machine Snacks # DeltaV end - additions for DeltaV - # - Cotton Pizza #DeltaV - thaven cannot ingest cotton items + - Vending Machine Snacks # End DeltaV Additions - type: dataset id: Holidays values: - Bingus Day - Foster's Feast - - Preston’s Tomato Incident # DeltaV begin - additions for DeltaV + - Preston’s Tomato Incident # Begin DeltaV Additions - Submarine's Memorial - Pranksgiving - Sector Delta Employee Appreciation Week @@ -170,7 +169,7 @@ - the Talent Show - Luperthavia - Penny's Big Day - - Taco Tuesday # DeltaV end - additions for DeltaV + - Taco Tuesday # End DeltaV Additions - type: dataset @@ -200,9 +199,9 @@ - Head of Personnel - Chief Engineer - Chief Medical Officer - - Mystagogue # DeltaV begin - additions for DeltaV + - Mystagogue # Begin DeltaV Additions - Chief Justice - - Administrative Assistant # DeltaV end - additions for DeltaV + - 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 c6cdebef00521c119c35fbefe0efc9c82d6b4b29..de09157707efd94e5802e0ff1b2a2101a4168ed3 100644 GIT binary patch delta 313 zcmey!`jd6T7DjdhPZ!6KiaC>aGfLM-?01^}Mp9{ux9Z$A0kfPO`n-daRKB%^b^rRG z+c^94oa*ycDhxl4-&w`%sUPy&V#A}~Uv@?RK3{AfHE;IbC4Q6i^50+2+Au5ry0hi( z6W>q9{bZOlg*V7^)8Eg+md~^P8ye5%KR)S6)Z7Ehw@fekcc|U$jL#&WNwc24{~?oA z%G6u`=!9<9^;!JKrH)>7(~m!UUOhN8{lT1IyP0*-b_{Uvrz-9@Q&jH7B$$vk<|{F$Z=mHwFM;P>FVdQ I&MBb@08y8aH~;_u delta 305 zcmV-10nYyU1@Q&2v;hYwNklzk*Bl3>DHPl1@elO(7u1#YhZ96B4!R z|F;G1&2#QOcRUgR{A2F31+(cy!+p<+@5A$P?Vg7_|83p!F?N!4dU@Tcz-oS74dv`2 zze%=hQbZQUl4RS*2XfBU?lCi4%@>m71|zSxE|v3(y31vlnIxGcwawpXvS={!6a|02 zd;NK>)qJ5S@OwRcH9t>MReRu^Q=X(>mJa{`0000000000zh0yH07;E!1b$L=KB4Pu z!n;eDO()92*h<#s;AWWy z>bz_F5(+05S6ZhFxWB!T)O{oe0012T00000fIsX7D^!sPg4vV500000NkvXXu0mjf DktB`^ From e805f22b751714d6d272b94ab43f227c1805279f Mon Sep 17 00:00:00 2001 From: kushbreth Date: Mon, 3 Mar 2025 14:11:36 -0600 Subject: [PATCH 7/9] do catfish say meow? --- .../en-US/_Impstation/thavens/yes-and.ftl | 4 +- .../Customization/Markings/human_noses.yml | 10 ++--- .../Customization/Markings/undershirt.yml | 20 ++++----- .../Mobs/Customization/Markings/underwear.yml | 10 ++--- .../Species/Thavens/Moods/yes_and.yml | 9 ++-- .../Prototypes/_Impstation/Species/thaven.yml | 2 +- Resources/Prototypes/_Impstation/datasets.yml | 45 ++++++++++++------- 7 files changed, 57 insertions(+), 43 deletions(-) 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/human_noses.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_noses.yml index 5bfb413a8a3..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, Thaven] #Einstein Engines - Felinid, Oni, Harpy # DeltaV - Thaven + 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, Thaven] #Einstein Engines - Felinid, Oni, Harpy # DeltaV - Thaven + 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, Thaven] #Einstein Engines - Felinid, Oni, Harpy # DeltaV - Thaven + 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, Thaven] #Einstein Engines - Felinid, Oni, Harpy # DeltaV - Thaven + 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, Thaven] #Einstein Engines - Felinid, Oni, Harpy # DeltaV - Thaven + 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/_Impstation/Entities/Mobs/Customization/Markings/undershirt.yml b/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/undershirt.yml index 08239a24153..5161d4cb9bf 100644 --- a/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/undershirt.yml +++ b/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/undershirt.yml @@ -2,7 +2,7 @@ id: UndershirtDefault bodyPart: Undershirt markingCategory: Undershirt - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid, Thaven] # Delta V - Chitinid, Thaven + 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: UndershirtRolled bodyPart: Undershirt markingCategory: Undershirt - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid, Thaven] # Delta V - Chitinid, Thaven + 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: UndershirtSleeveless bodyPart: Undershirt markingCategory: Undershirt - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid, Thaven] # Delta V - Chitinid, Thaven + 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: UndershirtRolledSleeveless bodyPart: Undershirt markingCategory: Undershirt - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid, Thaven] # Delta V - Chitinid, Thaven + 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: UndershirtGrossSleeveless bodyPart: Undershirt markingCategory: Undershirt - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid, Thaven] # Delta V - Chitinid, Thaven + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid] # Delta V - Chitinid coloring: default: type: @@ -72,7 +72,7 @@ id: UndershirtNanotrasen bodyPart: Undershirt markingCategory: Undershirt - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid, Thaven] # Delta V - Chitinid, Thaven + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid] # Delta V - Chitinid coloring: default: type: @@ -86,7 +86,7 @@ id: UndershirtBinder bodyPart: Undershirt markingCategory: Undershirt - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid, Thaven] # Delta V - Chitinid, Thaven + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid] # Delta V - Chitinid coloring: default: type: @@ -100,7 +100,7 @@ id: UndershirtBraClassic bodyPart: Undershirt markingCategory: Undershirt - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid, Thaven] # Delta V - Chitinid, Thaven + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid] # Delta V - Chitinid coloring: default: type: @@ -114,7 +114,7 @@ id: UndershirtBraSports bodyPart: Undershirt markingCategory: Undershirt - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid, Thaven] # Delta V - Chitinid, Thaven + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid] # Delta V - Chitinid coloring: default: type: @@ -128,7 +128,7 @@ id: UndershirtBraStrapless bodyPart: Undershirt markingCategory: Undershirt - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid, Thaven] # Delta V - Chitinid, Thaven + 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/Customization/Markings/underwear.yml b/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/underwear.yml index 89979665cc7..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, Thaven] # Delta V - Chitinid, Thaven + 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, Thaven] # Delta V - Chitinid, Thaven + 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, Thaven] # Delta V - Chitinid, Thaven + 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, Thaven] # Delta V - Chitinid, Thaven + 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, Thaven] # Delta V - Chitinid, Thaven + 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/Species/Thavens/Moods/yes_and.yml b/Resources/Prototypes/_Impstation/Species/Thavens/Moods/yes_and.yml index c15680223c6..c18d3077fcf 100644 --- a/Resources/Prototypes/_Impstation/Species/Thavens/Moods/yes_and.yml +++ b/Resources/Prototypes/_Impstation/Species/Thavens/Moods/yes_and.yml @@ -39,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 @@ -133,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 diff --git a/Resources/Prototypes/_Impstation/Species/thaven.yml b/Resources/Prototypes/_Impstation/Species/thaven.yml index a8c59781254..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: 4 # DeltaV - was previously 2, more markings require more space + 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 bc578e50ba4..8b7a90958f4 100644 --- a/Resources/Prototypes/_Impstation/datasets.yml +++ b/Resources/Prototypes/_Impstation/datasets.yml @@ -9,12 +9,14 @@ - Medical - Justice - The Bar - - The Kitchen # Begin DeltaV Additions + # Begin DeltaV Additions + - The Kitchen - Logistics - the Janitorial Department - Reporting - Entertainment - - Surgery # End DeltaV Additions + - Surgery + # End DeltaV Additions - type: dataset id: Pets @@ -34,14 +36,16 @@ - Carpy the Legal Carp - Laika the Security Dog - Remilia the Chaplain's Familiar - - Alexander the Pig # Begin DeltaV Additions + # Begin DeltaV Additions + - Alexander the Pig - Clippy the Courier Cat - Runtime the Cat - Exception the Cat - Silvia the Medical Snake - Bingus the Cat - A Bee - - Siobahn the Epistemics Fox # End DeltaV Additions + - Siobahn the Epistemics Fox + # End DeltaV Additions - type: dataset id: Rooms @@ -53,7 +57,8 @@ - The Restroom - Dorms - The Morgue - - The Center of the Station # Begin DeltaV Additions + - The Center of the Station + # Begin DeltaV Additions - The Chapel - The Bar - The Boxing Ring @@ -67,7 +72,8 @@ - The Park - Court - The Arcade - - The Stage # End DeltaV Additions + - The Stage + # End DeltaV Additions - type: dataset id: FoodRestrictions @@ -101,7 +107,8 @@ - Folders - Spray bottles - Plushies - - Figurines # Begin DeltaV Additions + - Figurines + # Begin DeltaV Additions - Toys - Lockers - Cigarettes @@ -118,7 +125,8 @@ - Books - Snacks - Cassettes - - Trash # End DeltaV Additions + - Trash + # End DeltaV Additions - type: dataset id: Edibles @@ -130,7 +138,8 @@ - Empowered Burger - McGuffin - Crazy Hamburger - - Stick of Cannabis Butter # Begin DeltaV Additions + # Begin DeltaV Additions + - Stick of Cannabis Butter - Cheesecake Balls - Engine Fodder - Bread Dog @@ -143,14 +152,16 @@ - Blue Tomato Soup - Buttered Toast - Ratburger - - Vending Machine Snacks # End DeltaV Additions + - Vending Machine Snacks + # End DeltaV Additions - type: dataset id: Holidays values: - Bingus Day - Foster's Feast - - Preston’s Tomato Incident # Begin DeltaV Additions + # Begin DeltaV Additions + - Preston’s Tomato Incident - Submarine's Memorial - Pranksgiving - Sector Delta Employee Appreciation Week @@ -169,8 +180,8 @@ - the Talent Show - Luperthavia - Penny's Big Day - - Taco Tuesday # End DeltaV Additions - + - Taco Tuesday + # End DeltaV Additions - type: dataset id: Clothes @@ -194,14 +205,16 @@ id: CommandRoles values: - Captain - - Logistics Officer #DeltaV - what is a quartermaster + - Logistics Officer # DeltaV - what is a quartermaster - Head of Security - Head of Personnel - Chief Engineer - Chief Medical Officer - - Mystagogue # Begin DeltaV Additions + # Begin DeltaV Additions + - Mystagogue - Chief Justice - - Administrative Assistant # End DeltaV Additions + - Administrative Assistant + # End DeltaV Additions - type: dataset id: SpeechRestrictions From 22c9d69402bfa38973013f9fa8417f0496fc28e8 Mon Sep 17 00:00:00 2001 From: kushbreth Date: Mon, 3 Mar 2025 14:53:56 -0600 Subject: [PATCH 8/9] oops --- .../Prototypes/_Impstation/Species/Thavens/Moods/no_and.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 4935ed158b07ae6630efda867a23a720f353700b Mon Sep 17 00:00:00 2001 From: kushbreth Date: Mon, 3 Mar 2025 17:42:29 -0600 Subject: [PATCH 9/9] shit --- Resources/Prototypes/_Impstation/datasets.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_Impstation/datasets.yml b/Resources/Prototypes/_Impstation/datasets.yml index 8b7a90958f4..f8410ef3298 100644 --- a/Resources/Prototypes/_Impstation/datasets.yml +++ b/Resources/Prototypes/_Impstation/datasets.yml @@ -106,7 +106,7 @@ - Scarves - Folders - Spray bottles - - Plushies + - Plushies - Figurines # Begin DeltaV Additions - Toys