From 557b52bb76125db27a88a56d355a148fa4174e33 Mon Sep 17 00:00:00 2001 From: Buggy123 Date: Tue, 15 Dec 2015 23:03:39 -0500 Subject: [PATCH 1/7] Update bluespaceartillery.dm --- code/modules/awaymissions/bluespaceartillery.dm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/code/modules/awaymissions/bluespaceartillery.dm b/code/modules/awaymissions/bluespaceartillery.dm index dd722db6d8e..06d1eb38afe 100644 --- a/code/modules/awaymissions/bluespaceartillery.dm +++ b/code/modules/awaymissions/bluespaceartillery.dm @@ -1,6 +1,6 @@ /obj/machinery/artillerycontrol - var/reload = 180 + var/reload = 60 name = "bluespace artillery control" icon_state = "control_boxp1" icon = 'icons/obj/machines/particle_accelerator.dmi' @@ -8,7 +8,7 @@ anchored = 1 /obj/machinery/artillerycontrol/process() - if(src.reload<180) + if(src.reload<60) src.reload++ /obj/structure/artilleryplaceholder @@ -24,7 +24,7 @@ user.set_machine(src) var/dat = "Bluespace Artillery Control:
" dat += "Locked on
" - dat += "Charge progress: [reload]/180:
" + dat += "Charge progress: [reload]/60:
" dat += "Open Fire
" dat += "Deployment of weapon authorized by
Nanotrasen Naval Command

Remember, friendly fire is grounds for termination of your contract and life.
" user << browse(dat, "window=scroll") @@ -38,7 +38,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 < 60) 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 +60,4 @@ for(var/turf/T in get_area_turfs(thearea.type)) L+=T var/loc = pick(L) - explosion(loc,2,5,11)*/ \ No newline at end of file + explosion(loc,2,5,11)*/ From f9e6eacb31a03ac35bb2277944d63bbd6dd262c1 Mon Sep 17 00:00:00 2001 From: Buggy123 Date: Tue, 15 Dec 2015 23:05:49 -0500 Subject: [PATCH 4/7] Update bluespaceartillery.dm --- code/modules/awaymissions/bluespaceartillery.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/awaymissions/bluespaceartillery.dm b/code/modules/awaymissions/bluespaceartillery.dm index 06d1eb38afe..d7f97b49fbc 100644 --- a/code/modules/awaymissions/bluespaceartillery.dm +++ b/code/modules/awaymissions/bluespaceartillery.dm @@ -60,4 +60,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)* From 9515e5dd983b3e3c0bd5d9218b6b4f96c7a62dbd Mon Sep 17 00:00:00 2001 From: Buggy123 Date: Tue, 15 Dec 2015 23:05:59 -0500 Subject: [PATCH 5/7] Update bluespaceartillery.dm --- code/modules/awaymissions/bluespaceartillery.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/awaymissions/bluespaceartillery.dm b/code/modules/awaymissions/bluespaceartillery.dm index d7f97b49fbc..06d1eb38afe 100644 --- a/code/modules/awaymissions/bluespaceartillery.dm +++ b/code/modules/awaymissions/bluespaceartillery.dm @@ -60,4 +60,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)*/ From 41fb4c95765bf96f330ae8f0089238ed5f5cd6ea Mon Sep 17 00:00:00 2001 From: Buggy123 Date: Tue, 15 Dec 2015 23:31:07 -0500 Subject: [PATCH 6/7] Update bluespaceartillery.dm --- code/modules/awaymissions/bluespaceartillery.dm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/code/modules/awaymissions/bluespaceartillery.dm b/code/modules/awaymissions/bluespaceartillery.dm index 06d1eb38afe..9d182a16c24 100644 --- a/code/modules/awaymissions/bluespaceartillery.dm +++ b/code/modules/awaymissions/bluespaceartillery.dm @@ -1,6 +1,8 @@ +#define artillery_reload_time 60 + /obj/machinery/artillerycontrol - var/reload = 60 + 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<60) + if(src.reload Date: Thu, 17 Dec 2015 17:16:59 -0500 Subject: [PATCH 7/7] Update bluespaceartillery.dm --- code/modules/awaymissions/bluespaceartillery.dm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/code/modules/awaymissions/bluespaceartillery.dm b/code/modules/awaymissions/bluespaceartillery.dm index 9d182a16c24..5dd9120c6f0 100644 --- a/code/modules/awaymissions/bluespaceartillery.dm +++ b/code/modules/awaymissions/bluespaceartillery.dm @@ -1,8 +1,8 @@ -#define artillery_reload_time 60 +#define ARTILLERY_RELOAD_TIME 60 /obj/machinery/artillerycontrol - var/reload = artillery_reload_time + var/reload = ARTILLERY_RELOAD_TIME name = "bluespace artillery control" icon_state = "control_boxp1" icon = 'icons/obj/machines/particle_accelerator.dmi' @@ -10,7 +10,7 @@ anchored = 1 /obj/machinery/artillerycontrol/process() - if(src.reload