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.

Sign up for GitHub

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

Ports Different Variants of Nian Plushies and Introduces a Plush Spawner #27450

Merged
merged 23 commits into from
Dec 18, 2024
Merged

Ports Different Variants of Nian Plushies and Introduces a Plush Spawner #27450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
029b7ea
ports over more nian plushies from shiptest/beestation and introduces…
haydenredacted Oct 17, 2024
6cdb259
Merge branch 'ParadiseSS13:master' into moffplushies
haydenredacted Nov 21, 2024
eb03271
remove a value
haydenredacted Nov 25, 2024
8c2edfe
removed a value
haydenredacted Nov 25, 2024
2158af0
removed a value
haydenredacted Nov 25, 2024
a923ee3
remove a value
haydenredacted Nov 25, 2024
7f06a36
Update code/game/objects/effects/spawners/random/plushie_spawners.dm
haydenredacted Nov 25, 2024
c5bfa6f
Update code/game/objects/effects/spawners/random/plushie_spawners.dm
haydenredacted Nov 25, 2024
4ae746d
this should fix the conflict
haydenredacted Nov 25, 2024
e6e52f0
Merge branch 'moffplushies' of https://github.com/haydenredacted/Para…
haydenredacted Nov 25, 2024
e3ff805
please let this upload fix the conflict
haydenredacted Nov 30, 2024
d940414
upstream update
haydenredacted Dec 6, 2024
69b7fad
if this doesn't work, to coding chat I shall go
haydenredacted Dec 7, 2024
152ecec
i need to stop pressing commit as a form of saving, my apologies.
haydenredacted Dec 7, 2024
758bd93
added the dmi back
haydenredacted Dec 7, 2024
af4a1b4
fixing indentation
haydenredacted Dec 7, 2024
bf3d821
Merge branch 'master' into moffplushies
haydenredacted Dec 7, 2024
957286f
Merge branch 'master' into moffplushies
haydenredacted Dec 8, 2024
79aac28
Merge branch 'master' into moffplushies
haydenredacted Dec 8, 2024
ab0f9b7
Merge branch 'master' into moffplushies
haydenredacted Dec 10, 2024
83c17b0
removes a comment.
haydenredacted Dec 17, 2024
58a7aac
Merge branch 'ParadiseSS13:master' into moffplushies
haydenredacted Dec 17, 2024
1c88024
bumps the weight of tools and materials up to 4
haydenredacted Dec 17, 2024
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
6 changes: 4 additions & 2 deletions code/_globalvars/lists/maint_loot_tables.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
GLOBAL_LIST_INIT(maintenance_loot_tier_0, list(
list(
// Tools
/obj/effect/spawner/random/engineering/tools,
/obj/effect/spawner/random/engineering/tools = 4,

// Materials
/obj/effect/spawner/random/engineering/materials,
/obj/effect/spawner/random/engineering/materials = 4,
// Plushies
/obj/effect/spawner/random/plushies = 1,
) = 6,

list(
Expand Down
85 changes: 85 additions & 0 deletions code/game/objects/effects/spawners/random/plushie_spawners.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
/obj/effect/spawner/random/plushies
name = "plushie spawner"
icon = 'icons/effects/random_spawners.dmi'
icon_state = "plushie"
loot = list(
list(
/obj/item/toy/plushie/carpplushie/ice,
/obj/item/toy/plushie/carpplushie/silent,
/obj/item/toy/plushie/carpplushie/silent,
/obj/item/toy/plushie/carpplushie/electric,
/obj/item/toy/plushie/carpplushie/gold,
/obj/item/toy/plushie/carpplushie/toxin,
/obj/item/toy/plushie/carpplushie/dragon,
/obj/item/toy/plushie/carpplushie/pink,
/obj/item/toy/plushie/carpplushie/candy,
/obj/item/toy/plushie/carpplushie/nebula,
/obj/item/toy/plushie/carpplushie/void
),

list(
/obj/item/toy/plushie/red_fox,
/obj/item/toy/plushie/black_fox,
/obj/item/toy/plushie/marble_fox,
/obj/item/toy/plushie/blue_fox,
/obj/item/toy/plushie/orange_fox,
/obj/item/toy/plushie/coffee_fox,
/obj/item/toy/plushie/pink_fox,
/obj/item/toy/plushie/purple_fox,
/obj/item/toy/plushie/crimson_fox
),

list(
/obj/item/toy/plushie/corgi,
/obj/item/toy/plushie/girly_corgi,
/obj/item/toy/plushie/robo_corgi,
/obj/item/toy/plushie/octopus,
/obj/item/toy/plushie/face_hugger,
/obj/item/toy/plushie/deer,
/obj/item/toy/plushie/snakeplushie,
/obj/item/toy/plushie/lizardplushie,
/obj/item/toy/plushie/slimeplushie,
/obj/item/toy/plushie/nukeplushie,
/obj/item/toy/plushie/shark
),

list(
/obj/item/toy/plushie/black_cat,
/obj/item/toy/plushie/grey_cat,
/obj/item/toy/plushie/white_cat,
/obj/item/toy/plushie/orange_cat,
/obj/item/toy/plushie/siamese_cat,
/obj/item/toy/plushie/tabby_cat,
/obj/item/toy/plushie/tuxedo_cat
),

list(// species plushie minus nian
/obj/item/toy/plushie/voxplushie,
/obj/item/toy/plushie/ipcplushie,
/obj/item/toy/plushie/greyplushie,
/obj/item/toy/plushie/nianplushie,
/obj/item/toy/plushie/abductor,
/obj/item/toy/plushie/abductor/agent
),

list (
/obj/item/toy/plushie/nianplushie = 3,
/obj/item/toy/plushie/nianplushie/monarch = 2,
/obj/item/toy/plushie/nianplushie/luna = 2,
/obj/item/toy/plushie/nianplushie/atlas = 2,
/obj/item/toy/plushie/nianplushie/reddish = 2,
/obj/item/toy/plushie/nianplushie/royal = 2,
/obj/item/toy/plushie/nianplushie/gothic = 2,
/obj/item/toy/plushie/nianplushie/lovers = 2,
/obj/item/toy/plushie/nianplushie/whitefly = 2,
/obj/item/toy/plushie/nianplushie/punished = 2,
/obj/item/toy/plushie/nianplushie/firewatch = 2,
/obj/item/toy/plushie/nianplushie/deadhead = 2,
/obj/item/toy/plushie/nianplushie/poison = 2,
/obj/item/toy/plushie/nianplushie/ragged = 2,
/obj/item/toy/plushie/nianplushie/snow = 2,
/obj/item/toy/plushie/nianplushie/clockwork = 2,
/obj/item/toy/plushie/nianplushie/moonfly = 2,
/obj/item/toy/plushie/nianplushie/rainbow = 1
),
)
104 changes: 103 additions & 1 deletion code/game/objects/items/toys.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -879,7 +879,109 @@
visible_message("<span class='danger'>Buzzzz!</span>")
cooldown = TRUE
addtimer(VARSET_CALLBACK(src, cooldown, FALSE), 3 SECONDS)


/obj/item/toy/plushie/nianplushie/monarch
name = "monarch nian plushie"
desc = "A monarch nian plushie, straight from the nebula. Pull its antenna to hear it buzz!"
icon_state = "plushie_nian_monarch"
item_state = "plushie_nian_monarch"

/obj/item/toy/plushie/nianplushie/luna
name = "luna nian plushie"
desc = "A luna nian plushie, straight from the nebula. Pull its antenna to hear it buzz!"
icon_state = "plushie_nian_luna"
item_state = "plushie_nian_luna"

/obj/item/toy/plushie/nianplushie/atlas
name = "atlas nian plushie"
desc = "An atlas nian plushie, straight from the nebula. Pull its antenna to hear it buzz!"
icon_state = "plushie_nian_atlas"
item_state = "plushie_nian_atlas"

/obj/item/toy/plushie/nianplushie/reddish
name = "reddish nian plushie"
desc = "A reddish nian plushie, straight from the nebula. Pull its antenna to hear it buzz!"
icon_state = "plushie_nian_reddish"
item_state = "plushie_nian_reddish"

/obj/item/toy/plushie/nianplushie/royal
name = "royal nian plushie"
desc = "A royal nian plushie, straight from the nebula. Pull its antenna to hear it buzz!"
icon_state = "plushie_nian_royal"
item_state = "plushie_nian_royal"

/obj/item/toy/plushie/nianplushie/gothic
name = "gothic nian plushie"
desc = "A gothic nian plushie, straight from the nebula. Pull its antenna to hear it buzz!"
icon_state = "plushie_nian_gothic"
item_state = "plushie_nian_gothic"

/obj/item/toy/plushie/nianplushie/lovers
name = "lovers nian plushie"
desc = "A lovers nian plushie, straight from the nebula. Pull its antenna to hear it buzz!"
icon_state = "plushie_nian_lovers"
item_state = "plushie_nian_lovers"

/obj/item/toy/plushie/nianplushie/whitefly
name = "whitefly nian plushie"
desc = "A whitefly nian plushie, straight from the nebula. Pull its antenna to hear it buzz!"
icon_state = "plushie_nian_whitefly"
item_state = "plushie_nian_whitefly"

/obj/item/toy/plushie/nianplushie/punished
name = "punished nian plushie"
desc = "A punnished nian plushie, straight from the nebula. Pull its antenna to hear it buzz!"
icon_state = "plushie_nian_punished"
item_state = "plushie_nian_punished"

/obj/item/toy/plushie/nianplushie/firewatch
name = "firewatch nian plushie"
desc = "A firewtach nian plushie, straight from the nebula. Pull its antenna to hear it buzz!"
icon_state = "plushie_nian_firewatch"
item_state = "plushie_nian_firewatch"

/obj/item/toy/plushie/nianplushie/deadhead
name = "deathshead nian plushie"
desc = "A deathshead nian plushie, straight from the nebula. Pull its antenna to hear it buzz!"
icon_state = "plushie_nian_deadhead"
item_state = "plushie_nian_deadhead"

/obj/item/toy/plushie/nianplushie/poison
name = "poison nian plushie"
desc = "A poison nian plushie, straight from the nebula. Pull its antenna to hear it buzz!"
icon_state = "plushie_nian_poison"
item_state = "plushie_nian_poison"

/obj/item/toy/plushie/nianplushie/ragged
name = "ragged nian plushie"
desc = "A ragged nian plushie, straight from the nebula. Pull its antenna to hear it buzz!"
icon_state = "plushie_nian_ragged"
item_state = "plushie_nian_ragged"

/obj/item/toy/plushie/nianplushie/snow
name = "snow nian plushie"
desc = "A snow nian plushie, straight from the nebula. Pull its antenna to hear it buzz!"
icon_state = "plushie_nian_snow"
item_state = "plushie_nian_snow"

/obj/item/toy/plushie/nianplushie/clockwork
name = "clockwork nian plushie"
desc = "A clockwork nian plushie, straight from the nebula. Pull its antenna to hear it buzz!"
icon_state = "plushie_nian_clockwork"
item_state = "plushie_nian_clockwork"

/obj/item/toy/plushie/nianplushie/moonfly
name = "moonfly nian plushie"
desc = "A moonfly nian plushie, straight from the nebula. Pull its antenna to hear it buzz!"
icon_state = "plushie_nian_moonfly"
item_state = "plushie_nian_moonfly"

/obj/item/toy/plushie/nianplushie/rainbow
name = "rainbow nian plushie"
desc = "A rainbow nian plushie, straight from the nebula. Pull its antenna to hear it buzz!"
icon_state = "plushie_nian_rainbow"
item_state = "plushie_nian_rainbow"

/obj/item/toy/plushie/shark
name = "shark plushie"
desc = "A plushie depicting a somewhat cartoonish shark. The tag calls it a 'hákarl', noting that it was made by an obscure furniture manufacturer in old Scandinavia."
Expand Down
Binary file modified icons/effects/random_spawners.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/obj/toy.dmi
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions paradise.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1047,6 +1047,7 @@
#include "code\game\objects\effects\spawners\random\loot_spawners.dm"
#include "code\game\objects\effects\spawners\random\maint_loot_spawners.dm"
#include "code\game\objects\effects\spawners\random\misc_spawners.dm"
#include "code\game\objects\effects\spawners\random\plushie_spawners.dm"
#include "code\game\objects\effects\spawners\random\random_spawner.dm"
#include "code\game\objects\effects\spawners\random\trash_spawners.dm"
#include "code\game\objects\effects\spawners\random\pool\pool_spawner.dm"
Expand Down
Loading