From 70d97b6e44de67dd7862ff09b8d3d25f5d434f33 Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Mon, 28 Mar 2016 01:25:12 -0400 Subject: [PATCH] Ends Science's Toy Tyranny --- _maps/map_files/cyberiad/z2.dmm | 2 +- code/modules/arcade/prize_counter.dm | 33 +++-------------- code/modules/arcade/prize_datums.dm | 55 +--------------------------- 3 files changed, 7 insertions(+), 83 deletions(-) diff --git a/_maps/map_files/cyberiad/z2.dmm b/_maps/map_files/cyberiad/z2.dmm index 914253e4ae2..d1aa08e97d4 100644 --- a/_maps/map_files/cyberiad/z2.dmm +++ b/_maps/map_files/cyberiad/z2.dmm @@ -192,7 +192,7 @@ "dJ" = (/obj/structure/rack,/obj/item/toy/sword,/obj/item/weapon/gun/projectile/revolver/capgun,/turf/unsimulated/floor{icon_state = "cafeteria"; dir = 2},/area/ninja/holding) "dK" = (/obj/structure/stool/bed,/turf/unsimulated/floor{icon_state = "panelscorched"},/area/prison/solitary) "dL" = (/obj/structure/stool/bed,/obj/effect/decal/cleanable/cobweb,/turf/unsimulated/floor{name = "plating"},/area/prison/solitary) -"dM" = (/obj/machinery/prize_counter/upgraded,/turf/unsimulated/floor{icon_state = "cafeteria"; dir = 2},/area/ninja/holding) +"dM" = (/obj/machinery/prize_counter,/turf/unsimulated/floor{icon_state = "cafeteria"; dir = 2},/area/ninja/holding) "dN" = (/turf/simulated/floor/holofloor{tag = "icon-asteroid3 (EAST)"; icon_state = "asteroid3"; dir = 4},/area/holodeck/source_desert) "dO" = (/turf/simulated/floor/holofloor{tag = "icon-carpet1-0 (EAST)"; icon_state = "carpet1-0"; dir = 4},/area/holodeck/source_theatre) "dP" = (/obj/structure/stool,/turf/simulated/floor/holofloor{tag = "icon-carpet5-1 (EAST)"; icon_state = "carpet5-1"; dir = 4},/area/holodeck/source_theatre) diff --git a/code/modules/arcade/prize_counter.dm b/code/modules/arcade/prize_counter.dm index 51c3a43a700..9c3dfe875fe 100644 --- a/code/modules/arcade/prize_counter.dm +++ b/code/modules/arcade/prize_counter.dm @@ -9,7 +9,6 @@ use_power = 1 idle_power_usage = 40 var/tickets = 0 - var/prize_tier = 1 //Increased by matter bin rating, unlocks more prize options per tier /obj/machinery/prize_counter/New() ..() @@ -21,20 +20,6 @@ component_parts += new /obj/item/weapon/stock_parts/console_screen(null) RefreshParts() -/obj/machinery/prize_counter/upgraded/New() - ..() - component_parts = list() - component_parts += new /obj/item/weapon/circuitboard/prize_counter(null) - component_parts += new /obj/item/weapon/stock_parts/matter_bin/bluespace(null) - component_parts += new /obj/item/weapon/stock_parts/manipulator(null) - component_parts += new /obj/item/stack/cable_coil(null, 1) - component_parts += new /obj/item/weapon/stock_parts/console_screen(null) - RefreshParts() - -/obj/machinery/prize_counter/RefreshParts() - for(var/obj/item/weapon/stock_parts/matter_bin/B in component_parts) - prize_tier = B.rating - /obj/machinery/prize_counter/update_icon() if(stat & BROKEN) icon_state = "prize_counter-broken" @@ -161,19 +146,11 @@ td.cost.toomuch {

[item.desc]

"} - if(prize_tier >= item.tier_unlocked) - dat += {" - - [item.cost] Tickets - - - "} - else - dat += {" - - LOCKED. - - + dat += {" + + [item.cost] Tickets + + "} dat += {" diff --git a/code/modules/arcade/prize_datums.dm b/code/modules/arcade/prize_datums.dm index c577045ca45..d67adf97bcb 100644 --- a/code/modules/arcade/prize_datums.dm +++ b/code/modules/arcade/prize_datums.dm @@ -32,7 +32,6 @@ var/global/datum/prizes/global_prizes = new var/desc = "This shouldn't show up..." var/typepath = /obj/item/toy/prizeball var/cost = 0 - var/tier_unlocked = 0 //minimum tier needed to unlock the ability to select this prize ////////////////////////////////////// // Tier 1 Prizes // @@ -43,84 +42,72 @@ var/global/datum/prizes/global_prizes = new desc = "A thin balloon for throwing liquid at people." typepath = /obj/item/toy/balloon cost = 10 - tier_unlocked = 1 /datum/prize_item/crayons name = "Box of Crayons" desc = "A six-pack of crayons, just like back in kindergarten." typepath = /obj/item/weapon/storage/fancy/crayons cost = 35 - tier_unlocked = 1 /datum/prize_item/snappops name = "Snap-Pops" desc = "A box of exploding snap-pop fireworks." typepath = /obj/item/weapon/storage/box/snappops cost = 20 - tier_unlocked = 1 /datum/prize_item/spinningtoy name = "Spinning Toy" desc = "Looks like an authentic Singularity!" typepath = /obj/item/toy/spinningtoy cost = 15 - tier_unlocked = 1 /datum/prize_item/blinktoy name = "Blink toy" desc = "Blink. Blink. Blink." typepath = /obj/item/toy/blink cost = 15 - tier_unlocked = 1 /datum/prize_item/dice name = "Dice set" desc = "A set of assorted dice." typepath = /obj/item/weapon/storage/box/dice cost = 20 - tier_unlocked = 1 /datum/prize_item/cards name = "Deck of cards" desc = "Anyone fancy a game of 52-card Pickup?" typepath = /obj/item/toy/cards/deck cost = 25 - tier_unlocked = 1 /datum/prize_item/wallet name = "Colored Wallet" desc = "Brightly colored and big enough for standard issue ID cards." typepath = /obj/item/weapon/storage/wallet/color cost = 50 - tier_unlocked = 1 /datum/prize_item/pet_rock name = "pet rock" desc = "A pet of your very own!" typepath = /obj/item/toy/pet_rock cost = 80 - tier_unlocked = 1 /datum/prize_item/foam_darts name = "Pack of Foam Darts" desc = "A refill pack of 10 foam darts." typepath = /obj/item/weapon/storage/box/foam_darts cost = 20 - tier_unlocked = 1 /datum/prize_item/minigibber name = "Minigibber Toy" desc = "A model of the station gibber. Probably shouldn't stick your fingers in it." typepath = /obj/item/toy/minigibber cost = 60 - tier_unlocked = 1 /datum/prize_item/id_sticker name = "Prisoner ID Sticker" desc = "A sticker that can make any ID look like a prisoner ID." typepath = /obj/item/weapon/id_decal/prisoner cost = 50 - tier_unlocked = 1 /datum/prize_item/id_sticker/silver name = "Silver ID Sticker" @@ -142,210 +129,170 @@ var/global/datum/prizes/global_prizes = new desc = "A sticker that can make any ID look like something suspicious..." typepath = /obj/item/weapon/id_decal/emag -////////////////////////////////////// -// Tier 2 Prizes // -////////////////////////////////////// - /datum/prize_item/carp_plushie name = "Random Carp Plushie" desc = "A colorful fish-shaped plush toy." typepath = /obj/item/toy/prizeball/carp_plushie cost = 75 - tier_unlocked = 2 /datum/prize_item/therapy_doll name = "Random Therapy Doll" desc = "A therapeutic doll for relieving stress without being charged with assault." typepath = /obj/item/toy/prizeball/therapy cost = 60 - tier_unlocked = 2 /datum/prize_item/plushie name = "Random Animal Plushie" desc = "A colorful animal-shaped plush toy." typepath = /obj/item/toy/prizeball/plushie cost = 75 - tier_unlocked = 2 /datum/prize_item/mech_toy name = "Random Mecha" desc = "A random mecha figure, collect all 11!" typepath = /obj/item/toy/prizeball/mech cost = 75 - tier_unlocked = 2 /datum/prize_item/action_figure name = "Random Action Figure" desc = "A random action figure, collect them all!" typepath = /obj/item/toy/prizeball/figure cost = 75 - tier_unlocked = 2 /datum/prize_item/eight_ball name = "Magic Eight Ball" desc = "A mystical ball that can divine the future!" typepath = /obj/item/toy/eight_ball cost = 40 - tier_unlocked = 2 /datum/prize_item/tacticool name = "Tacticool Turtleneck" desc = "A cool-looking turtleneck." typepath = /obj/item/clothing/under/syndicate/tacticool cost = 90 - tier_unlocked = 2 /datum/prize_item/crossbow name = "Foam Dart Crossbow" desc = "A toy crossbow that fires foam darts." typepath = /obj/item/toy/crossbow cost = 100 - tier_unlocked = 2 /datum/prize_item/toy_xeno name = "Xeno Action Figure" desc = "A lifelike replica of the horrific xeno scourge." typepath = /obj/item/toy/toy_xeno cost = 80 - tier_unlocked = 2 /datum/prize_item/fakespell name = "Fake Spellbook" desc = "Perform magic! Astound your friends! Get mistaken for an enemy of the corporation!" typepath = /obj/item/weapon/spellbook/oneuse/fake_gib cost = 100 - tier_unlocked = 2 /datum/prize_item/capgun name = "Capgun Revolver" desc = "Do you feel lucky... punk?" typepath = /obj/item/weapon/gun/projectile/revolver/capgun cost = 75 - tier_unlocked = 2 /datum/prize_item/confetti name = "Confetti Grenade" desc = "Party time!" typepath = /obj/item/weapon/grenade/confetti cost = 65 - tier_unlocked = 2 - -////////////////////////////////////// -// Tier 3 Prizes // -////////////////////////////////////// /datum/prize_item/magic_conch name = "Magic Conch Shell" desc = "All hail the magic conch!" typepath = /obj/item/toy/eight_ball/conch cost = 100 - tier_unlocked = 3 /datum/prize_item/flash name = "Toy Flash" desc = "AUGH! MY EYES!" typepath = /obj/item/toy/flash cost = 50 - tier_unlocked = 3 /datum/prize_item/foamblade name = "Foam Armblade" desc = "Perfect for reenacting space horror holo-vids." typepath = /obj/item/toy/foamblade cost = 100 - tier_unlocked = 3 /datum/prize_item/minimeteor name = "Mini-Meteor" desc = "Meteors have been detected on a collision course with your fun times!" typepath = /obj/item/toy/minimeteor cost = 50 - tier_unlocked = 3 /datum/prize_item/redbutton name = "Shiny Red Button" desc = "PRESS IT!" typepath = /obj/item/toy/redbutton cost = 100 - tier_unlocked = 3 /datum/prize_item/owl name = "Owl Action Figure" desc = "Remember: heroes don't grief!" typepath = /obj/item/toy/owl cost = 125 - tier_unlocked = 3 /datum/prize_item/griffin name = "Griffin Action Figure" desc = "If you can't be the best, you can always be the WORST." typepath = /obj/item/toy/griffin cost = 125 - tier_unlocked = 3 /datum/prize_item/AI name = "Toy AI Unit" desc = "Law 1: Maximize fun for crew." typepath = /obj/item/toy/AI cost = 75 - tier_unlocked = 3 /datum/prize_item/tommygun name = "Tommygun" desc = "A replica tommygun that fires foam darts." typepath = /obj/item/toy/crossbow/tommygun cost = 175 - tier_unlocked = 3 /datum/prize_item/esword name = "Toy Energy Sword" desc = "A plastic replica of an energy blade." typepath = /obj/item/toy/sword cost = 150 - tier_unlocked = 3 /datum/prize_item/blobhat name = "Blob Hat" desc = "There's... something... on your head..." typepath = /obj/item/clothing/head/blob cost = 125 - tier_unlocked = 3 /datum/prize_item/nuke name = "Nuclear Fun Device" desc = "Annihilate boredom with an explosion of excitement!" typepath = /obj/item/toy/nuke cost = 100 - tier_unlocked = 3 - -////////////////////////////////////// -// Tier 4 Prizes // -////////////////////////////////////// /datum/prize_item/chainsaw name = "Toy Chainsaw" desc = "A full-scale model chainsaw, based on that massacre in Space Texas." typepath = /obj/item/weapon/twohanded/toy/chainsaw cost = 200 - tier_unlocked = 4 /datum/prize_item/spacesuit name = "Fake Spacesuit" desc = "A replica spacesuit. Not actually spaceworthy." typepath = /obj/item/weapon/storage/box/fakesyndiesuit cost = 180 - tier_unlocked = 4 /datum/prize_item/fakespace name = "Space Carpet" desc = "A stack of carpeted floor tiles that resemble space." typepath = /obj/item/stack/tile/fakespace/loaded cost = 150 - tier_unlocked = 4 /datum/prize_item/bike name = "Awesome Bike!" desc = "WOAH." typepath = /obj/structure/stool/bed/chair/wheelchair/bike - cost = 10000 //max stack + 1 tickets - tier_unlocked = 4 + cost = 10000 //max stack + 1 tickets.