mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 18:22:39 +00:00
Merge pull request #1548 from CHOMPStationBot/upstream-merge-9871
[MIRROR] [MIRROR] The Arcade Machine Update
This commit is contained in:
@@ -1,9 +1,8 @@
|
||||
/obj/machinery/computer/arcade
|
||||
name = "random arcade"
|
||||
desc = "random arcade machine"
|
||||
icon_state = "arcade"
|
||||
icon_state = "arcade1"
|
||||
icon_keyboard = null
|
||||
icon_screen = "invaders"
|
||||
clicksound = null //Gets too spammy and makes no sense for arcade to have the console keyboard noise anyway
|
||||
var/list/prizes = list( /obj/item/weapon/storage/box/snappops = 2,
|
||||
/obj/item/toy/blink = 2,
|
||||
@@ -77,9 +76,10 @@
|
||||
///////////////////
|
||||
|
||||
/obj/machinery/computer/arcade/battle
|
||||
name = "arcade machine"
|
||||
desc = "Does not support Pinball."
|
||||
icon_state = "arcade"
|
||||
name = "Battler"
|
||||
desc = "Fight through what space has to offer!"
|
||||
icon_state = "arcade2"
|
||||
icon_screen = "battler"
|
||||
circuit = /obj/item/weapon/circuitboard/arcade/battle
|
||||
var/enemy_name = "Space Villian"
|
||||
var/temp = "Winners don't use space drugs" //Temporary message, for attack messages, etc
|
||||
@@ -310,7 +310,8 @@
|
||||
/obj/machinery/computer/arcade/orion_trail
|
||||
name = "The Orion Trail"
|
||||
desc = "Learn how our ancestors got to Orion, and have fun in the process!"
|
||||
icon_state = "arcade"
|
||||
icon_state = "arcade1"
|
||||
icon_screen = "orion"
|
||||
circuit = /obj/item/weapon/circuitboard/arcade/orion_trail
|
||||
var/busy = 0 //prevent clickspam that allowed people to ~speedrun~ the game.
|
||||
var/engine = 0
|
||||
|
||||
Reference in New Issue
Block a user