diff --git a/code/game/machinery/computer/arcade/arcade.dm b/code/game/machinery/computer/arcade/arcade.dm index 81e54f90271..f7dc3909273 100644 --- a/code/game/machinery/computer/arcade/arcade.dm +++ b/code/game/machinery/computer/arcade/arcade.dm @@ -59,7 +59,7 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list( /obj/item/toy/plush/rouny = 2, /obj/item/toy/plush/abductor = 2, /obj/item/toy/plush/abductor/agent = 2, - /obj/item/toy/plush/greek_cucumber = 2, + /obj/item/toy/plush/shark = 2, /obj/item/storage/belt/military/snack/full = 2, /obj/item/toy/brokenradio = 2, /obj/item/toy/braintoy = 2, diff --git a/code/game/objects/effects/spawners/random/entertainment.dm b/code/game/objects/effects/spawners/random/entertainment.dm index 9c50d805881..18876dfc927 100644 --- a/code/game/objects/effects/spawners/random/entertainment.dm +++ b/code/game/objects/effects/spawners/random/entertainment.dm @@ -276,7 +276,7 @@ /obj/item/toy/plush/rouny = 3, /obj/item/toy/plush/abductor = 3, /obj/item/toy/plush/abductor/agent = 3, - /obj/item/toy/plush/greek_cucumber = 3, + /obj/item/toy/plush/shark = 3, // super rare plushies /obj/item/toy/plush/bubbleplush = 2, /obj/item/toy/plush/ratplush = 2, diff --git a/code/game/objects/items/plushes.dm b/code/game/objects/items/plushes.dm index c3fbe7cdcdc..77c0a6b2e0a 100644 --- a/code/game/objects/items/plushes.dm +++ b/code/game/objects/items/plushes.dm @@ -777,14 +777,12 @@ 'sound/weapons/cablecuff.ogg' = 1, ) -/obj/item/toy/plush/greek_cucumber - name = "greek cucumber" - desc = "A plushie depicting a large cucumber with eyes, it seems that according to the manufacturer of the toy, the human race will look like in the future." - icon_state = "cucumber" - inhand_icon_state = null - attack_verb_continuous = list("squishes", "creaks", "crunches") - attack_verb_simple = list("squish", "creak", "crunch") - squeak_override = list( - 'sound/effects/slosh.ogg' = 1, - 'sound/effects/splat.ogg' = 2 - ) +/obj/item/toy/plush/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. Popular with cute girls who wear striped knee-high socks." + lefthand_file = 'icons/mob/inhands/items/plushes_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items/plushes_righthand.dmi' + icon_state = "blahaj" + inhand_icon_state = "blahaj" + attack_verb_continuous = list("gnaws", "gnashes", "chews") + attack_verb_simple = list("gnaw", "gnash", "chew") diff --git a/code/modules/cargo/goodies.dm b/code/modules/cargo/goodies.dm index 18b5610e6ff..52b41a0af69 100644 --- a/code/modules/cargo/goodies.dm +++ b/code/modules/cargo/goodies.dm @@ -147,6 +147,12 @@ cost = PAYCHECK_CREW * 4 contains = list(/obj/item/toy/plush/beeplushie) +/datum/supply_pack/goody/blahaj + name = "Shark plushie" + desc = "A soft, warm companion for midday naps." + cost = PAYCHECK_CREW * 5 + contains = list(/obj/item/toy/plush/shark) + /datum/supply_pack/goody/dog_bone name = "Jumbo Dog Bone" desc = "The best dog bone money can have exported to a space station. A perfect gift for a dog." @@ -289,3 +295,5 @@ desc = "A standard-sized coffeepot, for use with a coffeemaker." cost = PAYCHECK_CREW contains = list(/obj/item/reagent_containers/cup/coffeepot) + + diff --git a/icons/mob/inhands/items/plushes_lefthand.dmi b/icons/mob/inhands/items/plushes_lefthand.dmi new file mode 100644 index 00000000000..01fa1e7a2ed Binary files /dev/null and b/icons/mob/inhands/items/plushes_lefthand.dmi differ diff --git a/icons/mob/inhands/items/plushes_righthand.dmi b/icons/mob/inhands/items/plushes_righthand.dmi new file mode 100644 index 00000000000..99dd1d01044 Binary files /dev/null and b/icons/mob/inhands/items/plushes_righthand.dmi differ diff --git a/icons/obj/toys/plushes.dmi b/icons/obj/toys/plushes.dmi index 1ea8d88504c..241d45fc33d 100644 Binary files a/icons/obj/toys/plushes.dmi and b/icons/obj/toys/plushes.dmi differ