diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index 88f609c7f5..7ba3764584 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -6,15 +6,15 @@ icon_screen = "invaders" clockwork = TRUE //it'd look weird var/list/prizes = list( - /obj/item/storage/box/snappops = 2, + /obj/item/storage/box/snappops = 2, /obj/item/toy/talking/AI = 2, /obj/item/toy/talking/codex_gigas = 2, /obj/item/clothing/under/syndicate/tacticool = 2, /obj/item/toy/sword = 2, /obj/item/toy/gun = 2, - /obj/item/gun/ballistic/shotgun/toy/crossbow = 2, - /obj/item/storage/box/fakesyndiesuit = 2, - /obj/item/storage/crayons = 2, + /obj/item/gun/ballistic/shotgun/toy/crossbow = 2, + /obj/item/storage/box/fakesyndiesuit = 2, + /obj/item/storage/crayons = 2, /obj/item/toy/spinningtoy = 2, /obj/item/toy/prize/ripley = 1, /obj/item/toy/prize/fireripley = 1, @@ -34,15 +34,15 @@ /obj/item/toy/redbutton = 2, /obj/item/toy/talking/owl = 2, /obj/item/toy/talking/griffin = 2, - /obj/item/coin/antagtoken = 2, + /obj/item/coin/antagtoken = 2, /obj/item/stack/tile/fakespace/loaded = 2, /obj/item/stack/tile/fakepit/loaded = 2, /obj/item/toy/toy_xeno = 2, - /obj/item/storage/box/actionfigure = 1, - /obj/item/restraints/handcuffs/fake = 2, - /obj/item/grenade/chem_grenade/glitter/pink = 1, - /obj/item/grenade/chem_grenade/glitter/blue = 1, - /obj/item/grenade/chem_grenade/glitter/white = 1, + /obj/item/storage/box/actionfigure = 1, + /obj/item/restraints/handcuffs/fake = 2, + /obj/item/grenade/chem_grenade/glitter/pink = 1, + /obj/item/grenade/chem_grenade/glitter/blue = 1, + /obj/item/grenade/chem_grenade/glitter/white = 1, /obj/item/toy/eightball = 2, /obj/item/toy/windupToolbox = 2, /obj/item/toy/clockwork_watch = 2, @@ -50,9 +50,72 @@ /obj/item/extendohand/acme = 1, /obj/item/hot_potato/harmless/toy = 1, /obj/item/card/emagfake = 1, - /obj/item/clothing/shoes/wheelys = 2, - /obj/item/clothing/shoes/kindleKicks = 2, - /obj/item/storage/belt/military/snack = 2 + /obj/item/clothing/shoes/wheelys = 2, + /obj/item/clothing/shoes/kindleKicks = 2, + /obj/item/storage/belt/military/snack = 2, + /obj/item/toy/plush/lizardplushie = 2, + /obj/item/toy/plush/lizardplushie/durgit = 2, + /obj/item/toy/plush/lizardplushie/rio = 2, + /obj/item/toy/plush/lizardplushie/urinsu = 2, + /obj/item/toy/plush/lizardplushie/arfrehn = 2, + /obj/item/toy/plush/lizardplushie/soars = 2, + /obj/item/toy/plush/lizardplushie/ghostie = 2, + /obj/item/toy/plush/lizardplushie/amber = 2, + /obj/item/toy/plush/lizardplushie/cyan = 2, + /obj/item/toy/plush/lizardplushie/meena = 2, + /obj/item/toy/plush/lizardplushie/stalks = 2, + /obj/item/toy/plush/lizardplushie/kobold = 2, + /obj/item/toy/plush/lizardplushie/gorgi = 2, + /obj/item/toy/plush/lizardplushie/almaz = 2, + /obj/item/toy/plush/snakeplushie/sasha = 2, + /obj/item/toy/plush/snakeplushie/shay = 2, + /obj/item/toy/plush/snakeplushie/vulken = 2, + /obj/item/toy/plush/mothplushie = 2, + /obj/item/toy/plush/mothplushie/bumble = 2, + /obj/item/toy/plush/mothplushie/nameko = 2, + /obj/item/toy/plush/mothplushie/suru = 2, + /obj/item/toy/plush/xeno = 2, + /obj/item/toy/plush/lampplushie = 2, + /obj/item/toy/plush/borgplushie = 2, + /obj/item/toy/plush/borgplushie/medihound = 2, + /obj/item/toy/plush/borgplushie/scrubpuppy = 2, + /obj/item/toy/plush/borgplushie/seeking = 2, + /obj/item/toy/plush/borgplushie/neeb = 2, + /obj/item/toy/plush/bird = 2, + /obj/item/toy/plush/bird/esela = 2, + /obj/item/toy/plush/bird/jahonna = 2, + /obj/item/toy/plush/bird/krick = 2, + /obj/item/toy/plush/bird/birddi = 2, + /obj/item/toy/plush/bird/jewel = 2, + /obj/item/toy/plush/mammal = 2, + /obj/item/toy/plush/mammal/dubious = 2, + /obj/item/toy/plush/mammal/gladwyn = 2, + /obj/item/toy/plush/mammal/gavin = 2, + /obj/item/toy/plush/mammal/blep = 2, + /obj/item/toy/plush/mammal/circe = 2, + /obj/item/toy/plush/mammal/pavel = 2, + /obj/item/toy/plush/mammal/oten = 2, + /obj/item/toy/plush/mammal/ray = 2, + /obj/item/toy/plush/mammal/dawud = 2, + /obj/item/toy/plush/mammal/edgar = 2, + /obj/item/toy/plush/mammal/frank = 2, + /obj/item/toy/plush/mammal/poojawa = 2, + /obj/item/toy/plush/mammal/hazel = 2, + /obj/item/toy/plush/mammal/jermaine = 2, + /obj/item/toy/plush/mammal/gunther = 2, + /obj/item/toy/plush/mammal/fox = 2, + /obj/item/toy/plush/mammal/zed = 2, + /obj/item/toy/plush/mammal/dog = 2, + /obj/item/toy/plush/mammal/dog/frost = 2, + /obj/item/toy/plush/mammal/dog/atticus = 2, + /obj/item/toy/plush/mammal/dog/fletch = 2, + /obj/item/toy/plush/mammal/dog/vincent = 2, + /obj/item/toy/plush/mammal/dog/zigfried = 2, + /obj/item/toy/plush/mammal/dog/nikolai = 2, + /obj/item/toy/plush/catgirl = 2, + /obj/item/toy/plush/catgirl/skylar = 2, + /obj/item/toy/plush/catgirl/mikeel = 2, + /obj/item/toy/plush/catgirl/robin = 2 ) light_color = LIGHT_COLOR_GREEN diff --git a/code/game/objects/items/plushes.dm b/code/game/objects/items/plushes.dm index 9de2f86eb5..2411454ace 100644 --- a/code/game/objects/items/plushes.dm +++ b/code/game/objects/items/plushes.dm @@ -486,13 +486,79 @@ attack_verb = list("clawed", "hissed", "tail slapped") squeak_override = list('sound/weapons/slash.ogg' = 1) +/obj/item/toy/plush/lizardplushie/durgit + icon_state = "durgit" + item_state = "durgit" + squeak_override = list('modular_citadel/sound/voice/weh.ogg' = 1) //Durgit's the origin of the sound + +/obj/item/toy/plush/lizardplushie/rio + icon_state = "rio" + item_state = "rio" + +/obj/item/toy/plush/lizardplushie/urinsu + icon_state = "urinsu" + item_state = "urinsu" + +/obj/item/toy/plush/lizardplushie/arfrehn + icon_state = "arfrehn" + item_state = "arfrehn" + +/obj/item/toy/plush/lizardplushie/soars + icon_state = "soars" + item_state = "soars" + +/obj/item/toy/plush/lizardplushie/ghostie + icon_state = "ghostie" + item_state = "ghostie" + +/obj/item/toy/plush/lizardplushie/amber + icon_state = "amber" + item_state = "amber" + +/obj/item/toy/plush/lizardplushie/cyan + icon_state = "cyan" + item_state = "cyan" + +/obj/item/toy/plush/lizardplushie/meena + icon_state = "meena" + item_state = "meena" + +/obj/item/toy/plush/lizardplushie/stalks + icon_state = "stalks" + item_state = "stalks" + +/obj/item/toy/plush/lizardplushie/kobold + icon_state = "kobold" + item_state = "kobold" + +/obj/item/toy/plush/lizardplushie/gorgi + icon_state = "gorgi" + item_state = "gorgi" + +/obj/item/toy/plush/lizardplushie/almaz + icon_state = "almaz" + item_state = "almaz" + squeak_override = list('modular_citadel/sound/voice/raptor_purr.ogg' = 1) + /obj/item/toy/plush/snakeplushie name = "snake plushie" desc = "An adorable stuffed toy that resembles a snake. Not to be mistaken for the real thing." icon_state = "plushie_snake" item_state = "plushie_snake" attack_verb = list("bitten", "hissed", "tail slapped") - squeak_override = list('sound/weapons/bite.ogg' = 1) + squeak_override = list('sound/voice/lowHiss2.ogg' = 1) + +/obj/item/toy/plush/snakeplushie/sasha + icon_state = "sasha" + item_state = "sasha" + +/obj/item/toy/plush/snakeplushie/shay + icon_state = "shay" + item_state = "shay" + +/obj/item/toy/plush/snakeplushie/vulken + icon_state = "vulken" + item_state = "vulken" /obj/item/toy/plush/nukeplushie name = "operative plushie" @@ -517,6 +583,32 @@ icon_state = "plushie_awake" item_state = "plushie_awake" +/obj/item/toy/plush/mothplushie + name = "insect plushie" + desc = "An adorable stuffed toy that resembles some kind of insect" + icon_state = "cydia" + item_state = "cydia" + squeak_override = list('modular_citadel/sound/voice/mothsqueak.ogg' = 1) + +/obj/item/toy/plush/mothplushie/bumble + icon_state = "bumble" + item_state = "bumble" + +/obj/item/toy/plush/mothplushie/nameko + icon_state = "nameko" + item_state = "nameko" + +/obj/item/toy/plush/mothplushie/suru + icon_state = "suru" + item_state = "suru" + +/obj/item/toy/plush/xeno + name = "xenohybrid plushie" + desc = "An adorable stuffed toy that resmembles a xenomorphic crewmember." + icon_state = "seras" + item_state = "seras" + squeak_override = list('sound/voice/hiss2.ogg' = 1) + /obj/item/toy/plush/lampplushie name = "lamp plushie" desc = "A toy lamp plushie, doesn't actually make light, but it still toggles on and off. Click clack!" @@ -525,6 +617,195 @@ attack_verb = list("lit", "flickered", "flashed") squeak_override = list('sound/weapons/magout.ogg' = 1) +/obj/item/toy/plush/borgplushie + name = "robot plushie" + desc = "An adorable stuffed toy of a robot." + icon_state = "securityk9" + item_state = "securityk9" + attack_verb = list("beeped", "booped", "pinged") + squeak_override = list('sound/machines/beep.ogg' = 1) + +/obj/item/toy/plush/borgplushie/medihound + icon_state = "medihound" + item_state = "medihound" + +/obj/item/toy/plush/borgplushie/scrubpuppy + icon_state = "scrubpuppy" + item_state = "scrubpuppy" + +/obj/item/toy/plush/borgplushie/seeking + icon_state = "seeking" + item_state = "seeking" + +/obj/item/toy/plush/borgplushie/neeb + icon_state = "neeb" + item_state = "neeb" + +/obj/item/toy/plush/bird + name = "bird plushie" + desc = "An adorable stuffed plushie that resembles an avian." + icon_state = "sylas" + item_state = "sylas" + attack_verb = list("peeped", "beeped", "poofed") + squeak_override = list('modular_citadel/sound/voice/peep.ogg' = 1) + +/obj/item/toy/plush/bird/esela + icon_state = "esela" + item_state = "esela" + +/obj/item/toy/plush/bird/jahonna + icon_state = "jahonna" + item_state = "jahonna" + +/obj/item/toy/plush/bird/krick + icon_state = "krick" + item_state = "krick" + +/obj/item/toy/plush/bird/birddi + icon_state = "birddi" + item_state = "birddi" + +/obj/item/toy/plush/bird/jewel + 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." + icon_state = "faux" + item_state = "faux" + +/obj/item/toy/plush/mammal/dubious + icon_state = "dubious" + item_state = "dubious" + +/obj/item/toy/plush/mammal/gladwyn + icon_state = "gladwyn" + item_state = "gladwyn" + +/obj/item/toy/plush/mammal/gavin + icon_state = "gavin" + item_state = "gavin" + +/obj/item/toy/plush/mammal/blep + icon_state = "blep" + item_state = "blep" + +/obj/item/toy/plush/mammal/circe + icon_state = "circe" + item_state = "circe" + +/obj/item/toy/plush/mammal/pavel + icon_state = "pavel" + item_state = "pavel" + +/obj/item/toy/plush/mammal/oten + icon_state = "oten" + item_state = "oten" + +/obj/item/toy/plush/mammal/ray + icon_state = "ray" + item_state = "ray" + +/obj/item/toy/plush/mammal/dawud + icon_state = "dawud" + item_state = "dawud" + +/obj/item/toy/plush/mammal/edgar + icon_state = "edgar" + item_state = "edgar" + +/obj/item/toy/plush/mammal/frank + icon_state = "frank" + item_state = "frank" + +/obj/item/toy/plush/mammal/poojawa + icon_state = "poojawa" + item_state = "poojawa" + +/obj/item/toy/plush/mammal/hazel + icon_state = "hazel" + item_state = "hazel" + +/obj/item/toy/plush/mammal/joker + 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" + +/obj/item/toy/plush/mammal/fox + icon_state = "fox" + item_state = "fox" + +/obj/item/toy/plush/mammal/zed + icon_state = "zed" + item_state = "zed" + +/obj/item/toy/plush/mammal/dog + desc = "An adorable stuffed toy that resembles a canine." + icon_state = "katlin" + item_state = "katlin" + attack_verb = list("barked", "boofed", "borked") + squeak_override = list( + 'modular_citadel/sound/voice/bark1.ogg' = 1, + 'modular_citadel/sound/voice/bark2.ogg' = 1 + ) + +/obj/item/toy/plush/mammal/dog/frost + icon_state = "frost" + item_state = "frost" + +/obj/item/toy/plush/mammal/dog/atticus + icon_state = "atticus" + item_state = "atticus" + +/obj/item/toy/plush/mammal/dog/fletch + icon_state = "fletch" + item_state = "fletch" + +/obj/item/toy/plush/mammal/dog/vincent + icon_state = "vincent" + item_state = "vincent" + +/obj/item/toy/plush/mammal/dog/zigfried + desc = "An adorable stuffed toy of a very good boy." + icon_state = "zigfried" + item_state = "zigfried" + +/obj/item/toy/plush/mammal/dog/nikolai + icon_state = "nikolai" + item_state = "nikolai" + +/obj/item/toy/plush/catgirl + name = "feline plushie" + desc = "An adorable stuffed toy that resembles a felinid." + icon_state = "bailey" + item_state = "bailey" + attack_verb = list("headbutt", "scritched", "bit") + squeak_override = list('modular_citadel/sound/voice/nya.ogg' = 1) + +/obj/item/toy/plush/catgirl/mikeel + desc = "An adorable stuffed toy of some tauric cat person." + icon_state = "mikeel" + item_state = "mikeel" + +/obj/item/toy/plush/catgirl/skylar + desc = "An adorable stuffed toy that resembles a degenerate." + icon_state = "skylar" + item_state = "skylar" + 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/awakenedplushie/ComponentInitialize() . = ..() AddComponent(/datum/component/edit_complainer) diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index 579ad9c267..f99aded07b 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -84,7 +84,7 @@ /datum/supply_pack/emergency/rcds name = "Emergency RCDs" desc = "Bombs going off on station? SME blown and now you need to fix the hole it left behind? Well this crate has a pare of Rcds to be able to easily fix up any problem you may have!" - cost = 1500 + cost = 1500 contains = list(/obj/item/construction/rcd, /obj/item/construction/rcd) crate_name = "emergency rcds" @@ -93,7 +93,7 @@ /datum/supply_pack/emergency/soft_suit name = "Emergency Space Suit " desc = "Is there bombs going off left and right? Is there meteors shooting around the station? Well we have two fragile space suit for emergencys as well as air and masks." - cost = 1000 + cost = 1000 contains = list(/obj/item/tank/internals/air, /obj/item/tank/internals/air, /obj/item/clothing/mask/gas, @@ -268,7 +268,7 @@ /datum/supply_pack/medical/anitvirus name = "Virus Containment Crate" desc = "Viro let out a death plague Mk II again? Someone didnt wash there hands? Old plagues born anew? Well this crate is for you! Hope you cure it before it brakes out of the station... This crate needs medical access to open and has two bio suits, a box of needles and beakers, five spaceacillin needles, and a medibot." - cost = 3000 + cost = 3000 access = ACCESS_MEDICAL contains = list(/mob/living/simple_animal/bot/medbot, /obj/item/clothing/head/bio_hood, @@ -721,7 +721,7 @@ /datum/supply_pack/engineering/industrialrcd name = "Industrial RCD" desc = "A industrial RCD in case the station has gone through more then one meteor storm and the CE needs to bring out the somthing a bit more reliable. Dose not contain spare ammo for the industrial RCD or any other RCD modles." - cost = 4500 + cost = 4500 access = ACCESS_CE contains = list(/obj/item/construction/rcd/industrial) crate_name = "industrial rcd" @@ -1702,7 +1702,7 @@ name = "Kitchen Cutlery Deluxe Set" desc = "Need to slice and dice away those ''Tomatos'' well we got what you need! From a nice set of knifes, forks, plates, glasses, and a whetstone for when you got some grizzle that is a bit harder to slice then normal." cost = 10000 - contraband = TRUE + contraband = TRUE contains = list(/obj/item/sharpener, /obj/item/kitchen/fork, /obj/item/kitchen/fork, @@ -2218,7 +2218,7 @@ /datum/supply_pack/costumes_toys/randomised/toys name = "Toy Crate" desc = "Who cares about pride and accomplishment? Skip the gaming and get straight to the sweet rewards with this product! Contains five random toys. Warranty void if used to prank research directors." - cost = 5000 // or play the arcade machines ya lazy bum + cost = 1500 // or play the arcade machines ya lazy bum // TODID make this actually just use the arcade machine loot list num_contained = 5 contains = list(/obj/item/storage/box/snappops, @@ -2269,7 +2269,70 @@ /obj/item/clothing/shoes/kindleKicks, /obj/item/storage/belt/military/snack, /obj/item/toy/eightball, - /obj/item/vending_refill/donksoft) + /obj/item/vending_refill/donksoft, + /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) crate_name = "toy crate" crate_type = /obj/structure/closet/crate/wooden @@ -2516,7 +2579,7 @@ crate_type = /obj/structure/closet/crate /datum/supply_pack/misc/lewdkeg - name = "Lewd Deluxe Keg" + name = "Lewd Deluxe Keg" desc = "That other stuff not getting you ready? Well I have a Chemslut making tons of the good stuff." cost = 7000 //It can be a weapon contraband = TRUE diff --git a/icons/obj/plushes.dmi b/icons/obj/plushes.dmi index ac0a72114d..08b6faba9b 100644 Binary files a/icons/obj/plushes.dmi and b/icons/obj/plushes.dmi differ diff --git a/modular_citadel/sound/voice/bark1.ogg b/modular_citadel/sound/voice/bark1.ogg new file mode 100644 index 0000000000..5d3853419f Binary files /dev/null and b/modular_citadel/sound/voice/bark1.ogg differ diff --git a/modular_citadel/sound/voice/bark2.ogg b/modular_citadel/sound/voice/bark2.ogg new file mode 100644 index 0000000000..dab73c4743 Binary files /dev/null and b/modular_citadel/sound/voice/bark2.ogg differ diff --git a/modular_citadel/sound/voice/raptor_purr.ogg b/modular_citadel/sound/voice/raptor_purr.ogg new file mode 100644 index 0000000000..a1492718e5 Binary files /dev/null and b/modular_citadel/sound/voice/raptor_purr.ogg differ