Skip to content

Commit

Permalink
Clippy The MailCat (#291)
Browse files Browse the repository at this point in the history
* MailCat

* MailCat

* MailCat
  • Loading branch information
dvir001 authored Sep 6, 2023
1 parent c4ebee6 commit 7dde737
Show file tree
Hide file tree
Showing 17 changed files with 223 additions and 6 deletions.
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
ghost-role-information-emotional-support-name = Emotional support pet
ghost-role-information-emotional-support-description = You're an emotional support pet! Loyal to your owner, make sure to cheer them up!
ghost-role-information-clippy-name = Clippy
ghost-role-information-clippy-description = The Station Representative loyal worker, smells like cardboard and papers.
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@
Male: Cat
Female: Cat
Unsexed: Cat
wilhelmProbability: 0.001
- type: Tag
tags:
- CannotSuicide
- DoorBumpOpener
- VimPilot
- type: IdExaminable
- type: Inventory
speciesId: cat
Expand Down Expand Up @@ -110,11 +110,11 @@
Male: Cat
Female: Cat
Unsexed: Cat
wilhelmProbability: 0.001
- type: Tag
tags:
- CannotSuicide
- DoorBumpOpener
- VimPilot
- type: IdExaminable
- type: Inventory
speciesId: cat
Expand Down Expand Up @@ -156,11 +156,11 @@
Male: Cat
Female: Cat
Unsexed: Cat
wilhelmProbability: 0.001
- type: Tag
tags:
- CannotSuicide
- DoorBumpOpener
- VimPilot
- type: IdExaminable
- type: Inventory
speciesId: cat
Expand Down Expand Up @@ -202,11 +202,11 @@
Male: Dog
Female: Dog
Unsexed: Dog
wilhelmProbability: 0.001
- type: Tag
tags:
- CannotSuicide
- DoorBumpOpener
- VimPilot
- type: IdExaminable
- type: Inventory
speciesId: dog
Expand Down Expand Up @@ -280,11 +280,11 @@
Male: Chicken
Female: Chicken
Unsexed: Chicken
wilhelmProbability: 0.001
- type: Tag
tags:
- CannotSuicide
- DoorBumpOpener
- VimPilot
- type: IdExaminable
- type: Inventory
speciesId: chicken
Expand Down Expand Up @@ -323,11 +323,11 @@
Male: Dog
Female: Dog
Unsexed: Dog
wilhelmProbability: 0.001
- type: Tag
tags:
- CannotSuicide
- DoorBumpOpener
- VimPilot
- type: IdExaminable
- type: Inventory
speciesId: dog
Expand Down
31 changes: 31 additions & 0 deletions Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
- type: entity
name: Clippy
parent: MobCatGhost
id: MobCatClippy
description: It looks like you’re writing a letter, would you like help? Clippy is here to help!
components:
- type: Sprite
drawdepth: Mobs
sprite: _NF/Mobs/Pets/cat.rsi
layers:
- map: ["enum.DamageStateVisualLayers.Base"]
state: mailcat
- type: DamageStateVisuals
states:
Alive:
Base: mailcat
Critical:
Base: mailcat_dead
Dead:
Base: mailcat_dead
- type: GhostRole
name: ghost-role-information-clippy-name
description: ghost-role-information-clippy-description
makeSentient: true
allowSpeech: true
allowMovement: true
- type: Inventory
speciesId: cat
templateId: clippy
- type: Loadout
prototypes: [ MobClippyGear ]
12 changes: 12 additions & 0 deletions Resources/Prototypes/_NF/Entities/Spawners/mobs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
- type: entity
name: Clippy Spawner
id: SpawnMobCatClippy
parent: MarkerBase
components:
- type: Sprite
layers:
- state: green
- state: ai
- type: ConditionalSpawner
prototypes:
- MobCatClippy
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
- type: inventoryTemplate
id: clippy
slots:
# - name: ears
# slotTexture: ears
# slotFlags: EARS
# slotGroup: MainHotbar
# stripTime: 3
# uiWindowPos: 1,2
# strippingWindowPos: 1,2
# displayName: Ears

- name: mask
slotTexture: mask
slotFlags: MASK
uiWindowPos: 1,1
strippingWindowPos: 1,1
displayName: Mask
whitelist:
tags:
- PetWearable

- name: suitstorage
slotTexture: suit_storage
slotFlags: SUITSTORAGE
slotGroup: SecondHotbar
stripTime: 3
uiWindowPos: 2,0
strippingWindowPos: 2,5
displayName: Suit Storage
whitelist:
components:
- GasTank

- name: id
slotTexture: id
slotFlags: IDCARD
slotGroup: SecondHotbar
stripTime: 6
uiWindowPos: 2,1
strippingWindowPos: 2,4
displayName: ID
5 changes: 5 additions & 0 deletions Resources/Prototypes/_NF/Roles/Jobs/Fun/misc_startinggear.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,8 @@
id: MobEmotionalSupportGear
equipment:
id: PassengerIDCard

- type: startingGear
id: MobClippyGear
equipment:
id: MailCarrierIDCard
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
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/_NF/Mobs/Pets/cat.rsi/cattag.png
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
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
124 changes: 124 additions & 0 deletions Resources/Textures/_NF/Mobs/Pets/cat.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,124 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b",
"states": [
{
"name": "mailcat",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "mailcat_dead",
"delays": [
[
1
]
]
},
{
"name": "cat_deadcollar",
"delays": [
[
1
]
]
},
{
"name": "cat_deadtag",
"delays": [
[
1
]
]
},
{
"name": "mailcat_rest",
"delays": [
[
0.1,
0.2,
0.1,
0.2
]
]
},
{
"name": "cat_restcollar",
"delays": [
[
1
]
]
},
{
"name": "cat_resttag",
"delays": [
[
1
]
]
},
{
"name": "mailcat_sit",
"delays": [
[
1
]
]
},
{
"name": "catcollar",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "cattag",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
}
]
}

0 comments on commit 7dde737

Please sign in to comment.