Skip to content

Commit

Permalink
[PORT] ports the shark plushie (#11235)
Browse files Browse the repository at this point in the history
* ports shark plushie from TG

* adds the plush to the choice beacon

* oops

adds a comma

* Pigeon Variation Package: moodlet, better icon and spawners

---------

Co-authored-by: PigeonVerde322 <[email protected]>
  • Loading branch information
spockye and PigeonVerde322 authored Jul 27, 2024
1 parent 0addc66 commit ddd78b9
Show file tree
Hide file tree
Showing 7 changed files with 34 additions and 10 deletions.
5 changes: 5 additions & 0 deletions code/datums/mood_events/generic_positive_events.dm
Original file line number Diff line number Diff line change
Expand Up @@ -230,3 +230,8 @@
description = "<span class='nicegreen'>The starlight emanating from space is so mesmerizing.</span>"
mood_change = 10
timeout = 10 MINUTES

/datum/mood_event/bigplush
description = "<span class='nicegreen'>Holding that big plush was quite nice.</span>"
mood_change = 1
timeout = 10 SECONDS
1 change: 1 addition & 0 deletions code/game/machinery/computer/arcade.dm
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list(
/obj/item/clothing/shoes/wheelys = 2,
/obj/item/clothing/shoes/kindleKicks = 2,
/obj/item/toy/plush/moth/random = 2,
/obj/item/toy/plush/shark = 2,
/obj/item/toy/plush/slimeplushie/random = 2,
/obj/item/toy/plush/flushed = 2,
/obj/item/toy/plush/flushed/rainbow = 1,
Expand Down
37 changes: 27 additions & 10 deletions code/game/objects/items/plushes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -371,14 +371,14 @@
desc = "An adorable stuffed toy that resembles a space carp."
icon_state = "carpplush"
attack_verb = list("bitten", "eaten", "fin slapped")
squeak_override = list('sound/weapons/bite.ogg'=1)
squeak_override = list('sound/weapons/bite.ogg' = 1)

/obj/item/toy/plush/bubbleplush
name = "\improper Bubblegum plushie"
desc = "The friendly red demon that gives good miners gifts."
icon_state = "bubbleplush"
attack_verb = list("rent")
squeak_override = list('sound/magic/demon_attack1.ogg'=1)
squeak_override = list('sound/magic/demon_attack1.ogg' = 1)

/obj/item/toy/plush/plushvar
name = "\improper Ratvar plushie"
Expand Down Expand Up @@ -554,8 +554,7 @@
attack_verb = list("blorbled", "slimed", "absorbed")
squeak_override = list('sound/effects/blobattack.ogg' = 1)
gender = FEMALE //given all the jokes and drawings, I'm not sure the xenobiologists would make a slimeboy
squeak_override = list('sound/effects/blobattack.ogg' = 1)
/// Most of the following is just stolen from the moth plush code for the slimes
/// Most of the following is just stolen from the moth plush code for the slimes
var/suicide_count = 0

/obj/item/toy/plush/slimeplushie/suicide_act(mob/living/user)
Expand Down Expand Up @@ -626,7 +625,7 @@
icon_state = "beeplush"
attack_verb = list("stung")
gender = FEMALE
squeak_override = list('sound/voice/moth/scream_moth.ogg'=1)
squeak_override = list('sound/voice/moth/scream_moth.ogg' = 1)

/obj/item/toy/plush/rouny
name = "runner plushie"
Expand All @@ -640,7 +639,7 @@
desc = "An adorable mothperson plushie. It's a huggable bug!"
icon_state = "moffplush"
attack_verb = list("fluttered", "flapped")
squeak_override = list('sound/voice/moth/scream_moth.ogg'=1)
squeak_override = list('sound/voice/moth/scream_moth.ogg' = 1)
///Used to track how many people killed themselves with item/toy/plush/moth
var/suicide_count = 0

Expand Down Expand Up @@ -791,25 +790,42 @@
name = "ghost plushie"
desc = "It reminds you of someone important, you just can't make out who."
icon_state = "crossedplush"
squeak_override = list('sound/items/haunted/ghostitemattack.ogg'=1)
squeak_override = list('sound/items/haunted/ghostitemattack.ogg' = 1)

/obj/item/toy/plush/runtime
name = "Runtime plushie"
desc = "GPLUSH."
icon_state = "runtimeplush"
squeak_override = list('sound/effects/meow1.ogg'=1)
squeak_override = list('sound/effects/meow1.ogg' = 1)

/obj/item/toy/plush/gondola
name = "gondola plushie"
desc = "The silent walker, in plush form."
icon_state = "gondolaplush"
squeak_override = list('sound/misc/null.ogg'=1)
squeak_override = list('sound/misc/null.ogg' = 1)

/obj/item/toy/plush/flushed
name = "flushed plushie"
desc = "Hgrgrhrhg cute."
icon_state = "flushplush"

/obj/item/toy/plush/shark
name = "shark plushie"
desc = "A big plushie depicting a rather cartoonish, yet cute shark. The tag calls it a 'søthai', noting that it was made by an obscure furniture manufacturer in Scandinavia."
lefthand_file = 'icons/mob/inhands/plushes_lefthand.dmi'
righthand_file = 'icons/mob/inhands/plushes_righthand.dmi'
icon_state = "cuteswedishsharkplush"
squeak_override = list('sound/weapons/bite.ogg' = 1)

/obj/item/toy/plush/shark/equipped(mob/user, slot)
. = ..()
if(slot == ITEM_SLOT_HANDS)
SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "big_plush", /datum/mood_event/bigplush, src)

/obj/item/toy/plush/shark/dropped(mob/living/carbon/user)
..()
SEND_SIGNAL(user, COMSIG_CLEAR_MOOD_EVENT, "big_plush")

/obj/item/toy/plush/flushed/rainbow
name = "rainbow flushed plushie"
desc = "Hgrgrhrhg cuter."
Expand Down Expand Up @@ -860,7 +876,8 @@
/obj/item/toy/plush/moth/royal,
/obj/item/toy/plush/moth/snow,
/obj/item/toy/plush/moth/whitefly,
/obj/item/toy/plush/moth/witchwing
/obj/item/toy/plush/moth/witchwing,
/obj/item/toy/plush/shark,
)

/obj/item/choice_beacon/radial/plushie/generate_options(mob/living/M)
Expand Down
1 change: 1 addition & 0 deletions code/modules/research/xenobiology/crossbreeding/warping.dm
Original file line number Diff line number Diff line change
Expand Up @@ -604,6 +604,7 @@ GLOBAL_DATUM(blue_storage, /obj/item/storage/backpack/holding/bluespace)
/obj/item/toy/plush/gondola,
/obj/item/toy/plush/flushed = 2,
/obj/item/toy/plush/flushed/rainbow,
/obj/item/toy/plush/shark,
/obj/item/toy/eightball/haunted,
/obj/item/toy/foamblade,
/obj/item/toy/katana,
Expand Down
Binary file modified icons/mob/inhands/plushes_lefthand.dmi
Binary file not shown.
Binary file modified icons/mob/inhands/plushes_righthand.dmi
Binary file not shown.
Binary file modified icons/obj/plushes.dmi
Binary file not shown.

0 comments on commit ddd78b9

Please sign in to comment.