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

a fistful of plushies #2591

Merged
merged 6 commits into from
Dec 21, 2024
Merged
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 @@ -60,6 +60,9 @@
CrazyGlue: 1
emaggedInventory:
PlushieJester: 3
PlushieJanitor: 3
PlushieMailVulp: 3
PlushieYarrMoth: 3
PlushieNuke: 3
PlushieRGBee: 3
BalloonCorgi: 2
Expand Down
20 changes: 20 additions & 0 deletions Resources/Prototypes/_NF/Entities/Objects/Fun/toys.yml
Original file line number Diff line number Diff line change
Expand Up @@ -420,6 +420,26 @@
sprite: _NF/Objects/Fun/toys.rsi
state: plushie_vulp

- type: entity
parent: BasePlushieVulp
id: PlushieMailVulp
name: mail vulp plushie
description: Smells minty and reminds you of unopened mail. You should check your mail!
components:
- type: Sprite
sprite: _NF/Objects/Fun/toys.rsi
state: plushie_mailvulp

- type: entity
parent: BasePlushieMoff
id: PlushieYarrMoth
name: yarr moth plushie
description: It's dastardly and has a dashing cloak. It chitters when you squeeze it!
components:
- type: Sprite
sprite: _NF/Objects/Fun/toys.rsi
state: plushie_yarrmoth

- type: entity
parent: BasePlushieVulp
id: PlushieCorgi
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1207,6 +1207,8 @@
- NFPlushieEngineerRecipe
- PlushieJesterRecipe
- PlushieJanitorRecipe
- PlushieYarrMothRecipe
- PlushieMailVulpRecipe
- PlushieNukeRecipe
- PlushieRGBeeRecipe
- BalloonCorgiRecipe
Expand Down
6 changes: 6 additions & 0 deletions Resources/Prototypes/_NF/Mail/mail.yml
Original file line number Diff line number Diff line change
Expand Up @@ -537,6 +537,12 @@
- id: PlushieJester
prob: 0.05
orGroup: Plushie
- id: PlushieMailVulp
prob: 0.05
orGroup: Plushie
- id: PlushieYarrMoth
prob: 0.05
orGroup: Plushie

- type: entity
categories: [ HideSpawnMenu ]
Expand Down
10 changes: 10 additions & 0 deletions Resources/Prototypes/_NF/Recipes/Lathes/prizecounter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,16 @@
result: PlushieMoff
parent: BasePrize15Recipe

- type: latheRecipe
id: PlushieMailVulpRecipe
result: PlushieMailVulp
parent: BasePrize15Recipe

- type: latheRecipe
id: PlushieYarrMothRecipe
result: PlushieYarrMoth
parent: BasePrize15Recipe

- type: latheRecipe
id: PlushieMoffsicianRecipe
result: PlushieMoffsician
Expand Down
8 changes: 7 additions & 1 deletion Resources/Textures/_NF/Objects/Fun/toys.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "plushie_jester, plushie_trystan, plushie_vulp: gentlejester-148196053781315584 / plushie_slips: mintymoo-449394523089403905 / gnome/ipc/grey/loveable/abductor/abductor_agent/deer - Taken from Paradise (toy.dmi) at https://github.com/ParadiseSS13/Paradise/tree/dab6fc55044e4a86d2107629cf148229001c7cd2, construction, botany, engineer and cmo lizard plushies by Created by Ghost Prince for use on Frontier Server.",
"copyright": "plushie_jester, plushie_trystan, plushie_vulp: gentlejester-148196053781315584 / plushie_slips: mintymoo-449394523089403905 / gnome/ipc/grey/loveable/abductor/abductor_agent/deer - Taken from Paradise (toy.dmi) at https://github.com/ParadiseSS13/Paradise/tree/dab6fc55044e4a86d2107629cf148229001c7cd2, construction, botany, engineer and cmo lizard plushies by Created by Ghost Prince for use on Frontier Server. Yarrmoth and Mailvulp by lvl1eevee (Discord)",
"size": {
"x": 32,
"y": 32
Expand Down Expand Up @@ -46,6 +46,12 @@
{
"name": "plushie_construction"
},
{
"name": "plushie_yarrmoth"
},
{
"name": "plushie_mailvulp"
},
{
"name": "gnome"
}
Expand Down
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