diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index 42ac9726bf..1f262c0979 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -53,70 +53,8 @@ /obj/item/clothing/shoes/wheelys = 8, /obj/item/clothing/shoes/kindleKicks = 8, /obj/item/storage/belt/military/snack = 8, - /obj/item/toy/plush/lizardplushie = 1, - /obj/item/toy/plush/lizardplushie/durgit = 1, - /obj/item/toy/plush/lizardplushie/rio = 1, - /obj/item/toy/plush/lizardplushie/urinsu = 1, - /obj/item/toy/plush/lizardplushie/arfrehn = 1, - /obj/item/toy/plush/lizardplushie/soars = 1, - /obj/item/toy/plush/lizardplushie/ghostie = 1, - /obj/item/toy/plush/lizardplushie/amber = 1, - /obj/item/toy/plush/lizardplushie/cyan = 1, - /obj/item/toy/plush/lizardplushie/meena = 1, - /obj/item/toy/plush/lizardplushie/stalks = 1, - /obj/item/toy/plush/lizardplushie/kobold = 1, - /obj/item/toy/plush/lizardplushie/gorgi = 1, - /obj/item/toy/plush/lizardplushie/almaz = 1, - /obj/item/toy/plush/snakeplushie/sasha = 1, - /obj/item/toy/plush/snakeplushie/shay = 1, - /obj/item/toy/plush/snakeplushie/vulken = 1, - /obj/item/toy/plush/mothplushie = 1, - /obj/item/toy/plush/mothplushie/bumble = 1, - /obj/item/toy/plush/mothplushie/nameko = 1, - /obj/item/toy/plush/mothplushie/suru = 1, - /obj/item/toy/plush/xeno = 1, - /obj/item/toy/plush/lampplushie = 1, - /obj/item/toy/plush/borgplushie = 1, - /obj/item/toy/plush/borgplushie/medihound = 1, - /obj/item/toy/plush/borgplushie/scrubpuppy = 1, - /obj/item/toy/plush/borgplushie/seeking = 1, - /obj/item/toy/plush/borgplushie/neeb = 1, - /obj/item/toy/plush/bird = 1, - /obj/item/toy/plush/bird/esela = 1, - /obj/item/toy/plush/bird/jahonna = 1, - /obj/item/toy/plush/bird/krick = 1, - /obj/item/toy/plush/bird/birddi = 1, - /obj/item/toy/plush/bird/jewel = 1, - /obj/item/toy/plush/mammal = 1, - /obj/item/toy/plush/mammal/dubious = 1, - /obj/item/toy/plush/mammal/gladwyn = 1, - /obj/item/toy/plush/mammal/gavin = 1, - /obj/item/toy/plush/mammal/blep = 1, - /obj/item/toy/plush/mammal/circe = 1, - /obj/item/toy/plush/mammal/pavel = 1, - /obj/item/toy/plush/mammal/oten = 1, - /obj/item/toy/plush/mammal/ray = 1, - /obj/item/toy/plush/mammal/dawud = 1, - /obj/item/toy/plush/mammal/edgar = 1, - /obj/item/toy/plush/mammal/frank = 1, - /obj/item/toy/plush/mammal/poojawa = 1, - /obj/item/toy/plush/mammal/hazel = 1, - /obj/item/toy/plush/mammal/jermaine = 1, - /obj/item/toy/plush/mammal/gunther = 1, - /obj/item/toy/plush/mammal/fox = 1, - /obj/item/toy/plush/mammal/zed = 1, - /obj/item/toy/plush/mammal/dog = 1, - /obj/item/toy/plush/mammal/dog/frost = 1, - /obj/item/toy/plush/mammal/dog/atticus = 1, - /obj/item/toy/plush/mammal/dog/fletch = 1, - /obj/item/toy/plush/mammal/dog/vincent = 1, - /obj/item/toy/plush/mammal/dog/zigfried = 1, - /obj/item/toy/plush/mammal/dog/nikolai = 1, - /obj/item/toy/plush/catgirl = 1, - /obj/item/toy/plush/catgirl/skylar = 1, - /obj/item/toy/plush/catgirl/mikeel = 1, - /obj/item/toy/plush/catgirl/robin = 1 - ) + /obj/item/toy/plush/random = 450 + )//plushies have a 0.6 chance light_color = LIGHT_COLOR_GREEN diff --git a/code/game/objects/items/plushes.dm b/code/game/objects/items/plushes.dm index 2411454ace..742237df38 100644 --- a/code/game/objects/items/plushes.dm +++ b/code/game/objects/items/plushes.dm @@ -359,6 +359,16 @@ if(mood_message) desc += mood_message +/obj/item/toy/plush/random + name = "Illegal plushie" + desc = "Something fucked up" + +/obj/item/toy/plush/random/Initialize() + ..() + var/newtype = pick(subtypesof(/obj/item/toy/plush)) + new newtype(loc) + return INITIALIZE_HINT_QDEL + /obj/item/toy/plush/carpplushie name = "space carp plushie" desc = "An adorable stuffed toy that resembles a space carp." @@ -495,6 +505,10 @@ icon_state = "rio" item_state = "rio" +/obj/item/toy/plush/lizardplushie/dan + icon_state = "dan" + item_state = "dan" + /obj/item/toy/plush/lizardplushie/urinsu icon_state = "urinsu" item_state = "urinsu" @@ -546,7 +560,7 @@ icon_state = "plushie_snake" item_state = "plushie_snake" attack_verb = list("bitten", "hissed", "tail slapped") - squeak_override = list('sound/voice/lowHiss2.ogg' = 1) + squeak_override = list('modular_citadel/sound/voice/hiss.ogg' = 1) /obj/item/toy/plush/snakeplushie/sasha icon_state = "sasha" @@ -560,6 +574,10 @@ icon_state = "vulken" item_state = "vulken" +/obj/item/toy/plush/snakeplushie/jecca + icon_state = "jecca" + item_state = "jecca" + /obj/item/toy/plush/nukeplushie name = "operative plushie" desc = "A stuffed toy that resembles a syndicate nuclear operative. The tag claims operatives to be purely fictitious." @@ -669,20 +687,27 @@ icon_state = "jewel" item_state = "jewel" -/obj/item/toy/plush/mammal - name = "mammal plushie" - desc = "An adorable stuffed toy resembling some sort of mammallian crew member." +/obj/item/toy/plush/sergal + name = "sergal plushie" + desc = "An adorable stuffed plushie that resembles a sagaru." icon_state = "faux" item_state = "faux" + squeak_override = list('modular_citadel/sound/voice/merp.ogg' = 1) -/obj/item/toy/plush/mammal/dubious - icon_state = "dubious" - item_state = "dubious" - -/obj/item/toy/plush/mammal/gladwyn +/obj/item/toy/plush/sergal/gladwyn icon_state = "gladwyn" item_state = "gladwyn" +/obj/item/toy/plush/sergal/jermaine + icon_state = "jermaine" + item_state = "jermaine" + +/obj/item/toy/plush/mammal + name = "mammal plushie" + desc = "An adorable stuffed toy resembling some sort of crew member." + icon_state = "dubious" + item_state = "dubious" + /obj/item/toy/plush/mammal/gavin icon_state = "gavin" item_state = "gavin" @@ -695,6 +720,10 @@ icon_state = "circe" item_state = "circe" +/obj/item/toy/plush/mammal/robin + icon_state = "robin" + item_state = "robin" + /obj/item/toy/plush/mammal/pavel icon_state = "pavel" item_state = "pavel" @@ -731,10 +760,6 @@ icon_state = "joker" item_state = "joker" -/obj/item/toy/plush/mammal/jermaine - icon_state = "jermaine" - item_state = "jermaine" - /obj/item/toy/plush/mammal/gunther icon_state = "gunther" item_state = "gunther" @@ -782,9 +807,13 @@ icon_state = "nikolai" item_state = "nikolai" +/obj/item/toy/plush/mammal/dog/flynn + icon_state = "flynn" + item_state = "flynn" + /obj/item/toy/plush/catgirl name = "feline plushie" - desc = "An adorable stuffed toy that resembles a felinid." + desc = "An adorable stuffed toy that resembles a feline." icon_state = "bailey" item_state = "bailey" attack_verb = list("headbutt", "scritched", "bit") @@ -802,9 +831,9 @@ attack_verb = list("powergamed", "merged", "tabled") squeak_override = list('sound/effects/meow1.ogg' = 1) -/obj/item/toy/plush/catgirl/robin - icon_state = "robin" - item_state = "robin" +/obj/item/toy/plush/catgirl/drew + icon_state = "drew" + item_state = "drew" /obj/item/toy/plush/awakenedplushie/ComponentInitialize() . = ..() diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index 42b3509872..c55a7100fc 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -1500,7 +1500,7 @@ /obj/item/flashlight/lamp, /obj/item/flashlight/lamp/green, /obj/item/storage/box/lights/mixed) - crate_name = "advanced lighting crate" + crate_name = "advanced lighting crate" crate_type = /obj/structure/closet/crate/secure /datum/supply_pack/service/cargo_supples @@ -2303,69 +2303,11 @@ desc = "Plush tide station wide. Contains 5 random plushies for you to love. Warranty void if your love violates the terms of use." cost = 1500 // or play the arcade machines ya lazy bum num_contained = 5 - contains = list(/obj/item/toy/plush/lizardplushie, - /obj/item/toy/plush/lizardplushie/durgit, - /obj/item/toy/plush/lizardplushie/rio, - /obj/item/toy/plush/lizardplushie/urinsu, - /obj/item/toy/plush/lizardplushie/arfrehn, - /obj/item/toy/plush/lizardplushie/soars, - /obj/item/toy/plush/lizardplushie/ghostie, - /obj/item/toy/plush/lizardplushie/amber, - /obj/item/toy/plush/lizardplushie/cyan, - /obj/item/toy/plush/lizardplushie/meena, - /obj/item/toy/plush/lizardplushie/stalks, - /obj/item/toy/plush/lizardplushie/kobold, - /obj/item/toy/plush/lizardplushie/gorgi, - /obj/item/toy/plush/lizardplushie/almaz, - /obj/item/toy/plush/snakeplushie/sasha, - /obj/item/toy/plush/snakeplushie/shay, - /obj/item/toy/plush/snakeplushie/vulken, - /obj/item/toy/plush/mothplushie, - /obj/item/toy/plush/mothplushie/bumble, - /obj/item/toy/plush/mothplushie/nameko, - /obj/item/toy/plush/mothplushie/suru, - /obj/item/toy/plush/xeno, - /obj/item/toy/plush/lampplushie, - /obj/item/toy/plush/borgplushie, - /obj/item/toy/plush/borgplushie/medihound, - /obj/item/toy/plush/borgplushie/scrubpuppy, - /obj/item/toy/plush/borgplushie/seeking, - /obj/item/toy/plush/borgplushie/neeb, - /obj/item/toy/plush/bird, - /obj/item/toy/plush/bird/esela, - /obj/item/toy/plush/bird/jahonna, - /obj/item/toy/plush/bird/krick, - /obj/item/toy/plush/bird/birddi, - /obj/item/toy/plush/bird/jewel, - /obj/item/toy/plush/mammal, - /obj/item/toy/plush/mammal/dubious, - /obj/item/toy/plush/mammal/gladwyn, - /obj/item/toy/plush/mammal/gavin, - /obj/item/toy/plush/mammal/blep, - /obj/item/toy/plush/mammal/circe, - /obj/item/toy/plush/mammal/pavel, - /obj/item/toy/plush/mammal/oten, - /obj/item/toy/plush/mammal/ray, - /obj/item/toy/plush/mammal/dawud, - /obj/item/toy/plush/mammal/edgar, - /obj/item/toy/plush/mammal/frank, - /obj/item/toy/plush/mammal/poojawa, - /obj/item/toy/plush/mammal/hazel, - /obj/item/toy/plush/mammal/jermaine, - /obj/item/toy/plush/mammal/gunther, - /obj/item/toy/plush/mammal/fox, - /obj/item/toy/plush/mammal/zed, - /obj/item/toy/plush/mammal/dog, - /obj/item/toy/plush/mammal/dog/frost, - /obj/item/toy/plush/mammal/dog/atticus, - /obj/item/toy/plush/mammal/dog/fletch, - /obj/item/toy/plush/mammal/dog/vincent, - /obj/item/toy/plush/mammal/dog/zigfried, - /obj/item/toy/plush/mammal/dog/nikolai, - /obj/item/toy/plush/catgirl, - /obj/item/toy/plush/catgirl/skylar, - /obj/item/toy/plush/catgirl/mikeel, - /obj/item/toy/plush/catgirl/robin) + contains = list(/obj/item/toy/plush/random, + /obj/item/toy/plush/random, + /obj/item/toy/plush/random, + /obj/item/toy/plush/random, + /obj/item/toy/plush/random) //I'm lazy crate_name = "plushie crate" crate_type = /obj/structure/closet/crate/wooden diff --git a/icons/obj/plushes.dmi b/icons/obj/plushes.dmi index 08b6faba9b..cc3c5b6f37 100644 Binary files a/icons/obj/plushes.dmi and b/icons/obj/plushes.dmi differ diff --git a/modular_citadel/sound/voice/hiss.ogg b/modular_citadel/sound/voice/hiss.ogg new file mode 100644 index 0000000000..cd9fa22c37 Binary files /dev/null and b/modular_citadel/sound/voice/hiss.ogg differ diff --git a/modular_citadel/sound/voice/merp.ogg b/modular_citadel/sound/voice/merp.ogg new file mode 100644 index 0000000000..b40b7a365b Binary files /dev/null and b/modular_citadel/sound/voice/merp.ogg differ