cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9871 from VOREStation/upstream-merge-7938

Browse Source 
[MIRROR] The Arcade Machine Update
This commit is contained in:
Novacat
2021-03-09 19:03:00 -05:00
committed by Chompstation Bot
parent 4dafc3196e
commit 1c75b72b58
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
code/game/machinery/computer/arcade.dm
View File

@@ -1,9 +1,8 @@
/obj/machinery/computer/arcade /obj/machinery/computer/arcade
name = "random arcade" name = "random arcade"
desc = "random arcade machine" desc = "random arcade machine"
icon_state = "arcade" icon_state = "arcade1"
icon_keyboard = null icon_keyboard = null
icon_screen = "invaders"
clicksound = null //Gets too spammy and makes no sense for arcade to have the console keyboard noise anyway 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, var/list/prizes = list( /obj/item/weapon/storage/box/snappops = 2,
/obj/item/toy/blink = 2, /obj/item/toy/blink = 2,
@@ -77,9 +76,10 @@
/////////////////// ///////////////////
/obj/machinery/computer/arcade/battle /obj/machinery/computer/arcade/battle
name = "arcade machine" name = "Battler"
desc = "Does not support Pinball." desc = "Fight through what space has to offer!"
icon_state = "arcade" icon_state = "arcade2"
icon_screen = "battler"
circuit = /obj/item/weapon/circuitboard/arcade/battle circuit = /obj/item/weapon/circuitboard/arcade/battle
var/enemy_name = "Space Villian" var/enemy_name = "Space Villian"
var/temp = "Winners don't use space drugs" //Temporary message, for attack messages, etc var/temp = "Winners don't use space drugs" //Temporary message, for attack messages, etc
@@ -310,7 +310,8 @@
/obj/machinery/computer/arcade/orion_trail /obj/machinery/computer/arcade/orion_trail
name = "The Orion Trail" name = "The Orion Trail"
desc = "Learn how our ancestors got to Orion, and have fun in the process!" 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 circuit = /obj/item/weapon/circuitboard/arcade/orion_trail
var/busy = 0 //prevent clickspam that allowed people to ~speedrun~ the game. var/busy = 0 //prevent clickspam that allowed people to ~speedrun~ the game.
var/engine = 0 var/engine = 0