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.

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

Adds wearable plushies from SS14 #3449

Merged
merged 3 commits into from
Oct 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 10 additions & 0 deletions code/game/objects/items/plushes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -505,6 +505,7 @@
if(P && istype(P.loc, /turf/open) && !P.clash_target && !clashing)
P.clash_of_the_plushies(src)

// Worn sprite taken from Space Station 14. Bee hat sprite drawn by Ubaser.
/obj/item/toy/plush/lizard_plushie
name = "lizard plushie"
desc = "An adorable stuffed toy that resembles a lizardperson."
Expand All @@ -513,6 +514,10 @@
attack_verb_continuous = list("claws", "hisses", "tail slaps")
attack_verb_simple = list("claw", "hiss", "tail slap")
squeak_override = list('monkestation/sound/voice/weh.ogg' = 1) // Monkestation Edit
worn_icon = 'monkestation/icons/mob/clothing/head.dmi'
worn_icon_state = "map_plushie_lizard"
slot_flags = ITEM_SLOT_HEAD // Monkestation Edit
body_parts_covered = HEAD // Monkestation Edit

/obj/item/toy/plush/lizard_plushie/Initialize(mapload)
. = ..()
Expand Down Expand Up @@ -637,6 +642,7 @@
say(pick(cry_still_messages))
playsound(src, 'sound/items/intents/Help.ogg', 50, FALSE)

// Worn sprite taken from Space Station 14. Lizard hat sprite made by Cinder.
/obj/item/toy/plush/beeplushie
name = "bee plushie"
desc = "A cute toy that resembles an even cuter bee."
Expand All @@ -646,6 +652,10 @@
attack_verb_simple = list("sting")
gender = FEMALE
squeak_override = list('sound/voice/moth/scream_moth.ogg'=1)
worn_icon = 'monkestation/icons/mob/clothing/head.dmi'
worn_icon_state = "plushie_h"
slot_flags = ITEM_SLOT_HEAD // Monkestation Edit
body_parts_covered = HEAD // Monkestation Edit

/obj/item/toy/plush/goatplushie
name = "strange goat plushie"
Expand Down
1 change: 1 addition & 0 deletions code/modules/paperwork/paper.dm
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
pressure_resistance = 0
slot_flags = ITEM_SLOT_HEAD
body_parts_covered = HEAD
flags_inv = HIDEHAIR //monkestation addition
resistance_flags = FLAMMABLE
max_integrity = 50
dog_fashion = /datum/dog_fashion/head
Expand Down
1 change: 1 addition & 0 deletions monkestation/code/modules/clothing/head/hat.dm
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@
worn_icon = 'monkestation/icons/mob/clothing/head_32x48.dmi'
icon_state = "tophat_wiz"
dog_fashion = null

4 changes: 2 additions & 2 deletions monkestation/code/modules/donator/code/item/plush.dm
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@

/obj/item/toy/plush/gumball_goblin
name = "gumball goblin plush"
desc = "A plush of a Gumball Goblin. He was abducted while pondering his gumballs. Help. ~Handcrafted lovingly for elliethedarksun"
desc = "A plush of a Gumball Goblin. He was abducted while pondering his gumballs. Help. ~Handcrafted lovingly for elliethedarksun"
icon = 'monkestation/code/modules/donator/icons/obj/plushes.dmi'
icon_state = "gumball_goblin"

Expand Down Expand Up @@ -142,7 +142,7 @@

/obj/item/toy/plush/pooba_bee_plush
name = "bumbliest bee plushie"
desc = "God damn thats a cute bee."
desc = "God damn that's a cute bee."
icon = 'monkestation/code/modules/donator/icons/obj/plushes.dmi'
icon_state = "poba_fat_bee"

Expand Down
Binary file modified monkestation/icons/mob/clothing/head.dmi
Binary file not shown.
Loading