diff --git a/Resources/Audio/Animals/attributions.yml b/Resources/Audio/Animals/attributions.yml index 7fd7e8b2e7b..722bd45c7dc 100644 --- a/Resources/Audio/Animals/attributions.yml +++ b/Resources/Audio/Animals/attributions.yml @@ -156,3 +156,17 @@ copyright: "Created by fujiwaranao" license: "CC-BY-NC-SA-4.0" source: "https://github.com/space-wizards/space-station-14/pull/27578" + +- files: + - wawa_achoo.ogg + - wawa_chatter.ogg + - wawa_chillin.ogg + - wawa_depression.ogg + - wawa_exclaim.ogg + - wawa_mock.ogg + - wawa_protest.ogg + - wawa_question.ogg + - wawa_statement.ogg + copyright: "created by FairlySadPanda" + license: "CC-BY-4.0" + source: "https://github.com/space-wizards/space-station-14/pull/37936" diff --git a/Resources/Audio/Animals/wawa_achoo.ogg b/Resources/Audio/Animals/wawa_achoo.ogg new file mode 100644 index 00000000000..411c4b5b0a9 Binary files /dev/null and b/Resources/Audio/Animals/wawa_achoo.ogg differ diff --git a/Resources/Audio/Animals/wawa_chatter.ogg b/Resources/Audio/Animals/wawa_chatter.ogg new file mode 100644 index 00000000000..55376113073 Binary files /dev/null and b/Resources/Audio/Animals/wawa_chatter.ogg differ diff --git a/Resources/Audio/Animals/wawa_chillin.ogg b/Resources/Audio/Animals/wawa_chillin.ogg new file mode 100644 index 00000000000..d548f6a26f1 Binary files /dev/null and b/Resources/Audio/Animals/wawa_chillin.ogg differ diff --git a/Resources/Audio/Animals/wawa_depression.ogg b/Resources/Audio/Animals/wawa_depression.ogg new file mode 100644 index 00000000000..d592654a07b Binary files /dev/null and b/Resources/Audio/Animals/wawa_depression.ogg differ diff --git a/Resources/Audio/Animals/wawa_despair.ogg b/Resources/Audio/Animals/wawa_despair.ogg new file mode 100644 index 00000000000..ce4ecc4db2b Binary files /dev/null and b/Resources/Audio/Animals/wawa_despair.ogg differ diff --git a/Resources/Audio/Animals/wawa_exclaim.ogg b/Resources/Audio/Animals/wawa_exclaim.ogg new file mode 100644 index 00000000000..6c9d9dfcd0e Binary files /dev/null and b/Resources/Audio/Animals/wawa_exclaim.ogg differ diff --git a/Resources/Audio/Animals/wawa_mock.ogg b/Resources/Audio/Animals/wawa_mock.ogg new file mode 100644 index 00000000000..6d188ec0543 Binary files /dev/null and b/Resources/Audio/Animals/wawa_mock.ogg differ diff --git a/Resources/Audio/Animals/wawa_protest.ogg b/Resources/Audio/Animals/wawa_protest.ogg new file mode 100644 index 00000000000..50d52ac27d9 Binary files /dev/null and b/Resources/Audio/Animals/wawa_protest.ogg differ diff --git a/Resources/Audio/Animals/wawa_question.ogg b/Resources/Audio/Animals/wawa_question.ogg new file mode 100644 index 00000000000..757b86bdfd6 Binary files /dev/null and b/Resources/Audio/Animals/wawa_question.ogg differ diff --git a/Resources/Audio/Animals/wawa_statement.ogg b/Resources/Audio/Animals/wawa_statement.ogg new file mode 100644 index 00000000000..560df24a807 Binary files /dev/null and b/Resources/Audio/Animals/wawa_statement.ogg differ diff --git a/Resources/Audio/Animals/wawa_the_end.ogg b/Resources/Audio/Animals/wawa_the_end.ogg new file mode 100644 index 00000000000..9350de1f7c3 Binary files /dev/null and b/Resources/Audio/Animals/wawa_the_end.ogg differ diff --git a/Resources/Audio/Animals/wawa_yawn.ogg b/Resources/Audio/Animals/wawa_yawn.ogg new file mode 100644 index 00000000000..766c856ff4d Binary files /dev/null and b/Resources/Audio/Animals/wawa_yawn.ogg differ diff --git a/Resources/Locale/en-US/accent/accents.ftl b/Resources/Locale/en-US/accent/accents.ftl index e42dbe94841..bac7763e283 100644 --- a/Resources/Locale/en-US/accent/accents.ftl +++ b/Resources/Locale/en-US/accent/accents.ftl @@ -134,4 +134,26 @@ accent-words-tomato-1 = Totato! accent-words-tomato-2 = Trotect accent-words-tomato-3 = Mastet? accent-words-tomato-4 = Reaty! -accent-words-tomato-5 = Water... \ No newline at end of file +accent-words-tomato-5 = Water... + +# Scurret +accent-words-scurret-1 = Wa! +accent-words-scurret-2 = Wa? +accent-words-scurret-3 = Wa. +accent-words-scurret-4 = Wa... +accent-words-scurret-5 = Wawa! +accent-words-scurret-6 = Wawa? +accent-words-scurret-7 = Wawa. +accent-words-scurret-8 = Wawa... +accent-words-scurret-9 = Wa wawa! +accent-words-scurret-10 = Wa wawa? +accent-words-scurret-11 = Wa wawa. +accent-words-scurret-12 = Wa wawa... +accent-words-scurret-13 = Wawa wa! +accent-words-scurret-14 = Wawa wa? +accent-words-scurret-15 = Wawa wa. +accent-words-scurret-16 = Wawa wa... +accent-words-scurret-17 = Waaaaaa. +accent-words-scurret-18 = Waaaaaa! +accent-words-scurret-19 = Waaaaaa? +accent-words-scurret-20 = Waaaaaa... diff --git a/Resources/Locale/en-US/chat/managers/chat-manager.ftl b/Resources/Locale/en-US/chat/managers/chat-manager.ftl index 555b0ccc860..6c7203d04b4 100644 --- a/Resources/Locale/en-US/chat/managers/chat-manager.ftl +++ b/Resources/Locale/en-US/chat/managers/chat-manager.ftl @@ -185,3 +185,9 @@ chat-speech-verb-Psychomantic-1 = resonates chat-speech-verb-Psychomantic-2 = projects chat-speech-verb-Psychomantic-3 = impresses chat-speech-verb-Psychomantic-4 = radiates + +chat-speech-verb-name-wawa = Wawa +chat-speech-verb-wawa-1 = intones +chat-speech-verb-wawa-2 = states +chat-speech-verb-wawa-3 = declares +chat-speech-verb-wawa-4 = ponders diff --git a/Resources/Locale/en-US/datasets/names/scurret_first.ftl b/Resources/Locale/en-US/datasets/names/scurret_first.ftl new file mode 100644 index 00000000000..a01a6db8bb1 --- /dev/null +++ b/Resources/Locale/en-US/datasets/names/scurret_first.ftl @@ -0,0 +1,67 @@ +# Scurrets from Planet Wawa have two parts to their name - a 'chosen' and 'qualitative' name. + +# The chosen name is picked by the scurret themselves, +# encompassing a trait or value they hold themselves +# to or have a high value for. Scurrets sometimes change this +# name to denote an important moment in their life. + +# It appears to be common for scurret sets to share the same +# chosen name, with the gaining of a pup's own chosen name +# signalling their transition to adulthood in the community. + +# Given the scurret language is untranslated, these names are +# usually guessed via charades or Pictionary. + +# When all else fails, to NT and her crews, Wa is as good a name as any. + +names-scurret-first-dataset-1 = Wa +names-scurret-first-dataset-2 = Calm +names-scurret-first-dataset-3 = Contented +names-scurret-first-dataset-4 = Patient +names-scurret-first-dataset-5 = Relaxed +names-scurret-first-dataset-6 = Serene +names-scurret-first-dataset-7 = Blissful +names-scurret-first-dataset-8 = Eager +names-scurret-first-dataset-9 = Happy +names-scurret-first-dataset-10 = Inspired +names-scurret-first-dataset-11 = Lively +names-scurret-first-dataset-12 = Playful +names-scurret-first-dataset-13 = Radiant +names-scurret-first-dataset-14 = Vibrant +names-scurret-first-dataset-15 = Brave +names-scurret-first-dataset-16 = Capable +names-scurret-first-dataset-17 = Confident +names-scurret-first-dataset-18 = Daring +names-scurret-first-dataset-19 = Proud +names-scurret-first-dataset-20 = Valiant +names-scurret-first-dataset-21 = Caring +names-scurret-first-dataset-22 = Compassionate +names-scurret-first-dataset-23 = Empathic +names-scurret-first-dataset-24 = Strong +names-scurret-first-dataset-25 = Free +names-scurret-first-dataset-26 = Lucky +names-scurret-first-dataset-27 = Worthy +names-scurret-first-dataset-28 = Blessed +names-scurret-first-dataset-29 = Fortunate +names-scurret-first-dataset-30 = Trusting +names-scurret-first-dataset-31 = Fast +names-scurret-first-dataset-32 = Energetic +names-scurret-first-dataset-33 = Wise +names-scurret-first-dataset-34 = Alert +names-scurret-first-dataset-35 = Uplifting +names-scurret-first-dataset-36 = Considerate +names-scurret-first-dataset-37 = Surviving +names-scurret-first-dataset-38 = Meditating +names-scurret-first-dataset-39 = Hunting +names-scurret-first-dataset-40 = Watching +names-scurret-first-dataset-41 = Resting +names-scurret-first-dataset-42 = Delivering +names-scurret-first-dataset-43 = Swimming +names-scurret-first-dataset-44 = Swinging +names-scurret-first-dataset-45 = Exploding +names-scurret-first-dataset-46 = Romancing +names-scurret-first-dataset-47 = Far-Seeing +names-scurret-first-dataset-48 = Loyal +names-scurret-first-dataset-49 = Inquisitive +# After consulting with lawyers, NT added this one to the dictionary. +names-scurret-first-dataset-50 = Legally Distinct diff --git a/Resources/Locale/en-US/datasets/names/scurret_last.ftl b/Resources/Locale/en-US/datasets/names/scurret_last.ftl new file mode 100644 index 00000000000..bac9b818d14 --- /dev/null +++ b/Resources/Locale/en-US/datasets/names/scurret_last.ftl @@ -0,0 +1,68 @@ +# Scurrets from Planet Wawa have two parts to their name - a 'chosen' and 'qualitative' name. + +# The qualitative name is usually related to an important feature +# of Wawa's wetland habitats that the scurret is associated with +# by their community. + +# Scurret pups, due to both their quantity and complete lack +# of any survival instinct, lack a qualitative name entirely. +# Researchers believe their parents simply give them a number. + +# Given that the scurret language is untranslated, these names are +# usually deduced via the showing of photographs, annoyed and +# repeated pointing at nearby objects, or games of Pictionary. + +# When all else fails, to NT and her crews, Wa is as good a name as any. + +names-scurret-last-dataset-1 = Wa +names-scurret-last-dataset-2 = Trees +names-scurret-last-dataset-3 = Plants +names-scurret-last-dataset-4 = Rocks +names-scurret-last-dataset-5 = Rivers +names-scurret-last-dataset-6 = Groves +names-scurret-last-dataset-7 = Lakes +names-scurret-last-dataset-8 = Marshes +names-scurret-last-dataset-9 = Springs +names-scurret-last-dataset-10 = Reeds +names-scurret-last-dataset-11 = Sunshine +names-scurret-last-dataset-12 = Rain +names-scurret-last-dataset-13 = Clouds +names-scurret-last-dataset-14 = Snowfalls +names-scurret-last-dataset-15 = Stones +names-scurret-last-dataset-16 = Pebbles +names-scurret-last-dataset-17 = Fishes +names-scurret-last-dataset-18 = Insects +names-scurret-last-dataset-19 = Fruits +names-scurret-last-dataset-20 = Flowers +names-scurret-last-dataset-21 = Blossoms +names-scurret-last-dataset-22 = Fogs +names-scurret-last-dataset-23 = Willows +names-scurret-last-dataset-24 = Alders +names-scurret-last-dataset-25 = Birches +names-scurret-last-dataset-26 = Poplars +names-scurret-last-dataset-27 = Marigolds +names-scurret-last-dataset-28 = Rowans +names-scurret-last-dataset-29 = Orchids +names-scurret-last-dataset-30 = Rushes +names-scurret-last-dataset-31 = Lillies +names-scurret-last-dataset-32 = Violets +names-scurret-last-dataset-33 = Maples +names-scurret-last-dataset-34 = Oaks +names-scurret-last-dataset-35 = Hazels +# AND SIR GIDEON OFNIR +names-scurret-last-dataset-36 = the All-Knowing +names-scurret-last-dataset-37 = Tarns +names-scurret-last-dataset-38 = Waters +names-scurret-last-dataset-39 = Reservoirs +names-scurret-last-dataset-40 = Dams +names-scurret-last-dataset-41 = Moors +names-scurret-last-dataset-42 = Fens +names-scurret-last-dataset-43 = Temples +names-scurret-last-dataset-44 = Hills +names-scurret-last-dataset-45 = Copses +names-scurret-last-dataset-46 = Fields +names-scurret-last-dataset-47 = Ancestors +names-scurret-last-dataset-48 = Forests +names-scurret-last-dataset-49 = Secrets +# Nobody's quite sure how this one is in the dictionary. +names-scurret-last-dataset-50 = Space Ferret diff --git a/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl b/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl index 853bd59275a..8c3bca1a4eb 100644 --- a/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl +++ b/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl @@ -335,3 +335,6 @@ ghost-role-information-shiva-description = The first defender of the station. ghost-role-information-wizard-name = Wizard ghost-role-information-wizard-desc = YER A WIZARD! Show the station what your magic is made of. + +ghost-role-information-emotional-support-scurret-name = Emotional Support Scurret +ghost-role-information-emotional-support-scurret-description = Support the crew, be adorable, say "wa" a lot. diff --git a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml index 70b0528d4b1..016e82846dd 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml @@ -421,3 +421,4 @@ - id: BoxDarts amount: 1 prob: 0.05 + diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml index 07b9aaec777..2904a68fe0e 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml @@ -730,6 +730,7 @@ - Hardsuit - WhitelistChameleon - HidesHarpyWings + - type: StaminaDamageResistance coefficient: 0.5 # 50% diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml index 049145e4f56..21a4b812d68 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml @@ -60,6 +60,9 @@ - type: ContainerContainer containers: toggleable-clothing: !type:Container {} + - type: Tag + tags: # if YOU want to make scurret displacements for the regular EVA suit. be my guest. until then. sorgy. + - ScurretWearable #Prisoner EVA - type: entity diff --git a/Resources/Prototypes/Voice/speech_emote_sounds.yml b/Resources/Prototypes/Voice/speech_emote_sounds.yml index c919c92cbb7..a4d3603cf69 100644 --- a/Resources/Prototypes/Voice/speech_emote_sounds.yml +++ b/Resources/Prototypes/Voice/speech_emote_sounds.yml @@ -898,3 +898,4 @@ collection: PlasmamanUnisexScreams sound: path: /Audio/Voice/Skeleton/skeleton_scream.ogg + diff --git a/Resources/Prototypes/_EE/Body/Organs/scurret.yml b/Resources/Prototypes/_EE/Body/Organs/scurret.yml new file mode 100644 index 00000000000..65952b848ef --- /dev/null +++ b/Resources/Prototypes/_EE/Body/Organs/scurret.yml @@ -0,0 +1,125 @@ +# TODO: Add descriptions (many) + +- type: entity + id: PartScurret + parent: [BaseItem, BasePart] + name: "scurret body part" + abstract: true + components: + - type: Extractable + juiceSolution: + reagents: + - ReagentId: Fat + Quantity: 3 + - ReagentId: Blood + Quantity: 10 + - ReagentId: Water + Quantity: 10 + +- type: entity + id: TorsoScurret + name: "scurret torso" + parent: [PartScurret, BaseTorso] + components: + - type: Sprite + sprite: Mobs/Animals/scurret/scurret.rsi + state: "torso_m" + - type: Extractable + juiceSolution: + reagents: + - ReagentId: Fat + Quantity: 10 + - ReagentId: Blood + Quantity: 20 + - ReagentId: Water + Quantity: 10 + +- type: entity + id: HeadScurret + name: "scurret head" + parent: [PartScurret, BaseHead] + components: + - type: Sprite + sprite: Mobs/Animals/scurret/scurret.rsi + state: "head_m" + - type: Extractable + juiceSolution: + reagents: + - ReagentId: Fat + Quantity: 5 + - ReagentId: Blood + Quantity: 10 + - ReagentId: Water + Quantity: 10 + +- type: entity + id: LeftArmScurret + name: "left scurret arm" + parent: [PartScurret, BaseLeftArm] + components: + - type: Sprite + sprite: Mobs/Animals/scurret/scurret.rsi + state: "l_arm" + +- type: entity + id: RightArmScurret + name: "right scurret arm" + parent: [PartScurret, BaseRightArm] + components: + - type: Sprite + sprite: Mobs/Animals/scurret/scurret.rsi + state: "r_arm" + +- type: entity + id: LeftHandScurret + name: "left scurret hand" + parent: [PartScurret, BaseLeftHand] + components: + - type: Sprite + sprite: Mobs/Animals/scurret/scurret.rsi + state: "l_hand" + +- type: entity + id: RightHandScurret + name: "right scurret hand" + parent: [PartScurret, BaseRightHand] + components: + - type: Sprite + sprite: Mobs/Animals/scurret/scurret.rsi + state: "r_hand" + +- type: entity + id: LeftLegScurret + name: "left scurret leg" + parent: [PartScurret, BaseLeftLeg] + components: + - type: Sprite + sprite: Mobs/Animals/scurret/scurret.rsi + state: "l_leg" + +- type: entity + id: RightLegScurret + name: "right scurret leg" + parent: [PartScurret, BaseRightLeg] + components: + - type: Sprite + sprite: Mobs/Animals/scurret/scurret.rsi + state: "r_leg" + +- type: entity + id: LeftFootScurret + name: "left scurret foot" + parent: [PartScurret, BaseLeftFoot] + components: + - type: Sprite + sprite: Mobs/Animals/scurret/scurret.rsi + state: "l_foot" + +- type: entity + id: RightFootScurret + name: "right scurret foot" + parent: [PartScurret, BaseRightFoot] + components: + - type: Sprite + sprite: Mobs/Animals/scurret/scurret.rsi + state: "r_foot" diff --git a/Resources/Prototypes/_EE/Body/Prototypes/Animal/scurret.yml b/Resources/Prototypes/_EE/Body/Prototypes/Animal/scurret.yml new file mode 100644 index 00000000000..6da09f97cc9 --- /dev/null +++ b/Resources/Prototypes/_EE/Body/Prototypes/Animal/scurret.yml @@ -0,0 +1,50 @@ +- type: body + id: Scurret + name: "Scurret" + root: torso + slots: + head: + part: HeadScurret + connections: + - torso + organs: + brain: OrganAnimalBrain + eyes: OrganAnimalEyes + torso: + part: TorsoScurret + connections: + - right arm + - left arm + - right leg + - left leg + - head + organs: + heart: OrganAnimalHeart + lungs: OrganAnimalLungs + stomach: OrganAnimalStomach + liver: OrganAnimalLiver + kidneys: OrganAnimalKidneys + right arm: + part: RightArmScurret + connections: + - right hand + left arm: + part: LeftArmScurret + connections: + - left hand + right hand: + part: RightHandScurret + left hand: + part: LeftHandScurret + right leg: + part: RightLegScurret + connections: + - right foot + left leg: + part: LeftLegScurret + connections: + - left foot + right foot: + part: RightFootScurret + left foot: + part: LeftFootScurret diff --git a/Resources/Prototypes/_EE/Catalog/Cargo/cargo_fun.yml b/Resources/Prototypes/_EE/Catalog/Cargo/cargo_fun.yml new file mode 100644 index 00000000000..a5f21e66397 --- /dev/null +++ b/Resources/Prototypes/_EE/Catalog/Cargo/cargo_fun.yml @@ -0,0 +1,10 @@ + +- type: cargoProduct + id: HydratedScurret + icon: + sprite: Structures/Wallmounts/posters.rsi + state: poster54_legit + product: CrateFunScurret + cost: 25000 # You will surely not regret buying this + category: cargoproduct-category-name-fun + group: market diff --git a/Resources/Prototypes/_EE/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/_EE/Catalog/Fills/Crates/fun.yml new file mode 100644 index 00000000000..182bfa8d67b --- /dev/null +++ b/Resources/Prototypes/_EE/Catalog/Fills/Crates/fun.yml @@ -0,0 +1,19 @@ + +- type: entity + name: hydrated scurret + description: Wait, what? + id: CrateFunScurret + parent: CrateLivestock + components: + - type: StorageFill + contents: + - id: MobEmotionalSupportScurret # How? Why? + - id: DrinkVodkaBottleFull + - id: DrinkWhiskeyBottleFull + - id: DrinkTequilaBottleFull # ...that explains it. + - id: DrinkShotGlass + amount: 2 + - id: Spear # self defence + - id: ClothingHeadHatHardhatYellow + - id: ClothingNeckMantleQM + - id: ClothingHeadsetCargo diff --git a/Resources/Prototypes/_EE/Datasets/Names/scurret.yml b/Resources/Prototypes/_EE/Datasets/Names/scurret.yml new file mode 100644 index 00000000000..9e23557b389 --- /dev/null +++ b/Resources/Prototypes/_EE/Datasets/Names/scurret.yml @@ -0,0 +1,11 @@ +- type: localizedDataset + id: NamesFirstScurret + values: + prefix: names-scurret-first-dataset- + count: 50 + +- type: localizedDataset + id: NamesLastScurret + values: + prefix: names-scurret-last-dataset- + count: 50 diff --git a/Resources/Prototypes/_EE/Entities/Mobs/NPCs/scurret.yml b/Resources/Prototypes/_EE/Entities/Mobs/NPCs/scurret.yml new file mode 100644 index 00000000000..cbc28ceb21d --- /dev/null +++ b/Resources/Prototypes/_EE/Entities/Mobs/NPCs/scurret.yml @@ -0,0 +1,223 @@ +# Defines the scurret, a small, agile sapient species intended for players who want to play as something similar to an ewok. +# Although based on MobBaseAncestor, this species does not have a "developed" playable species it is an ancestor to. + +- type: entity + name: scurret + id: MobBaseScurret + parent: MobBaseAncestor + abstract: true + components: + # Custom names + - type: ReplacementAccent + accent: scurret +# - type: Sprite # Disabled because shitmed. TO DO: DELETE THIS ONCE FIX WORKS +# layers: +# - map: ["enum.DamageStateVisualLayers.Base"] +# sprite: _EE/Mobs/Animals/scurret/scurret.rsi +# state: scurret +# - map: [ "enum.HumanoidVisualLayers.Handcuffs" ] +# color: "#ffffff" +# sprite: Objects/Misc/handcuffs.rsi +# state: body-overlay-2 +# visible: false + - type: Sprite # this isnt going to work alone im sure. but we are fucking trying it anyway :DDDD + drawdepth: Mobs + layers: + # Shitmed Change Start + - map: [ "enum.HumanoidVisualLayers.Chest" ] + - map: [ "enum.HumanoidVisualLayers.Head" ] + - map: [ "enum.HumanoidVisualLayers.Snout" ] + - map: [ "enum.HumanoidVisualLayers.Eyes" ] + - map: [ "enum.HumanoidVisualLayers.RArm" ] + - map: [ "enum.HumanoidVisualLayers.LArm" ] + - map: [ "enum.HumanoidVisualLayers.RLeg" ] + - map: [ "enum.HumanoidVisualLayers.LLeg" ] + - map: ["jumpsuit"] + - map: ["enum.HumanoidVisualLayers.LFoot"] + - map: ["enum.HumanoidVisualLayers.RFoot"] + - map: ["enum.HumanoidVisualLayers.LHand"] + - map: ["enum.HumanoidVisualLayers.RHand"] + - map: ["enum.HumanoidVisualLayers.Handcuffs"] + color: "#ffffff" + sprite: Objects/Misc/handcuffs.rsi + state: body-overlay-2 + visible: false + - map: [ "gloves" ] + - map: [ "shoes" ] + - map: [ "ears" ] + - map: [ "innerBelt" ] # Einstein Engines + - map: [ "innerNeck" ] # Einstein Engines + - map: [ "enum.HumanoidVisualLayers.Tail" ] #goes UNDER your suit. + - map: [ "outerClothing" ] + - map: [ "eyes" ] + - map: [ "belt" ] + - map: [ "id" ] + - map: [ "neck" ] + - map: [ "back" ] + - map: [ "enum.HumanoidVisualLayers.FacialHair" ] + - map: [ "enum.HumanoidVisualLayers.Hair" ] + - map: [ "enum.HumanoidVisualLayers.HeadSide" ] + - map: [ "enum.HumanoidVisualLayers.HeadTop" ] + - map: [ "mask" ] + - map: [ "head" ] + - map: [ "pocket1" ] + - map: [ "pocket2" ] + # Shitmed Change End + # shitmed fix for ported entity + - type: SurgeryTarget + - type: Targeting + - type: HumanoidAppearance + species: Scurret + - type: Body + prototype: Scurret # change this to a custom prototype for scurret. because this (hopefully) is what controls them dropping scurret limbs. + requiredLegs: 2 + # Custom visuals for dead scurrets; be aware these do not work well with equipment. + # Disabled for the sake of Shitmed +# - type: DamageStateVisuals +# states: +# Alive: +# Base: scurret +# Critical: +# Base: scurret_oof +# Dead: +# Base: scurret_rip + # About as tough as a monkey + - type: MobThresholds + thresholds: + 0: Alive + 60: Critical + 125: Dead + - type: Temperature + heatDamageThreshold: 360 + coldDamageThreshold: 285 + currentTemperature: 310.15 + specificHeat: 42 + # Good eatin', you monster. + - type: Butcherable + butcheringType: Spike + spawned: + - id: FoodMeat + amount: 4 + # They wawa! + - type: Vocal + sounds: + Male: Scurret + Female: Scurret + Unsexed: Scurret + wilhelmProbability: 0.01 # the scug, it screams like a man + - type: Speech + speechVerb: Wawa + speechSounds: Wawa + allowedEmotes: ['Thump'] # They're 80% tail + - type: TypingIndicator + proto: moth + - type: InteractionPopup + successChance: 0.99 # Imagine not being allowed to headpat a scurret, chat + interactSuccessString: petting-success-scurret + interactFailureString: petting-failure-scurret + interactSuccessSpawn: EffectHearts + interactSuccessSound: + path: _EE/Audio/Animals/wawa_chillin.ogg + interactFailureSound: + path: _EE/Audio/Animals/wawa_chatter.ogg + # They nyoom + - type: MovementSpeedModifier + baseWalkSpeed: 5 # nyoom + baseSprintSpeed: 7 # NYOOOOOM + - type: MeleeWeapon + soundHit: + path: /Audio/Effects/bite.ogg + angle: 30 + animation: WeaponArcBite + damage: + types: + Piercing: 10 # NOM + - type: Inventory + speciesId: scurret + templateId: scurret + displacements: + jumpsuit: + sizeMaps: + 32: + sprite: _EE/Mobs/Animals/scurret/displacement.rsi + state: jumpsuit + id: + sizeMaps: + 32: + sprite: _EE/Mobs/Animals/scurret/displacement.rsi + state: id + gloves: + sizeMaps: + 32: + sprite: _EE/Mobs/Animals/scurret/displacement.rsi + state: gloves + neck: + sizeMaps: + 32: + sprite: _EE/Mobs/Animals/scurret/displacement.rsi + state: neck + - type: InventorySlots + - type: Food + - type: Hunger + baseDecayRate: 0.05 # They get a lil' hungy + - type: BodyEmotes # Grants them clapping and so on. + soundsId: GeneralBodyEmotes + - type: Tag + tags: + - DoorBumpOpener + - FootstepSound + - CanPilot + - VimPilot + - AnomalyHost + +# Spawnable scurrets have a random name and colour. + +- type: entity + name: scurret + description: Commonly known as Wawa, from the wetlands of Planet Wawa, these critters make up the bulk of Arnolds's Pizza's "loyal workforce". + id: MobScurret + parent: MobBaseScurret + components: + # The have a rich culture + - type: RandomMetadata + nameSegments: + - NamesFirstScurret + - NamesLastScurret + nameFormat: name-format-standard + # They come in a variety of colours + # Obsolete because of shitmed i guess. and also im too lazy to figure out the replacement. +# - type: RandomSprite +# available: +# - enum.DamageStateVisualLayers.Base: +# scurret: ScurretColors + +# Emotional Support Scurrets have a ghost role and equipment. At the moment, these are intended to be used for admemes, but +# feel free to hook them into random content. + +- type: entity + name: Emotional Support Scurret + id: MobBaseEmotionalSupportScurret + parent: MobBaseScurret + abstract: true + components: + - type: Loadout + prototypes: [ EmotionalSupportScurretGear ] + - type: NpcFactionMember + factions: + - Passive + - type: GhostRole + makeSentient: true + name: ghost-role-information-emotional-support-scurret-name + description: ghost-role-information-emotional-support-scurret-description + rules: ghost-role-information-nonantagonist-rules + raffle: + settings: default + - type: GhostTakeoverAvailable + +# Spawnable ESS have a ghost role, equipment, a random name and a random colour. + +- type: entity + name: Emotional Support Scurret + id: MobEmotionalSupportScurret + parent: [MobScurret, MobBaseEmotionalSupportScurret] + description: Commonly known as Wawa, from the wetlands of Planet Wawa, these critters make up the bulk of Arnolds's Pizza's "loyal workforce". This one is here as a temp. diff --git a/Resources/Prototypes/_EE/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/_EE/Entities/Objects/Devices/pda.yml new file mode 100644 index 00000000000..fdb1a152b77 --- /dev/null +++ b/Resources/Prototypes/_EE/Entities/Objects/Devices/pda.yml @@ -0,0 +1,11 @@ + +- type: entity + parent: ClearPDA + id: ScurretPDA + description: A temporary PDA granted to scurret temps. Doesn't do much. Wawa! + components: + - type: Pda + id: VisitorIDCard + - type: Tag # Ignore Chameleon tags + tags: + - DoorBumpOpener diff --git a/Resources/Prototypes/_EE/Entities/Structures/Wallmounts/Signs/posters.yml b/Resources/Prototypes/_EE/Entities/Structures/Wallmounts/Signs/posters.yml new file mode 100644 index 00000000000..a21e40384a5 --- /dev/null +++ b/Resources/Prototypes/_EE/Entities/Structures/Wallmounts/Signs/posters.yml @@ -0,0 +1,8 @@ +- type: entity + parent: PosterBase + id: PosterLegitHelio + name: Helio Logistics ad + description: "A poster advertising Helio Logistics and their adorable mascot. The slogan reads 'Come rain or shine, we deliver on time.'" + components: + - type: Sprite + state: poster54_legit # migrated from 55 -> 54 as we dont have tyrone in 54. textures match diff --git a/Resources/Prototypes/_EE/InventoryTemplates/scurret_inventory_template.yml b/Resources/Prototypes/_EE/InventoryTemplates/scurret_inventory_template.yml new file mode 100644 index 00000000000..78bd059b215 --- /dev/null +++ b/Resources/Prototypes/_EE/InventoryTemplates/scurret_inventory_template.yml @@ -0,0 +1,80 @@ +- type: inventoryTemplate + id: scurret + slots: + - name: ears + slotTexture: ears + slotFlags: EARS + stripTime: 3 + uiWindowPos: 0,2 + strippingWindowPos: 1,2 + displayName: Ears + - name: gloves + slotTexture: gloves + slotFlags: GLOVES + uiWindowPos: 0,1 + strippingWindowPos: 2,2 + displayName: Gloves + - name: head + slotTexture: head + slotFlags: HEAD + uiWindowPos: 1,3 + strippingWindowPos: 0,0 + displayName: Head + - name: mask + slotTexture: mask + slotFlags: MASK + uiWindowPos: 1,2 + strippingWindowPos: 1,1 + displayName: Mask + - name: neck + slotTexture: neck + slotFlags: NECK + uiWindowPos: 1,1 + strippingWindowPos: 0,1 + displayName: Neck + - name: jumpsuit + slotTexture: uniform + slotFlags: INNERCLOTHING + stripTime: 6 + uiWindowPos: 1,0 + strippingWindowPos: 0,2 + displayName: Jumpsuit + - name: id + slotTexture: id + fullTextureName: template_small + slotFlags: IDCARD + slotGroup: SecondHotbar + stripTime: 6 + uiWindowPos: 2,1 + strippingWindowPos: 2,4 + displayName: ID + - name: suitstorage + slotTexture: suit_storage + slotFlags: SUITSTORAGE + slotGroup: MainHotbar + stripTime: 3 + uiWindowPos: 2,0 + strippingWindowPos: 2,5 + dependsOn: jumpsuit + dependsOnComponents: + - type: AllowSuitStorage + displayName: Suit Storage + - name: back + slotTexture: back + fullTextureName: template_small + slotFlags: BACK + slotGroup: SecondHotbar + stripTime: 6 + uiWindowPos: 3,2 + strippingWindowPos: 0,5 + displayName: Back + - name: outerClothing + slotTexture: suit + slotFlags: OUTERCLOTHING + stripTime: 6 + uiWindowPos: 0,3 + strippingWindowPos: 1,3 + displayName: Suit + whitelist: + tags: + - ScurretWearable diff --git a/Resources/Prototypes/_EE/Roles/Jobs/Fun/misc_startinggear.yml b/Resources/Prototypes/_EE/Roles/Jobs/Fun/misc_startinggear.yml new file mode 100644 index 00000000000..c47c14173f8 --- /dev/null +++ b/Resources/Prototypes/_EE/Roles/Jobs/Fun/misc_startinggear.yml @@ -0,0 +1,6 @@ +# Emotional Support Scurret + +- type: startingGear + id: EmotionalSupportScurretGear + equipment: + id: ScurretPDA diff --git a/Resources/Prototypes/_EE/SoundCollections/scurret.yml b/Resources/Prototypes/_EE/SoundCollections/scurret.yml new file mode 100644 index 00000000000..37a01ef31da --- /dev/null +++ b/Resources/Prototypes/_EE/SoundCollections/scurret.yml @@ -0,0 +1,34 @@ +- type: soundCollection + id: WawaLaugh + files: + - _EE/Audio/Animals/wawa_mock.ogg + +- type: soundCollection + id: WawaSneeze + files: + - _EE/Audio/Animals/wawa_achoo.ogg + +- type: soundCollection + id: WawaSigh + files: + - _EE/Audio/Animals/wawa_depression.ogg + +- type: soundCollection + id: WawaScream + files: + - _EE/Audio/Animals/wawa_protest.ogg + +- type: soundCollection + id: WawaCry + files: + - _EE/Audio/Animals/wawa_despair.ogg + +- type: soundCollection + id: WawaYawn + files: + - _EE/Audio/Animals/wawa_yawn.ogg + +- type: soundCollection + id: WawaDeath + files: + - _EE/Audio/Animals/wawa_the_end.ogg diff --git a/Resources/Prototypes/_EE/Species/scurret.yml b/Resources/Prototypes/_EE/Species/scurret.yml new file mode 100644 index 00000000000..06e44c9c617 --- /dev/null +++ b/Resources/Prototypes/_EE/Species/scurret.yml @@ -0,0 +1,124 @@ +- type: species + id: Scurret + name: species-name-scurret + roundStart: false # sad... + prototype: MobScurret + sprites: MobScurretSprites + dollPrototype: MobMonkeyDummy + skinColoration: Hues + markingLimits: MobMonkeyMarkingLimits + + +- type: speciesBaseSprites + id: MobScurretSprites + sprites: + Head: MobScurretHead + HeadTop: MobMonkeyAnyMarking + Chest: MobScurretTorso + Tail: MobScurretTail + Eyes: MobScurretEyes + LArm: MobScurretLArm + RArm: MobScurretRArm + LHand: MobScurretLHand + RHand: MobScurretRHand + LLeg: MobScurretLLeg + RLeg: MobScurretRLeg + LFoot: MobScurretLFoot + RFoot: MobScurretRFoot + +- type: humanoidBaseSprite + id: MobScurretHead + baseSprite: + sprite: _EE/Mobs/Animals/scurret/scurret.rsi + state: head_m + +- type: humanoidBaseSprite + id: MobScurretHeadMale + baseSprite: + sprite: _EE/Mobs/Animals/scurret/scurret.rsi + state: head_m + +- type: humanoidBaseSprite + id: MobScurretHeadFemale + baseSprite: + sprite: _EE/Mobs/Animals/scurret/scurret.rsi + state: head_f + +- type: humanoidBaseSprite + id: MobScurretTorso + baseSprite: + sprite: _EE/Mobs/Animals/scurret/scurret.rsi + state: torso_m + +- type: humanoidBaseSprite + id: MobScurretTorsoMale + baseSprite: + sprite: _EE/Mobs/Animals/scurret/scurret.rsi + state: torso_m + +- type: humanoidBaseSprite + id: MobScurretTorsoFemale + baseSprite: + sprite: _EE/Mobs/Animals/scurret/scurret.rsi + state: torso_f + +- type: humanoidBaseSprite + id: MobScurretLLeg + baseSprite: + sprite: _EE/Mobs/Animals/scurret/scurret.rsi + state: l_leg + +- type: humanoidBaseSprite + id: MobScurretLArm + baseSprite: + sprite: _EE/Mobs/Animals/scurret/scurret.rsi + state: l_arm + +- type: humanoidBaseSprite + id: MobScurretLHand + baseSprite: + sprite: _EE/Mobs/Animals/scurret/scurret.rsi + state: l_hand + +- type: humanoidBaseSprite + id: MobScurretLFoot + baseSprite: + sprite: _EE/Mobs/Animals/scurret/scurret.rsi + state: l_foot + +- type: humanoidBaseSprite + id: MobScurretRLeg + baseSprite: + sprite: _EE/Mobs/Animals/scurret/scurret.rsi + state: r_leg + +- type: humanoidBaseSprite + id: MobScurretRArm + baseSprite: + sprite: _EE/Mobs/Animals/scurret/scurret.rsi + state: r_arm + +- type: humanoidBaseSprite + id: MobScurretRHand + baseSprite: + sprite: _EE/Mobs/Animals/scurret/scurret.rsi + state: r_hand + +- type: humanoidBaseSprite + id: MobScurretRFoot + baseSprite: + sprite: _EE/Mobs/Animals/scurret/scurret.rsi + state: r_foot + +- type: humanoidBaseSprite + id: MobScurretTail + baseSprite: + sprite: _EE/Mobs/Animals/scurret/scurret.rsi + state: tail + +- type: humanoidBaseSprite + id: MobScurretEyes + baseSprite: + sprite: _EE/Mobs/Animals/scurret/scurret.rsi + state: eyes + diff --git a/Resources/Prototypes/_EE/Tags/tags.yml b/Resources/Prototypes/_EE/Tags/tags.yml index 0d209263992..006bf68e43e 100644 --- a/Resources/Prototypes/_EE/Tags/tags.yml +++ b/Resources/Prototypes/_EE/Tags/tags.yml @@ -18,3 +18,6 @@ - type: Tag id: EmptyPosibrain + +- type: Tag # Flags items that scurrets can wear in their back and outerwear slots. + id: ScurretWearable diff --git a/Resources/Prototypes/_EE/Voice/speach_emotes.yml b/Resources/Prototypes/_EE/Voice/speach_emotes.yml new file mode 100644 index 00000000000..f2a708bfcbc --- /dev/null +++ b/Resources/Prototypes/_EE/Voice/speach_emotes.yml @@ -0,0 +1,6 @@ +- type: emote + id: ScurretDeathgasp + name: chat-emote-name-deathgasp + icon: Interface/Emotes/deathgasp.png + chatMessages: ["chat-emote-msg-deathgasp-scurret"] + diff --git a/Resources/Prototypes/_EE/Voice/speech_emote_sounds.yml b/Resources/Prototypes/_EE/Voice/speech_emote_sounds.yml index 85e7f7be027..68aaeaf5f1f 100644 --- a/Resources/Prototypes/_EE/Voice/speech_emote_sounds.yml +++ b/Resources/Prototypes/_EE/Voice/speech_emote_sounds.yml @@ -40,3 +40,21 @@ collection: FemaleGasp DefaultDeathgasp: collection: FemaleDeathGasp + +- type: emoteSounds + id: Scurret + params: + variation: 0.125 + sounds: + Laugh: + collection: WawaLaugh + Sneeze: + collection: WawaSneeze + Cough: + collection: MaleCoughs + Whistle: + collection: Whistles + Sigh: + collection: WawaSigh + Scream: + collection: WawaScream diff --git a/Resources/Prototypes/_EE/Voice/speech_sounds.yml b/Resources/Prototypes/_EE/Voice/speech_sounds.yml index 54accc90df0..b2fe33ab686 100644 --- a/Resources/Prototypes/_EE/Voice/speech_sounds.yml +++ b/Resources/Prototypes/_EE/Voice/speech_sounds.yml @@ -46,3 +46,12 @@ path: /Audio/_EE/Voice/Xelthia/ask.ogg exclaimSound: path: /Audio/_EE/Voice/Xelthia/exclaim.ogg + +- type: speechSounds + id: Wawa + saySound: + path: _EE/Audio/Animals/wawa_statement.ogg + askSound: + path: _EE/Audio/Animals/wawa_question.ogg + exclaimSound: + path: _EE/Audio/Animals/wawa_exclaim.ogg diff --git a/Resources/Prototypes/_EE/Voice/speech_verbs.yml b/Resources/Prototypes/_EE/Voice/speech_verbs.yml index 51c62394849..92ed978b4e5 100644 --- a/Resources/Prototypes/_EE/Voice/speech_verbs.yml +++ b/Resources/Prototypes/_EE/Voice/speech_verbs.yml @@ -3,9 +3,18 @@ name: chat-speech-verb-name-supermatter speechVerbStrings: - chat-speech-verb-supermatter - + - type: speechVerb id: Xelthia name: chat-speech-verb-name-xelthia speechVerbStrings: - chat-speech-verb-default + +- type: speechVerb + id: Wawa + name: chat-speech-verb-name-wawa + speechVerbStrings: + - chat-speech-verb-wawa-1 + - chat-speech-verb-wawa-2 + - chat-speech-verb-wawa-3 + - chat-speech-verb-wawa-4 diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/equipped-OUTERCLOTHING-scurret.png b/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/equipped-OUTERCLOTHING-scurret.png new file mode 100644 index 00000000000..ecf9ff02c16 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/equipped-OUTERCLOTHING-scurret.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/meta.json index 4df179221f8..5fa6f137242 100644 --- a/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/meta.json @@ -29,6 +29,10 @@ "name": "equipped-OUTERCLOTHING-vox", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-scurret", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json index 6e0f3306f79..f362c686cb2 100644 --- a/Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json +++ b/Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from at commit https://github.com/tgstation/tgstation/commit/f01de25493e2bd2706ef9b0303cb0d7b5e3e471b. poster52_contraband, poster53_contraband and poster54_contraband taken from https://github.com/vgstation-coders/vgstation13/blob/435ed5f2a7926e91cc31abac3a0d47d7e9ad7ed4/icons/obj/posters.dmi. originmap, poster55_contraband, poster56_contraband, poster57_contraband and poster39_legit by discord brainfood#7460, poster63_contraband by discord foboscheshir_, poster52_legit by SlamBamActionman, poster53_legit and the original version by @RCOI on discord, poster29_legit modified by TJohnson.", + "copyright": "Taken from at commit https://github.com/tgstation/tgstation/commit/f01de25493e2bd2706ef9b0303cb0d7b5e3e471b. poster52_contraband, poster53_contraband and poster54_contraband taken from https://github.com/vgstation-coders/vgstation13/blob/435ed5f2a7926e91cc31abac3a0d47d7e9ad7ed4/icons/obj/posters.dmi. originmap, poster55_contraband, poster56_contraband, poster57_contraband and poster39_legit by discord brainfood#7460, poster63_contraband by discord foboscheshir_, poster52_legit by SlamBamActionman, poster53_legit and the original version by @RCOI on discord, poster29_legit modified by TJohnson. poster54_legit by FairlySadPanda (Github), based on art and a character owned by Vytian (Discord).", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_EE/Mobs/Animals/scurret/displacement.rsi/back.png b/Resources/Textures/_EE/Mobs/Animals/scurret/displacement.rsi/back.png new file mode 100644 index 00000000000..11055573832 Binary files /dev/null and b/Resources/Textures/_EE/Mobs/Animals/scurret/displacement.rsi/back.png differ diff --git a/Resources/Textures/_EE/Mobs/Animals/scurret/displacement.rsi/ears.png b/Resources/Textures/_EE/Mobs/Animals/scurret/displacement.rsi/ears.png new file mode 100644 index 00000000000..40bba4fdd30 Binary files /dev/null and b/Resources/Textures/_EE/Mobs/Animals/scurret/displacement.rsi/ears.png differ diff --git a/Resources/Textures/_EE/Mobs/Animals/scurret/displacement.rsi/eyes.png b/Resources/Textures/_EE/Mobs/Animals/scurret/displacement.rsi/eyes.png new file mode 100644 index 00000000000..0c6b045da70 Binary files /dev/null and b/Resources/Textures/_EE/Mobs/Animals/scurret/displacement.rsi/eyes.png differ diff --git a/Resources/Textures/_EE/Mobs/Animals/scurret/displacement.rsi/gloves.png b/Resources/Textures/_EE/Mobs/Animals/scurret/displacement.rsi/gloves.png new file mode 100644 index 00000000000..70ec1726d0c Binary files /dev/null and b/Resources/Textures/_EE/Mobs/Animals/scurret/displacement.rsi/gloves.png differ diff --git a/Resources/Textures/_EE/Mobs/Animals/scurret/displacement.rsi/hand.png b/Resources/Textures/_EE/Mobs/Animals/scurret/displacement.rsi/hand.png new file mode 100644 index 00000000000..e77bdd4d224 Binary files /dev/null and b/Resources/Textures/_EE/Mobs/Animals/scurret/displacement.rsi/hand.png differ diff --git a/Resources/Textures/_EE/Mobs/Animals/scurret/displacement.rsi/head.png b/Resources/Textures/_EE/Mobs/Animals/scurret/displacement.rsi/head.png new file mode 100644 index 00000000000..064d1d9e617 Binary files /dev/null and b/Resources/Textures/_EE/Mobs/Animals/scurret/displacement.rsi/head.png differ diff --git a/Resources/Textures/_EE/Mobs/Animals/scurret/displacement.rsi/id.png b/Resources/Textures/_EE/Mobs/Animals/scurret/displacement.rsi/id.png new file mode 100644 index 00000000000..6af79fb8a3b Binary files /dev/null and b/Resources/Textures/_EE/Mobs/Animals/scurret/displacement.rsi/id.png differ diff --git a/Resources/Textures/_EE/Mobs/Animals/scurret/displacement.rsi/jumpsuit.png b/Resources/Textures/_EE/Mobs/Animals/scurret/displacement.rsi/jumpsuit.png new file mode 100644 index 00000000000..41d1e4589d9 Binary files /dev/null and b/Resources/Textures/_EE/Mobs/Animals/scurret/displacement.rsi/jumpsuit.png differ diff --git a/Resources/Textures/_EE/Mobs/Animals/scurret/displacement.rsi/mask.png b/Resources/Textures/_EE/Mobs/Animals/scurret/displacement.rsi/mask.png new file mode 100644 index 00000000000..c8e757e2e54 Binary files /dev/null and b/Resources/Textures/_EE/Mobs/Animals/scurret/displacement.rsi/mask.png differ diff --git a/Resources/Textures/_EE/Mobs/Animals/scurret/displacement.rsi/meta.json b/Resources/Textures/_EE/Mobs/Animals/scurret/displacement.rsi/meta.json new file mode 100644 index 00000000000..6d148c7cc59 --- /dev/null +++ b/Resources/Textures/_EE/Mobs/Animals/scurret/displacement.rsi/meta.json @@ -0,0 +1,54 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Displacement maps made by Hannah 'FairlySadPanda' Dawson (Github), with assistance by TheShuEd (Discord). Wawa!", + "size": { + "x": 32, + "y": 32 + }, + "load": { + "srgb": false + }, + "states": [ + { + "name": "jumpsuit", + "directions": 4 + }, + { + "name": "head", + "directions": 4 + }, + { + "name": "neck", + "directions": 4 + }, + { + "name": "ears", + "directions": 4 + }, + { + "name": "eyes", + "directions": 4 + }, + { + "name": "mask", + "directions": 4 + }, + { + "name": "id", + "directions": 4 + }, + { + "name": "gloves", + "directions": 4 + }, + { + "name": "hand", + "directions": 4 + }, + { + "name": "back", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_EE/Mobs/Animals/scurret/displacement.rsi/neck.png b/Resources/Textures/_EE/Mobs/Animals/scurret/displacement.rsi/neck.png new file mode 100644 index 00000000000..5c2f5918c7c Binary files /dev/null and b/Resources/Textures/_EE/Mobs/Animals/scurret/displacement.rsi/neck.png differ diff --git a/Resources/Textures/_EE/Mobs/Animals/scurret/scurret.rsi/eyes.png b/Resources/Textures/_EE/Mobs/Animals/scurret/scurret.rsi/eyes.png new file mode 100644 index 00000000000..106a47e4bac Binary files /dev/null and b/Resources/Textures/_EE/Mobs/Animals/scurret/scurret.rsi/eyes.png differ diff --git a/Resources/Textures/_EE/Mobs/Animals/scurret/scurret.rsi/head_f.png b/Resources/Textures/_EE/Mobs/Animals/scurret/scurret.rsi/head_f.png new file mode 100644 index 00000000000..5d3a8937aac Binary files /dev/null and b/Resources/Textures/_EE/Mobs/Animals/scurret/scurret.rsi/head_f.png differ diff --git a/Resources/Textures/_EE/Mobs/Animals/scurret/scurret.rsi/head_m.png b/Resources/Textures/_EE/Mobs/Animals/scurret/scurret.rsi/head_m.png new file mode 100644 index 00000000000..5d3a8937aac Binary files /dev/null and b/Resources/Textures/_EE/Mobs/Animals/scurret/scurret.rsi/head_m.png differ diff --git a/Resources/Textures/_EE/Mobs/Animals/scurret/scurret.rsi/l_arm.png b/Resources/Textures/_EE/Mobs/Animals/scurret/scurret.rsi/l_arm.png new file mode 100644 index 00000000000..75e6cc9ae5c Binary files /dev/null and b/Resources/Textures/_EE/Mobs/Animals/scurret/scurret.rsi/l_arm.png differ diff --git a/Resources/Textures/_EE/Mobs/Animals/scurret/scurret.rsi/l_foot.png b/Resources/Textures/_EE/Mobs/Animals/scurret/scurret.rsi/l_foot.png new file mode 100644 index 00000000000..ce6ef4705db Binary files /dev/null and b/Resources/Textures/_EE/Mobs/Animals/scurret/scurret.rsi/l_foot.png differ diff --git a/Resources/Textures/_EE/Mobs/Animals/scurret/scurret.rsi/l_hand.png b/Resources/Textures/_EE/Mobs/Animals/scurret/scurret.rsi/l_hand.png new file mode 100644 index 00000000000..739221d5451 Binary files /dev/null and b/Resources/Textures/_EE/Mobs/Animals/scurret/scurret.rsi/l_hand.png differ diff --git a/Resources/Textures/_EE/Mobs/Animals/scurret/scurret.rsi/l_leg.png b/Resources/Textures/_EE/Mobs/Animals/scurret/scurret.rsi/l_leg.png new file mode 100644 index 00000000000..f5bd65f7724 Binary files /dev/null and b/Resources/Textures/_EE/Mobs/Animals/scurret/scurret.rsi/l_leg.png differ diff --git a/Resources/Textures/_EE/Mobs/Animals/scurret/scurret.rsi/meta.json b/Resources/Textures/_EE/Mobs/Animals/scurret/scurret.rsi/meta.json new file mode 100644 index 00000000000..aa712c7d99c --- /dev/null +++ b/Resources/Textures/_EE/Mobs/Animals/scurret/scurret.rsi/meta.json @@ -0,0 +1,77 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Original sprite by Very-Soft (https://github.com/Very-Soft), edits by Hannah 'FairlySadPanda' Dawson. Displacement maps by Hannah 'FairlySadPanda' Dawson. Original creature concept by VIDEOCULT, and used with kind permission.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "scurret", + "directions": 4 + }, + { + "name": "scurret_rip" + }, + { + "name": "scurret_oof" + }, + { + "name": "head_f", + "directions": 4 + }, + { + "name": "head_m", + "directions": 4 + }, + { + "name": "l_arm", + "directions": 4 + }, + { + "name": "l_foot", + "directions": 4 + }, + { + "name": "l_hand", + "directions": 4 + }, + { + "name": "l_leg", + "directions": 4 + }, + { + "name": "r_arm", + "directions": 4 + }, + { + "name": "r_foot", + "directions": 4 + }, + { + "name": "r_hand", + "directions": 4 + }, + { + "name": "r_leg", + "directions": 4 + }, + { + "name": "torso_f", + "directions": 4 + }, + { + "name": "torso_m", + "directions": 4 + }, + { + "name": "tail", + "directions": 4 + }, + { + "name": "eyes", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_EE/Mobs/Animals/scurret/scurret.rsi/r_arm.png b/Resources/Textures/_EE/Mobs/Animals/scurret/scurret.rsi/r_arm.png new file mode 100644 index 00000000000..7e307160e44 Binary files /dev/null and b/Resources/Textures/_EE/Mobs/Animals/scurret/scurret.rsi/r_arm.png differ diff --git a/Resources/Textures/_EE/Mobs/Animals/scurret/scurret.rsi/r_foot.png b/Resources/Textures/_EE/Mobs/Animals/scurret/scurret.rsi/r_foot.png new file mode 100644 index 00000000000..1165cdc6678 Binary files /dev/null and b/Resources/Textures/_EE/Mobs/Animals/scurret/scurret.rsi/r_foot.png differ diff --git a/Resources/Textures/_EE/Mobs/Animals/scurret/scurret.rsi/r_hand.png b/Resources/Textures/_EE/Mobs/Animals/scurret/scurret.rsi/r_hand.png new file mode 100644 index 00000000000..2c6cfca9f6b Binary files /dev/null and b/Resources/Textures/_EE/Mobs/Animals/scurret/scurret.rsi/r_hand.png differ diff --git a/Resources/Textures/_EE/Mobs/Animals/scurret/scurret.rsi/r_leg.png b/Resources/Textures/_EE/Mobs/Animals/scurret/scurret.rsi/r_leg.png new file mode 100644 index 00000000000..eab635c9073 Binary files /dev/null and b/Resources/Textures/_EE/Mobs/Animals/scurret/scurret.rsi/r_leg.png differ diff --git a/Resources/Textures/_EE/Mobs/Animals/scurret/scurret.rsi/scurret.png b/Resources/Textures/_EE/Mobs/Animals/scurret/scurret.rsi/scurret.png new file mode 100644 index 00000000000..7562f35fabd Binary files /dev/null and b/Resources/Textures/_EE/Mobs/Animals/scurret/scurret.rsi/scurret.png differ diff --git a/Resources/Textures/_EE/Mobs/Animals/scurret/scurret.rsi/scurret_oof.png b/Resources/Textures/_EE/Mobs/Animals/scurret/scurret.rsi/scurret_oof.png new file mode 100644 index 00000000000..e0dd782fa00 Binary files /dev/null and b/Resources/Textures/_EE/Mobs/Animals/scurret/scurret.rsi/scurret_oof.png differ diff --git a/Resources/Textures/_EE/Mobs/Animals/scurret/scurret.rsi/scurret_rip.png b/Resources/Textures/_EE/Mobs/Animals/scurret/scurret.rsi/scurret_rip.png new file mode 100644 index 00000000000..9d3f2a7977c Binary files /dev/null and b/Resources/Textures/_EE/Mobs/Animals/scurret/scurret.rsi/scurret_rip.png differ diff --git a/Resources/Textures/_EE/Mobs/Animals/scurret/scurret.rsi/tail.png b/Resources/Textures/_EE/Mobs/Animals/scurret/scurret.rsi/tail.png new file mode 100644 index 00000000000..f54f8aaf02c Binary files /dev/null and b/Resources/Textures/_EE/Mobs/Animals/scurret/scurret.rsi/tail.png differ diff --git a/Resources/Textures/_EE/Mobs/Animals/scurret/scurret.rsi/torso.png b/Resources/Textures/_EE/Mobs/Animals/scurret/scurret.rsi/torso.png new file mode 100644 index 00000000000..03bd2b6f56f Binary files /dev/null and b/Resources/Textures/_EE/Mobs/Animals/scurret/scurret.rsi/torso.png differ diff --git a/Resources/Textures/_EE/Mobs/Animals/scurret/scurret.rsi/torso_f.png b/Resources/Textures/_EE/Mobs/Animals/scurret/scurret.rsi/torso_f.png new file mode 100644 index 00000000000..03bd2b6f56f Binary files /dev/null and b/Resources/Textures/_EE/Mobs/Animals/scurret/scurret.rsi/torso_f.png differ diff --git a/Resources/Textures/_EE/Mobs/Animals/scurret/scurret.rsi/torso_m.png b/Resources/Textures/_EE/Mobs/Animals/scurret/scurret.rsi/torso_m.png new file mode 100644 index 00000000000..03bd2b6f56f Binary files /dev/null and b/Resources/Textures/_EE/Mobs/Animals/scurret/scurret.rsi/torso_m.png differ diff --git a/Resources/Textures/_EE/Structures/Wallmounts/posters.rsi/meta.json b/Resources/Textures/_EE/Structures/Wallmounts/posters.rsi/meta.json new file mode 100644 index 00000000000..ac6cd511add --- /dev/null +++ b/Resources/Textures/_EE/Structures/Wallmounts/posters.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from at commit https://github.com/tgstation/tgstation/commit/f01de25493e2bd2706ef9b0303cb0d7b5e3e471b. poster54_legit by FairlySadPanda (Github), based on art and a character owned by Vytian (Discord).", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "poster54_legit" + } + ] +} diff --git a/Resources/Textures/_EE/Structures/Wallmounts/posters.rsi/poster54_legit.png b/Resources/Textures/_EE/Structures/Wallmounts/posters.rsi/poster54_legit.png new file mode 100644 index 00000000000..ac02d887a0c Binary files /dev/null and b/Resources/Textures/_EE/Structures/Wallmounts/posters.rsi/poster54_legit.png differ