Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ScugCats! #31

Merged
merged 7 commits into from
Jul 22, 2024
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions Resources/Audio/Animals/attributions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
license: "CC-BY-3.0"
copyright: "Modified from 'Meow 4.wav' by freesound user 'TRNGLE. The original audio was trimmed, split to mono, and converted from WAV to OGG format"
source: "https://freesound.org/people/TRNGLE/sounds/368006/"

- files: ["cat_meow2.ogg"]
license: "CC-BY-3.0"
copyright: "Created by freesound user 'TRNGLE. The original audio split to mono, and converted from WAV to OGG format"
Expand Down Expand Up @@ -117,24 +117,28 @@
license: "CC-BY-4.0"
copyright: "Audio is recorded/created by Pfranzen 'FreeSound.org'. The original audio was trimmed and renamed"
source: "https://freesound.org/people/pfranzen/sounds/322744/"

- files: ["dog_bark1.ogg"]
license: "CC0-1.0"
copyright: "Audio is recorded/created by KFerentchak 'FreeSound.org'. The original audio was trimmed and renamed"
source: "https://freesound.org/people/KFerentchak/sounds/235912/"
source: "https://freesound.org/people/KFerentchak/sounds/235912/"

- files: ["dog_bark2.ogg"]
license: "CC0-1.0"
copyright: "Audio is recorded/created by KFerentchak 'FreeSound.org'. The original audio was trimmed and renamed"
source: "https://freesound.org/people/KFerentchak/sounds/235912/"
source: "https://freesound.org/people/KFerentchak/sounds/235912/"

- files: ["dog_bark3.ogg"]
license: "CC0-1.0"
copyright: "Audio is recorded/created by KFerentchak 'FreeSound.org'. The original audio was trimmed and renamed"
source: "https://freesound.org/people/KFerentchak/sounds/235912/"

- files: ["nymph_chirp.ogg"]
license: "CC-BY-SA-3.0"
copyright: "Taken from ParadiseSS13"
source: "https://github.com/ParadiseSS13/Paradise/commit/a34f1054cef5a44a67fdac3b67b811137c6071dd"


- files: ["wawa_exclaim.wav", "wawa_question.wav", "wawa_statement.wav"]
license: "Custom"
copyright: "GPL-3.0 license // andreweathan"
source: "https://github.com/Andrew-Eathan/push-to-meow"
Binary file added Resources/Audio/Animals/wawa_exclaim.wav
Binary file not shown.
Binary file added Resources/Audio/Animals/wawa_question.wav
Binary file not shown.
Binary file added Resources/Audio/Animals/wawa_statement.wav
Binary file not shown.
6 changes: 6 additions & 0 deletions Resources/Locale/en-US/Floof/scugcat.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
ghost-role-information-scugcat-name = ScugCat
ghost-role-information-scugcat-description = You're a scugcat! a very smart creature capable of many things!

chat-speech-verb-wawa-1 = intones
chat-speech-verb-wawa-2 = states
chat-speech-verb-wawa-3 = declares
3 changes: 3 additions & 0 deletions Resources/Locale/en-US/language/languages.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -69,3 +69,6 @@ language-Crab-description = Click!

language-Kobold-name = Kobold
language-Kobold-description = Hiss!

language-ScugSign-name = ScugSign
language-ScugSign-description = Wawa! The secret ScugSign making you able to understand your fellows scug!
8 changes: 8 additions & 0 deletions Resources/Locale/en-US/language/sign-language.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
entity-signlanguage-message = [italic]{$entityName} signs "[BubbleContent]{$message}[/BubbleContent]"[/italic]

language-signlanguage-1 = [italic]{$entityName} signs something.[/italic]
language-signlanguage-2 = [italic]{$entityName} makes weird hand gestures.[/italic]

language-scugsign-1 = [italic]{$entityName} signs something.[/italic]
language-scugsign-2 = [italic]{$entityName} gestures something.[/italic]
language-scugsign-3 = [italic]{$entityName} makes jumping gestures.[/italic]
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,7 @@
- Pig
- Crab
- Kobold
- ScugSign
requires:
- GalacticCommon
setLanguageOnInteract: false
202 changes: 202 additions & 0 deletions Resources/Prototypes/Floof/Entities/Mobs/NPCs/scugcat.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,202 @@
- type: entity
name: ScugCat
id: MobScugCat
parent: MobBaseAncestor
description: He's just a little guy, a jumpy, poor little scug.
components:
- type: Sprite
drawdepth: SmallMobs
layers:
- map: ["enum.DamageStateVisualLayers.Base"]
sprite: Floof/Mobs/Animals/scugcat.rsi
state: scugcat
- map: [ "enum.HumanoidVisualLayers.Handcuffs" ]
color: "#ffffff"
sprite: Objects/Misc/handcuffs.rsi
state: body-overlay-2
visible: false
- type: RandomSprite
getAllGroups: true
available:
- enum.DamageStateVisualLayers.Base:
scugcat: ScugCatColors
- type: DamageStateVisuals
states:
Alive:
Base: scugcat
Critical:
Base: scugcat_crit
Dead:
Base: scugcat_dead
- type: MobThresholds
thresholds:
0: Alive
60: Critical
125: Dead
- type: Temperature
heatDamageThreshold: 360
coldDamageThreshold: 285
currentTemperature: 310.15
specificHeat: 42
- type: Butcherable
butcheringType: Spike
spawned:
- id: FoodMeat
amount: 4 # Good eatin', though. You monster.
- type: Speech
speechVerb: Wawa
speechSounds: Wawa
- type: TypingIndicator
proto: moth
- type: InteractionPopup
successChance: 0.5
interactSuccessString: petting-success-cat
interactFailureString: petting-failure-generic
interactSuccessSpawn: EffectHearts
interactSuccessSound:
path: /Audio/Animals/wawa_statement.wav
- type: MovementSpeedModifier
baseWalkSpeed: 5 # nyoom
baseSprintSpeed: 7 # NYOOOOOM
- type: MeleeWeapon
soundHit:
path: /Audio/Effects/bite.ogg
angle: 0
animation: WeaponArcBite
damage:
types:
Piercing: 5 # NOM - Do NOT mess with skugs.
- type: Physics
- type: Fixtures
fixtures:
fix1:
shape:
!type:PhysShapeCircle
radius: 0.2
density: 120
mask:
- SmallMobMask
layer:
- SmallMobLayer
- type: GhostRole
makeSentient: true
name: ghost-role-information-scugcat-name
description: ghost-role-information-scugcat-description
rules: deltav-ghost-role-information-softantag-rules
- type: GhostTakeoverAvailable
- type: Food
- type: Hunger
- type: Inventory
templateId: scugcat
- type: InventorySlots
- type: NpcFactionMember
factions:
- Cat
- Passive
- type: LanguageKnowledge
speaks:
- ScugSign
understands:
- ScugSign
- Cat

- type: palette
id: ScugCatColors
name: ScugCatColors
colors:
Default: "#ffffff"
Innocent: "#f6f439"
Angry: "#dc5864"
Eldritch: "#dc5864"
Forgotten: "#111111"
Fat: "#fefcab"
WarCriminal: "#ab3430"
Cocaine: "#679cfe"
Mutant: "#7824a0"
Damned: "#98e652"

- type: speechVerb
id: Wawa
speechVerbStrings:
- chat-speech-verb-wawa-1
- chat-speech-verb-wawa-2
- chat-speech-verb-wawa-3

- type: speechSounds
id: Wawa
saySound:
path: /Audio/Animals/wawa_statement.wav
askSound:
path: /Audio/Animals/wawa_question.wav
exclaimSound:
path: /Audio/Animals/wawa_exclaim.wav

- type: inventoryTemplate
id: scugcat
slots:
- name: head
slotTexture: head
slotFlags: HEAD
uiWindowPos: 1,2
strippingWindowPos: 0,0
displayName: Head
- name: ears
slotTexture: ears
slotFlags: EARS
stripTime: 3
uiWindowPos: 0,2
strippingWindowPos: 1,2
displayName: Ears
- name: mask
slotTexture: mask
slotFlags: MASK
uiWindowPos: 0,1
strippingWindowPos: 1,1
displayName: Mask
- name: id
slotTexture: id
slotFlags: IDCARD
slotGroup: SecondHotbar
stripTime: 6
uiWindowPos: 2,1
strippingWindowPos: 2,4
displayName: ID
- name: pocket1
slotTexture: pocket
slotFlags: POCKET
slotGroup: MainHotbar
stripTime: 3
uiWindowPos: 0,3
strippingWindowPos: 0,4
displayName: Pocket 1
stripHidden: false
- name: back
slotTexture: back
slotFlags: BACK
slotGroup: SecondHotbar
stripTime: 6
uiWindowPos: 3,0
strippingWindowPos: 0,5
displayName: Spear
whitelist:
tags:
- Spear

- type: entity
id: ScugCatSpawn
parent: BaseGameRule
noSpawn: true
components:
- type: StationEvent
startAnnouncement: station-event-vent-creatures-start-announcement
startAudio:
path: /Audio/Announcements/attention.ogg
startDelay: 10
earliestStart: 30
minimumPlayers: 10
weight: 5
duration: 50
- type: VentCrittersRule
entries:
- id: MobScugCat
prob: 0.02
10 changes: 10 additions & 0 deletions Resources/Prototypes/Language/languages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -567,3 +567,13 @@
- hiss
- ss
- ee

- type: language
id: ScugSign
signLanguage: true
obfuscation:
!type:ReplacementObfuscation
replacement:
- "language-scugsign-1"
- "language-scugsign-2"
- "language-scugsign-3"
24 changes: 24 additions & 0 deletions Resources/Textures/Floof/Mobs/Animals/scugcat.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from Yogstation at https://github.com/yogstation13/Yogstation/blob/b5a72f35980b15404d3c507d2ad0af06010f6056/icons/mob/pets.dmi, some modifications by Hannah 'FairlySadPanda' Dawson.",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "scugcat",
"directions": 4
},
{
"name": "scugcat_sleep"
},
{
"name": "scugcat_dead"
},
{
"name": "scugcat_crit"
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading