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

Merge pull request #5310 from Heroman3003/arcade-fix

Browse Source 
Fixed arcades dispensing their own board
This commit is contained in:
Anewbe
2018-05-31 20:32:40 -05:00
committed by VirgoBot
parent 5addac95ed
commit 2fba824a89
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,7 +45,7 @@
qdel(src) qdel(src)
/obj/machinery/computer/arcade/proc/prizevend() /obj/machinery/computer/arcade/proc/prizevend()
if(!contents.len) if(!(contents-circuit).len)
var/prizeselect = pickweight(prizes) var/prizeselect = pickweight(prizes)
new prizeselect(src.loc) new prizeselect(src.loc)
@@ -53,7 +53,7 @@
new /obj/item/clothing/head/syndicatefake(src.loc) new /obj/item/clothing/head/syndicatefake(src.loc)
else else
var/atom/movable/prize = pick(contents) var/atom/movable/prize = pick(contents-circuit)
prize.loc = src.loc prize.loc = src.loc
/obj/machinery/computer/arcade/attack_ai(mob/user as mob) /obj/machinery/computer/arcade/attack_ai(mob/user as mob)
@@ -272,7 +272,7 @@
/obj/machinery/computer/arcade/battle/emag_act(var/charges, var/mob/user) /obj/machinery/computer/arcade/battle/emag_act(var/charges, var/mob/user)
if(!emagged) if(!emagged)
to_chat(user, span("notice","You override the cheat code menu and skip to Cheat #[rand(1, 50)]: Hyper-Lethal Mode.")) to_chat(user, span("notice","You override the cheat code menu and skip to Cheat #[rand(1, 50)]: Hyper-Lethal Mode."))
temp = "If you die in the game, you die for real!" temp = "If you die in the game, you die for real!"
player_hp = 30 player_hp = 30
player_mp = 10 player_mp = 10
@@ -407,7 +407,7 @@
if(emagged) if(emagged)
var/mob/living/M = user var/mob/living/M = user
M.adjust_fire_stacks(5) M.adjust_fire_stacks(5)
M.IgniteMob() //flew into a star, so you're on fire M.IgniteMob() //flew into a star, so you're on fire
to_chat(user,span("danger", "<font size=3>You feel an immense wave of heat emanate from \the [src]. Your skin bursts into flames.</font>")) to_chat(user,span("danger", "<font size=3>You feel an immense wave of heat emanate from \the [src]. Your skin bursts into flames.</font>"))
dat += "<br><P ALIGN=Right><a href='byond://?src=\ref[src];menu=1'>OK...</a></P>" dat += "<br><P ALIGN=Right><a href='byond://?src=\ref[src];menu=1'>OK...</a></P>"