cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 18:32:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bbm' into 'Bleeding-Edge'

Browse Source 
Just some polishing for arenas

Arenas now refer to the winners by their client's key instead of their mob's key. Which gives a better looking name. (ex: "Deity Link" instead of "deitylink")

Arena Cameras now have XRay view by default.

Violence mode is now default. (bomberman suits offer no protections, bomb always deal damage, explosion range+1 at the start)

See merge request !149
This commit is contained in:
d3athrow
2015-08-28 19:41:39 +00:00
parent 29a59bf069 a1820fd622
commit 65e5a9158b
2 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/game/machinery/camera/camera.dm
View File

@@ -430,6 +430,7 @@ var/list/camera_names=list()
..()
pixel_x = 0
pixel_y = 0
upgradeXRay()
upgradeHearing()
/obj/machinery/camera/arena/attackby(W as obj, mob/living/user as mob)

22
code/modules/bomberman/bomberman.dm
View File

@@ -395,6 +395,14 @@ obj/structure/bomberflame/Destroy()
computer.verbs -= x
computer.set_broken()
else if(istype(obstacle, /obj/mecha))
if(fuel <= 2)
obstacle.ex_act(3)
else if(fuel <= 10)
obstacle.ex_act(2)
else
obstacle.ex_act(1)
..()
/obj/structure/bomberflame/ex_act(severity)
@@ -735,7 +743,7 @@ var/global/list/arena_spawnpoints = list()//used by /mob/dead/observer/Logout()
var/name = "Bomberman Arena"
var/status = ARENA_SETUP
var/shape = ""
var/violence = 0
var/violence = 1
var/opacity = 0
var/min_number_of_players = 2
var/area/arena = null
@@ -1099,17 +1107,17 @@ var/global/list/arena_spawnpoints = list()//used by /mob/dead/observer/Logout()
winner = W.loc
for(var/mob/M in arena)
if(winner)
M << "[winner ? "<b>[winner.key]</b> as <b>[winner.name]</b> wins this round! " : ""]Resetting arena in 20 seconds."
if(winner && winner.client)
M << "[winner ? "<b>[winner.client.key]</b> as <b>[winner.name]</b> wins this round! " : ""]Resetting arena in 20 seconds."
else
M << "Couldn't find a winner. Resetting arena in 20 seconds."
if(winner)
if(winner.key in arena_leaderboard)
arena_leaderboard[winner.key] = arena_leaderboard[winner.key] + 1
if(winner.client.key in arena_leaderboard)
arena_leaderboard[winner.client.key] = arena_leaderboard[winner.client.key] + 1
else
arena_leaderboard += winner.key
arena_leaderboard[winner.key] = 1
arena_leaderboard += winner.client.key
arena_leaderboard[winner.client.key] = 1
arena_rounds++