Skip to content

Commit f24bca6

Browse files
Mirror: add more carp plushies (DeltaV-Station#206)
## Mirror of PR #26081: [add more carp plushies](space-wizards/space-station-14#26081) from <img src="https://avatars.githubusercontent.com/u/10567778?v=4" alt="space-wizards" width="22"/> [space-wizards](https://github.com/space-wizards)/[space-station-14](https://github.com/space-wizards/space-station-14) ###### `f8305a26a9bd1dc080daca8f45f7289829b91682` PR opened by <img src="https://avatars.githubusercontent.com/u/39013340?v=4" width="16"/><a href="https://github.com/deltanedas"> deltanedas</a> at 2024-03-13 14:44:55 UTC --- PR changed 8 files with 408 additions and 320 deletions. The PR had the following labels: - No C# - Changes: Sprites --- <details open="true"><summary><h1>Original Body</h1></summary> > ## About the PR > holocarp and magicarp getting their attention > > ## Why / Balance > :fish: > > ## Technical details > :fish: > > ## Media > :fish: > ![14:42:24](https://github.com/space-wizards/space-station-14/assets/39013340/d85d0c3f-579b-4e42-a8f9-be065cea02ae) > > > 🐟 > ![14:43:32](https://github.com/space-wizards/space-station-14/assets/39013340/35bb09c9-e498-457b-b4f1-694a005e2ea0) > > - [X] I have added screenshots/videos to this PR showcasing its changes ingame, **or** this PR does not require an ingame showcase > > ## Breaking changes > 🐟 > > **Changelog** > 🆑 > - add: Holocarp and Magicarp plushies can now be found in maintenance. > </details> Co-authored-by: SimpleStation14 <Unknown>
1 parent 42ad9bc commit f24bca6

8 files changed

Lines changed: 408 additions & 320 deletions

File tree

‎Resources/Prototypes/Catalog/Fills/Lockers/misc.yml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,16 @@
112112
prob: 0.44
113113
- id: PlushieCarp
114114
prob: 0.2
115+
orGroup: carp
116+
- id: PlushieHolocarp
117+
prob: 0.05
118+
orGroup: carp
119+
- id: PlushieMagicarp
120+
prob: 0.05
121+
orGroup: carp
122+
- id: PlushieRainbowCarp
123+
prob: 0.03
124+
orGroup: carp
115125
- id: PlushieSlime
116126
prob: 0.2
117127
- id: PlushieSnake
@@ -205,6 +215,16 @@
205215
prob: 0.44
206216
- id: PlushieCarp
207217
prob: 0.2
218+
orGroup: carp
219+
- id: PlushieHolocarp
220+
prob: 0.05
221+
orGroup: carp
222+
- id: PlushieMagicarp
223+
prob: 0.05
224+
orGroup: carp
225+
- id: PlushieRainbowCarp
226+
prob: 0.03
227+
orGroup: carp
208228
- id: PlushieSlime
209229
prob: 0.2
210230
- id: PlushieSnake

‎Resources/Prototypes/Entities/Objects/Decoration/present.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,12 @@
6868
orGroup: GiftPool
6969
- id: PlushieCarp
7070
orGroup: GiftPool
71+
- id: PlushieMagicarp
72+
orGroup: GiftPool
73+
- id: PlushieHolocarp
74+
orGroup: GiftPool
75+
- id: PlushieRainbowCarp
76+
orGroup: GiftPool
7177
- id: PlushieSlime
7278
orGroup: GiftPool
7379
- id: PlushieSnake

‎Resources/Prototypes/Entities/Objects/Fun/toys.yml‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -506,6 +506,38 @@
506506
tags:
507507
- PlushieCarp # DeltaV - fish labeler craft
508508

509+
- type: entity
510+
parent: PlushieCarp
511+
id: PlushieMagicarp
512+
name: magicarp plushie
513+
description: An adorable stuffed toy resembling the exceedingly rare magicarp.
514+
components:
515+
- type: Sprite
516+
state: magicplush
517+
518+
- type: entity
519+
parent: PlushieCarp
520+
id: PlushieRainbowCarp
521+
name: rainbow carp plushie
522+
description: An adorable stuffed toy resembling the legendary rainbow carp.
523+
components:
524+
- type: Sprite
525+
state: rainbowcarpplush
526+
- type: PointLight
527+
radius: 1.5
528+
energy: 2
529+
- type: RgbLightController
530+
layers: [ 0 ]
531+
532+
- type: entity
533+
parent: PlushieCarp
534+
id: PlushieHolocarp
535+
name: holocarp plushie
536+
description: A holographic stuffed toy resembling science's nemesis - the holocarp.
537+
components:
538+
- type: Sprite
539+
state: holoplush
540+
509541
- type: entity
510542
parent: BasePlushie
511543
id: PlushieSlime

‎Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,9 @@
6363
- PlushieSpaceLizard
6464
- PlushieNuke
6565
- PlushieCarp
66+
- PlushieMagicarp
67+
- PlushieHolocarp
68+
- PlushieRainbowCarp
6669
- PlushieRatvar
6770
- PlushieNar
6871
- PlushieSnake
1.43 KB
Loading
565 Bytes
Loading

0 commit comments

Comments
 (0)