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

El Capo #2714

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

El Capo #2714

Show file tree
Hide file tree
Changes from all 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
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ ghost-role-information-cult-cat-rules = You are a [color=red][bold]Free Agent[/b
ghost-role-information-cappy-name = Cappy
ghost-role-information-cappy-description = Stop resisting! Certified in lethal-force and defensive tactics.

ghost-role-information-elcapo-name = El Capo
ghost-role-information-elcapo-description = Found himself in jail after years of cat crimes.

ghost-role-information-crispy-name = Crispy
ghost-role-information-crispy-description = Mistakes were made.

Expand Down
5 changes: 5 additions & 0 deletions Resources/Prototypes/_NF/Datasets/Names/cat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@
values:
- Cappy

- type: dataset
id: names_cat_elcapo
values:
- El Capo

- type: dataset
id: names_cat_clugg
values:
Expand Down
29 changes: 29 additions & 0 deletions Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,35 @@
id: Cappy
- type: SouthernAccent

- type: entity
name: El Capo
parent: [NFMobPet, MobBingusGhost]
id: MobCatElCapo
description: Wanted for countless cat crimes.
components:
- type: Sprite
drawdepth: Mobs
sprite: _NF/Mobs/Pets/cat.rsi
layers:
- map: ["enum.DamageStateVisualLayers.Base"]
state: crimecat
- type: DamageStateVisuals
states:
Alive:
Base: combatcat
- type: GhostRole
name: ghost-role-information-elcapo-name
description: ghost-role-information-elcapo-description
rules: ghost-role-information-nonantagonist-rules
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Free agent at minimum, likely (solo?) antag.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My bad ill fix

- type: RandomMetadata
nameSegments: [names_cat_elcapo]
- type: AutoImplant
implants:
- TrackingImplant
- type: NpcFactionMember
factions:
- Cat

- type: entity
name: Clugg
parent: [NFMobPet, MobCatCaracalGhost]
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 5 additions & 1 deletion Resources/Textures/_NF/Mobs/Pets/cat.rsi/meta.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Modified from https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b, piratecat and mistakecat edited by Dvir001, nfsdcat and cavecat edited by ghostprince | Cult cat taken from tgstation at https://github.com/tgstation/tgstation/blob/master/icons/mob/simple/pets.dmi and modified by erhardsteinhauer (discord/github)",
"copyright": "Modified from https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b, piratecat and mistakecat edited by Dvir001, nfsdcat and cavecat edited by ghostprince, crimecat edited by stagnation | Cult cat taken from tgstation at https://github.com/tgstation/tgstation/blob/master/icons/mob/simple/pets.dmi and modified by erhardsteinhauer (discord/github)",
"states": [
{
"name": "piratecat",
Expand Down Expand Up @@ -94,6 +94,10 @@
"name": "cattag",
"directions": 4
},
{
"name": "crimecat",
"directions": 4
},
{
"name": "cultcat",
"directions": 4
Expand Down
Loading