Merge pull request #13687 from Buggy123/master

Reduces cooldown of the Bluespace Artillery on the space battle away mission
This commit is contained in:
tkdrg
2015-12-17 20:25:25 -03:00
@@ -1,6 +1,8 @@
#define ARTILLERY_RELOAD_TIME 60
/obj/machinery/artillerycontrol
var/reload = 180
var/reload = ARTILLERY_RELOAD_TIME
name = "bluespace artillery control"
icon_state = "control_boxp1"
icon = 'icons/obj/machines/particle_accelerator.dmi'
@@ -8,7 +10,7 @@
anchored = 1
/obj/machinery/artillerycontrol/process()
if(src.reload<180)
if(src.reload<ARTILLERY_RELOAD_TIME)
src.reload++
/obj/structure/artilleryplaceholder
@@ -24,7 +26,7 @@
user.set_machine(src)
var/dat = "<B>Bluespace Artillery Control:</B><BR>"
dat += "Locked on<BR>"
dat += "<B>Charge progress: [reload]/180:</B><BR>"
dat += "<B>Charge progress: [reload]/[ARTILLERY_RELOAD_TIME]:</B><BR>"
dat += "<A href='byond://?src=\ref[src];fire=1'>Open Fire</A><BR>"
dat += "Deployment of weapon authorized by <br>Nanotrasen Naval Command<br><br>Remember, friendly fire is grounds for termination of your contract and life.<HR>"
user << browse(dat, "window=scroll")
@@ -38,7 +40,7 @@
A = input("Area to jump bombard", "Open Fire", A) in teleportlocs
var/area/thearea = teleportlocs[A]
if (usr.stat || usr.restrained()) return
if(src.reload < 180) return
if(src.reload < ARTILLERY_RELOAD_TIME) return
if ((usr.contents.Find(src) || (in_range(src, usr) && istype(src.loc, /turf))) || (istype(usr, /mob/living/silicon)))
priority_announce("Bluespace artillery fire detected. Brace for impact.")
message_admins("[key_name_admin(usr)] has launched an artillery strike.")
@@ -60,4 +62,4 @@
for(var/turf/T in get_area_turfs(thearea.type))
L+=T
var/loc = pick(L)
explosion(loc,2,5,11)*/
explosion(loc,2,5,11)*/