Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

add more carp plushies (#26081)

Browse Source 
* carp plushie textures

* add the plushies

* add plushies to spawners

* rainbow carp and make special plushies rarer

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
This commit is contained in:
deltanedas
2024-03-15 02:58:17 +00:00
committed by GitHub
parent 41ca8f3dfc
commit f8305a26a9
8 changed files with 408 additions and 320 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
View File

@@ -112,6 +112,16 @@
prob: 0.44 prob: 0.44
- id: PlushieCarp - id: PlushieCarp
prob: 0.2 prob: 0.2
orGroup: carp
- id: PlushieHolocarp
prob: 0.05
orGroup: carp
- id: PlushieMagicarp
prob: 0.05
orGroup: carp
- id: PlushieRainbowCarp
prob: 0.03
orGroup: carp
- id: PlushieSlime - id: PlushieSlime
prob: 0.2 prob: 0.2
- id: PlushieSnake - id: PlushieSnake
@@ -205,6 +215,16 @@
prob: 0.44 prob: 0.44
- id: PlushieCarp - id: PlushieCarp
prob: 0.2 prob: 0.2
orGroup: carp
- id: PlushieHolocarp
prob: 0.05
orGroup: carp
- id: PlushieMagicarp
prob: 0.05
orGroup: carp
- id: PlushieRainbowCarp
prob: 0.03
orGroup: carp
- id: PlushieSlime - id: PlushieSlime
prob: 0.2 prob: 0.2
- id: PlushieSnake - id: PlushieSnake

6
Resources/Prototypes/Entities/Objects/Decoration/present.yml
View File

@@ -68,6 +68,12 @@
orGroup: GiftPool orGroup: GiftPool
- id: PlushieCarp - id: PlushieCarp
orGroup: GiftPool orGroup: GiftPool
- id: PlushieMagicarp
orGroup: GiftPool
- id: PlushieHolocarp
orGroup: GiftPool
- id: PlushieRainbowCarp
orGroup: GiftPool
- id: PlushieSlime - id: PlushieSlime
orGroup: GiftPool orGroup: GiftPool
- id: PlushieSnake - id: PlushieSnake

32
Resources/Prototypes/Entities/Objects/Fun/toys.yml
View File

@@ -521,6 +521,38 @@
angle: 0 angle: 0
animation: WeaponArcBite # Rrrr! animation: WeaponArcBite # Rrrr!
- type: entity
parent: PlushieCarp
id: PlushieMagicarp
name: magicarp plushie
description: An adorable stuffed toy resembling the exceedingly rare magicarp.
components:
- type: Sprite
state: magicplush
- type: entity
parent: PlushieCarp
id: PlushieRainbowCarp
name: rainbow carp plushie
description: An adorable stuffed toy resembling the legendary rainbow carp.
components:
- type: Sprite
state: rainbowcarpplush
- type: PointLight
radius: 1.5
energy: 2
- type: RgbLightController
layers: [ 0 ]
- type: entity
parent: PlushieCarp
id: PlushieHolocarp
name: holocarp plushie
description: A holographic stuffed toy resembling science's nemesis - the holocarp.
components:
- type: Sprite
state: holoplush
- type: entity - type: entity
parent: BasePlushie parent: BasePlushie
id: PlushieSlime id: PlushieSlime

3
Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml
View File

@@ -63,6 +63,9 @@
- PlushieSpaceLizard - PlushieSpaceLizard
- PlushieNuke - PlushieNuke
- PlushieCarp - PlushieCarp
- PlushieMagicarp
- PlushieHolocarp
- PlushieRainbowCarp
- PlushieRatvar - PlushieRatvar
- PlushieNar - PlushieNar
- PlushieSnake - PlushieSnake

BIN
Resources/Textures/Objects/Fun/toys.rsi/holoplush.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
Resources/Textures/Objects/Fun/toys.rsi/magicplush.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 565 B

667
Resources/Textures/Objects/Fun/toys.rsi/meta.json
View File

@@ -1,328 +1,355 @@
{ {
"version": 1, "version": 1,
"license": "CC-BY-SA-3.0", "license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432, orb, orb-inhand-left and orb-inhand-right created by Pancake, plushie_diona and plushie_diona1 created by discord user Deos#5630, toy-mouse-equipped-HELMET is a resprited 1-equipped-HELMET in mouse.rsi by PuroSlavKing (Github), plushie_xeno by LinkUyx#6557, plushie_hampter by RenLou#4333, beachball taken from https://github.com/ss220-space/Paradise/commit/662c08272acd7be79531550919f56f846726eabb, beachb-inhand by ;3#1161, bee hat and in-hand sprites drawn by Ubaser, plushie_penguin by netwy, plushie_arachnid by PixelTheKermit (github), plushie human by TheShuEd, NanoTrasen Balloon by MACMAN2003", "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432, orb, orb-inhand-left and orb-inhand-right created by Pancake, plushie_diona and plushie_diona1 created by discord user Deos#5630, toy-mouse-equipped-HELMET is a resprited 1-equipped-HELMET in mouse.rsi by PuroSlavKing (Github), plushie_xeno by LinkUyx#6557, plushie_hampter by RenLou#4333, beachball taken from https://github.com/ss220-space/Paradise/commit/662c08272acd7be79531550919f56f846726eabb, beachb-inhand by ;3#1161, bee hat and in-hand sprites drawn by Ubaser, plushie_penguin by netwy, plushie_arachnid by PixelTheKermit (github), plushie human by TheShuEd, NanoTrasen Balloon by MACMAN2003, holoplush and magicplush modified by deltanedas (github)",
"size": { "size": {
"x": 32, "x": 32,
"y": 32 "y": 32
}, },
"states": [ "states": [
{ {
"name": "plushie_ratvar" "name": "plushie_ratvar"
}, },
{ {
"name": "plushie_penguin" "name": "plushie_penguin"
}, },
{ {
"name": "plushie_moth" "name": "plushie_moth"
}, },
{ {
"name": "plushie_rouny", "name": "plushie_rouny",
"directions": 4 "directions": 4
}, },
{ {
"name": "plushie_spacelizard" "name": "plushie_spacelizard"
}, },
{ {
"name": "carpplush" "name": "carpplush"
}, },
{ {
"name": "narplush" "name": "holoplush",
}, "delays": [
{ [
"name": "plushie_h" 0.1,
}, 0.1,
{ 0.1,
"name": "bee-equipped-HELMET", 0.1,
"directions": 4 0.1,
}, 0.1,
{ 0.1,
"name": "bee-inhand-left", 0.1,
"directions": 4 0.1,
}, 0.1,
{ 0.1,
"name": "bee-inhand-right", 0.1,
"directions": 4 0.1,
}, 0.1
{ ]
"name": "plushie_hampter" ]
}, },
{ {
"name": "plushie_arachnid" "name": "magicplush"
}, },
{ {
"name": "plushie_lizard" "name": "rainbowcarpplush"
}, },
{ {
"name": "plushie_lizard_mirrored" "name": "narplush"
}, },
{ {
"name": "plushie_lamp" "name": "plushie_h"
}, },
{ {
"name": "plushie_nuke" "name": "bee-equipped-HELMET",
}, "directions": 4
{ },
"name": "plushie_atmosian" {
}, "name": "bee-inhand-left",
{ "directions": 4
"name": "plushie_slime" },
}, {
{ "name": "bee-inhand-right",
"name": "plushie_snake" "directions": 4
}, },
{ {
"name": "plushie_vox" "name": "plushie_hampter"
}, },
{ {
"name": "plushie_diona" "name": "plushie_arachnid"
}, },
{ {
"name": "plushie_human" "name": "plushie_lizard"
}, },
{ {
"name": "plushie_diona1" "name": "plushie_lizard_mirrored"
}, },
{ {
"name": "plushie_xeno" "name": "plushie_lamp"
}, },
{ {
"name": "carpplush-inhand-left", "name": "plushie_nuke"
"directions": 4 },
}, {
{ "name": "plushie_atmosian"
"name": "carpplush-inhand-right", },
"directions": 4 {
}, "name": "plushie_slime"
{ },
"name": "AI" {
}, "name": "plushie_snake"
{ },
"name": "base" {
}, "name": "plushie_vox"
{ },
"name": "bolt-closed" {
}, "name": "plushie_diona"
{ },
"name": "bolt-open" {
}, "name": "plushie_human"
{ },
"name": "foamblade" {
}, "name": "plushie_diona1"
{ },
"name": "foamcrossbow" {
}, "name": "plushie_xeno"
{ },
"name": "foamdart" {
}, "name": "carpplush-inhand-left",
{ "directions": 4
"name": "foambox" },
}, {
{ "name": "carpplush-inhand-right",
"name": "ian" "directions": 4
}, },
{ {
"name": "nuketoy" "name": "AI"
}, },
{ {
"name": "snappop" "name": "base"
}, },
{ {
"name": "spbox" "name": "bolt-closed"
}, },
{ {
"name": "toy_mouse" "name": "bolt-open"
}, },
{ {
"name": "mouse-equipped-HELMET", "name": "foamblade"
"directions": 4 },
}, {
{ "name": "foamcrossbow"
"name": "capbullet" },
}, {
{ "name": "foamdart"
"name": "foamcrossbow-inhand-right", },
"directions": 4 {
}, "name": "foambox"
{ },
"name": "foamcrossbow-inhand-left", {
"directions": 4 "name": "ian"
}, },
{ {
"name": "capgun-inhand-right", "name": "nuketoy"
"directions": 4 },
}, {
{ "name": "snappop"
"name": "capgun-inhand-left", },
"directions": 4 {
}, "name": "spbox"
{ },
"name": "foamblade-inhand-right", {
"directions": 4 "name": "toy_mouse"
}, },
{ {
"name": "foamblade-inhand-left", "name": "mouse-equipped-HELMET",
"directions": 4 "directions": 4
}, },
{ {
"name": "corgib-inhand-right", "name": "capbullet"
"directions": 4 },
}, {
{ "name": "foamcrossbow-inhand-right",
"name": "corgib-inhand-left", "directions": 4
"directions": 4 },
}, {
{ "name": "foamcrossbow-inhand-left",
"name": "ntb-inhand-right", "directions": 4
"directions": 4 },
}, {
{ "name": "capgun-inhand-right",
"name": "ntb-inhand-left", "directions": 4
"directions": 4 },
}, {
{ "name": "capgun-inhand-left",
"name": "synb-inhand-left", "directions": 4
"directions": 4 },
}, {
{ "name": "foamblade-inhand-right",
"name": "synb-inhand-right", "directions": 4
"directions": 4 },
}, {
{ "name": "foamblade-inhand-left",
"name": "synb" "directions": 4
}, },
{ {
"name": "ntb" "name": "corgib-inhand-right",
}, "directions": 4
{ },
"name": "corgib" {
}, "name": "corgib-inhand-left",
{ "directions": 4
"name": "football" },
}, {
{ "name": "ntb-inhand-right",
"name": "footb-inhand-right", "directions": 4
"directions": 4 },
}, {
{ "name": "ntb-inhand-left",
"name": "footb-inhand-left", "directions": 4
"directions": 4 },
}, {
{ "name": "synb-inhand-left",
"name": "basketball" "directions": 4
}, },
{ {
"name": "bask-inhand-right", "name": "synb-inhand-right",
"directions": 4, "directions": 4
"delays": [ },
[ {
0.1, "name": "synb"
0.1, },
0.1, {
0.1, "name": "ntb"
0.1 },
], {
[ "name": "corgib"
0.1, },
0.1, {
0.1, "name": "football"
0.1, },
0.1 {
], "name": "footb-inhand-right",
[ "directions": 4
0.1, },
0.1, {
0.1, "name": "footb-inhand-left",
0.1, "directions": 4
0.1 },
], {
[ "name": "basketball"
0.1, },
0.1, {
0.1, "name": "bask-inhand-right",
0.1, "directions": 4,
0.1 "delays": [
] [
] 0.1,
}, 0.1,
{ 0.1,
"name": "bask-inhand-left", 0.1,
"directions": 4, 0.1
"delays": [ ],
[ [
0.1, 0.1,
0.1, 0.1,
0.1, 0.1,
0.1, 0.1,
0.1 0.1
], ],
[ [
0.1, 0.1,
0.1, 0.1,
0.1, 0.1,
0.1, 0.1,
0.1 0.1
], ],
[ [
0.1, 0.1,
0.1, 0.1,
0.1, 0.1,
0.1, 0.1,
0.1 0.1
], ]
[ ]
0.1, },
0.1, {
0.1, "name": "bask-inhand-left",
0.1, "directions": 4,
0.1 "delays": [
] [
] 0.1,
}, 0.1,
{ 0.1,
"name": "singularitytoy", 0.1,
"delays": [ 0.1
[ ],
0.1, [
0.1, 0.1,
0.1, 0.1,
0.1, 0.1,
0.1, 0.1,
0.1, 0.1
0.1, ],
0.1 [
] 0.1,
] 0.1,
}, 0.1,
{ 0.1,
"name": "orb", 0.1
"delays": [ ],
[ [
0.2, 0.1,
0.2, 0.1,
0.2, 0.1,
0.2 0.1,
] 0.1
] ]
}, ]
{ },
"name": "orb-inhand-left", {
"directions": 4 "name": "singularitytoy",
}, "delays": [
{ [
"name": "orb-inhand-right", 0.1,
"directions": 4 0.1,
}, 0.1,
{ 0.1,
"name": "beachball" 0.1,
}, 0.1,
{ 0.1,
"name": "beachb-inhand-left", 0.1
"directions": 4 ]
}, ]
{ },
"name": "beachb-inhand-right", {
"directions": 4 "name": "orb",
} "delays": [
] [
0.2,
0.2,
0.2,
0.2
]
]
},
{
"name": "orb-inhand-left",
"directions": 4
},
{
"name": "orb-inhand-right",
"directions": 4
},
{
"name": "beachball"
},
{
"name": "beachb-inhand-left",
"directions": 4
},
{
"name": "beachb-inhand-right",
"directions": 4
}
]
} }

BIN
Resources/Textures/Objects/Fun/toys.rsi/rainbowcarpplush.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 692 B