Repository navigation
Commit f24bca6
authored
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:
>

>
>
> 🐟
>

>
> - [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
- Entities
- Objects
- Decoration
- Fun
- Structures/Machines/Computers
- Textures/Objects/Fun/toys.rsi
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
112 | 112 | | |
113 | 113 | | |
114 | 114 | | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
115 | 125 | | |
116 | 126 | | |
117 | 127 | | |
| |||
205 | 215 | | |
206 | 216 | | |
207 | 217 | | |
| 218 | + | |
| 219 | + | |
| 220 | + | |
| 221 | + | |
| 222 | + | |
| 223 | + | |
| 224 | + | |
| 225 | + | |
| 226 | + | |
| 227 | + | |
208 | 228 | | |
209 | 229 | | |
210 | 230 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
68 | 68 | | |
69 | 69 | | |
70 | 70 | | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
71 | 77 | | |
72 | 78 | | |
73 | 79 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
506 | 506 | | |
507 | 507 | | |
508 | 508 | | |
| 509 | + | |
| 510 | + | |
| 511 | + | |
| 512 | + | |
| 513 | + | |
| 514 | + | |
| 515 | + | |
| 516 | + | |
| 517 | + | |
| 518 | + | |
| 519 | + | |
| 520 | + | |
| 521 | + | |
| 522 | + | |
| 523 | + | |
| 524 | + | |
| 525 | + | |
| 526 | + | |
| 527 | + | |
| 528 | + | |
| 529 | + | |
| 530 | + | |
| 531 | + | |
| 532 | + | |
| 533 | + | |
| 534 | + | |
| 535 | + | |
| 536 | + | |
| 537 | + | |
| 538 | + | |
| 539 | + | |
| 540 | + | |
509 | 541 | | |
510 | 542 | | |
511 | 543 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
63 | 63 | | |
64 | 64 | | |
65 | 65 | | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
66 | 69 | | |
67 | 70 | | |
68 | 71 | | |
| |||
Loading
Loading
0 commit comments