Skip to content

Commit 38c70b5

Browse files
plushies (PentestSS13#311)
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request Adds Spatz and Winter plushies. These just got merged as horse and unicorn plushies on tg, but here they have names. ![Screenshot 2025-05-18 183315](https://github.com/user-attachments/assets/f006940b-d1ad-450d-9ff8-279577512cac) IPC plushie is now craftable. Also moves the IPC plushie and secborg pen to the same file, since they seemed lonely in a file all their own. Now we have a place for future toy additions. <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game 'Tis cute <!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. --> ## Changelog :cl: add: spatz and winter plushies fix: ipc plushie is now craftable refactor: moves IPC plushie and secborg pen to modular plushes.dm /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> --------- Co-authored-by: Ossa88 (SYNAPSE) <[email protected]>
1 parent 96f8746 commit 38c70b5

File tree

9 files changed

+104
-23
lines changed

9 files changed

+104
-23
lines changed

_maps/shuttles/syndicate/syndicate_self_pi.dmm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1840,7 +1840,7 @@
18401840
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
18411841
dir = 8
18421842
},
1843-
/obj/item/toy/plush/ipcplushie,
1843+
/obj/item/toy/plush/pentest/ipcplushie,
18441844
/obj/effect/turf_decal/corner/transparent/purple/full,
18451845
/turf/open/floor/plasteel/dark,
18461846
/area/ship/bridge)

modular_pentest/master_files/code/datums/components/crafting/recipes/misc.dm

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -435,3 +435,30 @@
435435
/obj/item/stack/cable_coil = 5,
436436
)
437437
category = CAT_PLUSH
438+
439+
/datum/crafting_recipe/ipcplush
440+
name = "Strange IPC Plushie"
441+
result = /obj/item/toy/plush/pentest/ipcplushie
442+
reqs = list(
443+
/obj/item/stack/sheet/cotton/cloth = 3,
444+
/obj/item/stack/cable_coil = 5,
445+
)
446+
category = CAT_PLUSH
447+
448+
/datum/crafting_recipe/spatzplush
449+
name = "Spatz Plushie"
450+
result = /obj/item/toy/plush/pentest/spatz
451+
reqs = list(
452+
/obj/item/stack/sheet/cotton/cloth = 3,
453+
/obj/item/stack/cable_coil = 5,
454+
)
455+
category = CAT_PLUSH
456+
457+
/datum/crafting_recipe/winterplush
458+
name = "Winter Plushie"
459+
result = /obj/item/toy/plush/pentest/winter
460+
reqs = list(
461+
/obj/item/stack/sheet/cotton/cloth = 3,
462+
/obj/item/stack/cable_coil = 5,
463+
)
464+
category = CAT_PLUSH

modular_pentest/modules/faction_self/code/loadout_selfrelated.dm

Lines changed: 0 additions & 5 deletions
This file was deleted.

modular_pentest/modules/faction_self/code/plushes.dm

Lines changed: 0 additions & 15 deletions
This file was deleted.
Binary file not shown.
Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
// Pentest Plushies //
2+
3+
/obj/item/toy/plush/pentest
4+
icon = 'modular_pentest/modules/plushes/icons/plushes.dmi'
5+
stuffed = TRUE
6+
7+
/obj/item/toy/plush/pentest/ipcplushie // SELF plushie
8+
name = "strange IPC plushie"
9+
desc = "An adorable stuffed toy that resembles an IPC. It doesn't look like any model you've ever seen, though..."
10+
icon_state = "ipc"
11+
item_state = "ipc"
12+
squeak_override = list('sound/machines/ping.ogg' = 1)
13+
14+
/obj/item/toy/plush/pentest/spatz
15+
name = "Spatz plushie"
16+
desc = "A squishy soft plushie of Spatz the horse. He's so cute."
17+
icon_state = "plushie_spatz"
18+
attack_verb = list("whinnied", "galloped", "pranced", "horsed")
19+
gender = MALE
20+
21+
/obj/item/toy/plush/pentest/winter
22+
name = "Winter plushie"
23+
desc = "A squishy soft unicorn plushie named Winter. She has a magical aura."
24+
icon_state = "plushie_winter"
25+
attack_verb = list("whinnied", "galloped", "pranced", "magicked")
26+
gender = FEMALE
27+
28+
// Other toys and things //
29+
30+
/obj/item/pen/collectible/secborg // SELF pen
31+
name = "security cyborg pen"
32+
desc = "A pen that looks like a model of cyborg that's typically banned in most places. Weird that they chose this design of all things, but it looks cool as hell regardless."
33+
icon = 'modular_pentest/modules/plushes/icons/plushes.dmi'
34+
icon_state = "pensecborg"
35+
36+
// Loadout entries //
37+
38+
/datum/gear/strangeipcplushie
39+
display_name = "toy, strange IPC plushie"
40+
path = /obj/item/toy/plush/pentest/ipcplushie
41+
42+
/datum/gear/spatzplush
43+
display_name = "toy, Spatz plushie"
44+
path = /obj/item/toy/plush/pentest/spatz
45+
46+
/datum/gear/winterplush
47+
display_name = "toy, Winter plushie"
48+
path = /obj/item/toy/plush/pentest/winter
Binary file not shown.
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
https://github.com/PentestSS13/Pentest/pull/
2+
3+
## Plushies
4+
5+
Module ID: PLUSHIES
6+
7+
### Description:
8+
Adds/reorganizes plushies.
9+
10+
### Shiptest Proc/File Changes:
11+
- N/A
12+
13+
### Modular Overrides:
14+
- N/A
15+
16+
### Defines:
17+
- N/A
18+
19+
### Map additions
20+
- N/A
21+
22+
### Included files that are not contained in this module:
23+
- N/A
24+
25+
### Credits:
26+
OnlineGirlfriend - Spatz and Winter plushies
27+
secc - SELF items

modular_pentest/~pentest.dme

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,9 +212,7 @@
212212
#include "modules\faction_nanotrasen\code\pentest_nanotrasen_outfits.dm"
213213
#include "modules\faction_self\code\clothing.dm"
214214
#include "modules\faction_self\code\flooring_decals.dm"
215-
#include "modules\faction_self\code\loadout_selfrelated.dm"
216215
#include "modules\faction_self\code\outfits.dm"
217-
#include "modules\faction_self\code\plushes.dm"
218216
#include "modules\guardian\code\guardian.dm"
219217
#include "modules\guardian\code\guardian_effects.dm"
220218
#include "modules\guardian\code\types\assassin.dm"
@@ -234,6 +232,7 @@
234232
#include "modules\posters\code\posters.dm"
235233
#include "modules\posters\code\printer.dm"
236234
#include "modules\protein_powder\code\protein_powder.dm"
235+
#include "modules\plushes\code\plushes.dm"
237236
#include "modules\quirks\~quirks.dme"
238237
#include "modules\robots\~robots.dme"
239238
#include "modules\serenity_clothes\code\turf.dm"

0 commit comments

Comments
 (0)