shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Makes plushies less common. (#7981)

Browse Source
This commit is contained in:
Tupinambis
2019-02-13 22:47:09 -06:00
committed by kevinz000
parent 7a2088aba6
commit 0f271498d1
2 changed files with 121 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/computer/arcade.dm
+110 -110
View File
@@ -6,116 +6,116 @@
icon_screen = "invaders"
clockwork = TRUE //it'd look weird
var/list/prizes = list(
/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/toy/spinningtoy = 2,
/obj/item/toy/prize/ripley = 1,
/obj/item/toy/prize/fireripley = 1,
/obj/item/toy/prize/deathripley = 1,
/obj/item/toy/prize/gygax = 1,
/obj/item/toy/prize/durand = 1,
/obj/item/toy/prize/honk = 1,
/obj/item/toy/prize/marauder = 1,
/obj/item/toy/prize/seraph = 1,
/obj/item/toy/prize/mauler = 1,
/obj/item/toy/prize/odysseus = 1,
/obj/item/toy/prize/phazon = 1,
/obj/item/toy/prize/reticence = 1,
/obj/item/toy/cards/deck = 2,
/obj/item/toy/nuke = 2,
/obj/item/toy/minimeteor = 2,
/obj/item/toy/redbutton = 2,
/obj/item/toy/talking/owl = 2,
/obj/item/toy/talking/griffin = 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/toy/eightball = 2,
/obj/item/toy/windupToolbox = 2,
/obj/item/toy/clockwork_watch = 2,
/obj/item/toy/toy_dagger = 2,
/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/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
/obj/item/storage/box/snappops = 8,
/obj/item/toy/talking/AI = 8,
/obj/item/toy/talking/codex_gigas = 8,
/obj/item/clothing/under/syndicate/tacticool = 8,
/obj/item/toy/sword = 8,
/obj/item/toy/gun = 8,
/obj/item/gun/ballistic/shotgun/toy/crossbow = 8,
/obj/item/storage/box/fakesyndiesuit = 8,
/obj/item/storage/crayons = 8,
/obj/item/toy/spinningtoy = 8,
/obj/item/toy/prize/ripley = 4,
/obj/item/toy/prize/fireripley = 4,
/obj/item/toy/prize/deathripley = 4,
/obj/item/toy/prize/gygax = 4,
/obj/item/toy/prize/durand = 4,
/obj/item/toy/prize/honk = 4,
/obj/item/toy/prize/marauder = 4,
/obj/item/toy/prize/seraph = 4,
/obj/item/toy/prize/mauler = 4,
/obj/item/toy/prize/odysseus = 4,
/obj/item/toy/prize/phazon = 4,
/obj/item/toy/prize/reticence = 4,
/obj/item/toy/cards/deck = 8,
/obj/item/toy/nuke = 8,
/obj/item/toy/minimeteor = 8,
/obj/item/toy/redbutton = 8,
/obj/item/toy/talking/owl = 8,
/obj/item/toy/talking/griffin = 8,
/obj/item/coin/antagtoken = 8,
/obj/item/stack/tile/fakespace/loaded = 8,
/obj/item/stack/tile/fakepit/loaded = 8,
/obj/item/toy/toy_xeno = 8,
/obj/item/storage/box/actionfigure = 4,
/obj/item/restraints/handcuffs/fake = 8,
/obj/item/grenade/chem_grenade/glitter/pink = 4,
/obj/item/grenade/chem_grenade/glitter/blue = 4,
/obj/item/grenade/chem_grenade/glitter/white = 4,
/obj/item/toy/eightball = 8,
/obj/item/toy/windupToolbox = 8,
/obj/item/toy/clockwork_watch = 8,
/obj/item/toy/toy_dagger = 8,
/obj/item/extendohand/acme = 4,
/obj/item/hot_potato/harmless/toy = 4,
/obj/item/card/emagfake = 4,
/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
)
light_color = LIGHT_COLOR_GREEN
code/modules/cargo/packs.dm
+11 -4
View File
@@ -2245,7 +2245,6 @@
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 = 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,
/obj/item/toy/talking/AI,
@@ -2295,8 +2294,16 @@
/obj/item/clothing/shoes/kindleKicks,
/obj/item/storage/belt/military/snack,
/obj/item/toy/eightball,
/obj/item/vending_refill/donksoft,
/obj/item/toy/plush/lizardplushie,
/obj/item/vending_refill/donksoft)
crate_name = "toy crate"
crate_type = /obj/structure/closet/crate/wooden
/datum/supply_pack/costumes_toys/randomised/plush
name = "Plush Crate"
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,
@@ -2359,7 +2366,7 @@
/obj/item/toy/plush/catgirl/skylar,
/obj/item/toy/plush/catgirl/mikeel,
/obj/item/toy/plush/catgirl/robin)
crate_name = "toy crate"
crate_name = "plushie crate"
crate_type = /obj/structure/closet/crate/wooden
/datum/supply_pack/costumes_toys/wizard