From be9e0e499f26e267e8583e6aa8f09878a58abd3f Mon Sep 17 00:00:00 2001 From: KorPhaeron Date: Wed, 5 Aug 2015 16:45:13 -0500 Subject: [PATCH 1/7] Early Pod Launch --- .../subsystem/shuttles/emergency.dm | 30 ++++++++++++++++--- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/code/controllers/subsystem/shuttles/emergency.dm b/code/controllers/subsystem/shuttles/emergency.dm index d3e9ad64a44..7b1b4b949b0 100644 --- a/code/controllers/subsystem/shuttles/emergency.dm +++ b/code/controllers/subsystem/shuttles/emergency.dm @@ -106,7 +106,8 @@ if(time_left <= 0 && !SSshuttle.emergencyNoEscape) //move each escape pod to its corresponding transit dock for(var/obj/docking_port/mobile/pod/M in SSshuttle.mobile) - M.enterTransit() + if(M.z == STATION_Z) //Will not launch from the mine/planet + M.enterTransit() //now move the actual emergency shuttle to its transit dock enterTransit() mode = SHUTTLE_ESCAPE @@ -136,9 +137,6 @@ WARNING("[type] id has not been changed from the default. Use the id convention \"pod1\" \"pod2\" etc.") ..() - request() - return - cancel() return @@ -148,3 +146,27 @@ if(.) return . return ..() */ + +/obj/machinery/computer/shuttle/pod + name = "pod control computer" + admin_controlled = 1 + shuttleId = "pod" + possible_destinations = "pod_asteroid" + icon = 'icons/obj/terminals.dmi' + icon_state = "dorm_available" + density = 0 + +/obj/machinery/computer/shuttle/pod/update_icon() + return + +/obj/machinery/computer/shuttle/pod/emag_act(mob/user as mob) + user << " Access requirements overridden. The pod may now be launched manually at any time." + admin_controlled = 0 + icon_state = "dorm_emag" + +/obj/docking_port/stationary/random/initialize() + ..() + var/target_area = /area/mine/unexplored + var/turfs = get_area_turfs(target_area) + var/T=pick(turfs) + src.loc = T From 863d0dd80a5ddfab97403591f3021fadf476c469 Mon Sep 17 00:00:00 2001 From: KorPhaeron Date: Wed, 5 Aug 2015 16:47:01 -0500 Subject: [PATCH 2/7] Security Levels --- code/modules/security levels/security levels.dm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/code/modules/security levels/security levels.dm b/code/modules/security levels/security levels.dm index da714890067..cd81fd5ebd1 100644 --- a/code/modules/security levels/security levels.dm +++ b/code/modules/security levels/security levels.dm @@ -26,6 +26,8 @@ for(var/obj/machinery/firealarm/FA in world) if(FA.z == ZLEVEL_STATION) FA.update_icon() + for(var/obj/machinery/computer/shuttle/pod/pod in world) + pod.admin_controlled = 1 if(SEC_LEVEL_BLUE) if(security_level < SEC_LEVEL_BLUE) minor_announce(config.alert_desc_blue_upto, "Attention! Security level elevated to blue:",1) @@ -35,6 +37,8 @@ for(var/obj/machinery/firealarm/FA in world) if(FA.z == ZLEVEL_STATION) FA.update_icon() + for(var/obj/machinery/computer/shuttle/pod/pod in world) + pod.admin_controlled = 1 if(SEC_LEVEL_RED) if(security_level < SEC_LEVEL_RED) minor_announce(config.alert_desc_red_upto, "Attention! Code red!",1) @@ -50,12 +54,16 @@ for(var/obj/machinery/firealarm/FA in world) if(FA.z == ZLEVEL_STATION) FA.update_icon() + for(var/obj/machinery/computer/shuttle/pod/pod in world) + pod.admin_controlled = 1 if(SEC_LEVEL_DELTA) minor_announce(config.alert_desc_delta, "Attention! Delta security level reached!",1) security_level = SEC_LEVEL_DELTA for(var/obj/machinery/firealarm/FA in world) if(FA.z == ZLEVEL_STATION) FA.update_icon() + for(var/obj/machinery/computer/shuttle/pod/pod in world) + pod.admin_controlled = 1 else return @@ -102,4 +110,4 @@ set_security_level(2) /mob/verb/set_thing3() set_security_level(3) -*/ \ No newline at end of file +*/ From 48b18740d32b82bde5bfd7b4607448113858f51e Mon Sep 17 00:00:00 2001 From: KorPhaeron Date: Wed, 5 Aug 2015 16:57:20 -0500 Subject: [PATCH 3/7] Wrong define --- code/controllers/subsystem/shuttles/emergency.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/controllers/subsystem/shuttles/emergency.dm b/code/controllers/subsystem/shuttles/emergency.dm index 7b1b4b949b0..cc4559b39e7 100644 --- a/code/controllers/subsystem/shuttles/emergency.dm +++ b/code/controllers/subsystem/shuttles/emergency.dm @@ -106,7 +106,7 @@ if(time_left <= 0 && !SSshuttle.emergencyNoEscape) //move each escape pod to its corresponding transit dock for(var/obj/docking_port/mobile/pod/M in SSshuttle.mobile) - if(M.z == STATION_Z) //Will not launch from the mine/planet + if(M.z == ZLEVEL_STATION) //Will not launch from the mine/planet M.enterTransit() //now move the actual emergency shuttle to its transit dock enterTransit() From 0f14b5deaa4d7d95fa2b62490a393b10f654cb8b Mon Sep 17 00:00:00 2001 From: KorPhaeron Date: Wed, 5 Aug 2015 17:59:14 -0500 Subject: [PATCH 4/7] Removed in world --- code/modules/security levels/security levels.dm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/code/modules/security levels/security levels.dm b/code/modules/security levels/security levels.dm index cd81fd5ebd1..a41e018fdaa 100644 --- a/code/modules/security levels/security levels.dm +++ b/code/modules/security levels/security levels.dm @@ -23,10 +23,10 @@ if(SEC_LEVEL_GREEN) minor_announce(config.alert_desc_green, "Attention! Security level lowered to green:") security_level = SEC_LEVEL_GREEN - for(var/obj/machinery/firealarm/FA in world) + for(var/obj/machinery/firealarm/FA in machines) if(FA.z == ZLEVEL_STATION) FA.update_icon() - for(var/obj/machinery/computer/shuttle/pod/pod in world) + for(var/obj/machinery/computer/shuttle/pod/pod in machines) pod.admin_controlled = 1 if(SEC_LEVEL_BLUE) if(security_level < SEC_LEVEL_BLUE) @@ -34,10 +34,10 @@ else minor_announce(config.alert_desc_blue_downto, "Attention! Security level lowered to blue:") security_level = SEC_LEVEL_BLUE - for(var/obj/machinery/firealarm/FA in world) + for(var/obj/machinery/firealarm/FA in machines) if(FA.z == ZLEVEL_STATION) FA.update_icon() - for(var/obj/machinery/computer/shuttle/pod/pod in world) + for(var/obj/machinery/computer/shuttle/pod/pod in machines) pod.admin_controlled = 1 if(SEC_LEVEL_RED) if(security_level < SEC_LEVEL_RED) @@ -51,18 +51,18 @@ if(CC) CC.post_status("alert", "redalert")*/ - for(var/obj/machinery/firealarm/FA in world) + for(var/obj/machinery/firealarm/FA in machines) if(FA.z == ZLEVEL_STATION) FA.update_icon() - for(var/obj/machinery/computer/shuttle/pod/pod in world) + for(var/obj/machinery/computer/shuttle/pod/pod in machines) pod.admin_controlled = 1 if(SEC_LEVEL_DELTA) minor_announce(config.alert_desc_delta, "Attention! Delta security level reached!",1) security_level = SEC_LEVEL_DELTA - for(var/obj/machinery/firealarm/FA in world) + for(var/obj/machinery/firealarm/FA in machines) if(FA.z == ZLEVEL_STATION) FA.update_icon() - for(var/obj/machinery/computer/shuttle/pod/pod in world) + for(var/obj/machinery/computer/shuttle/pod/pod in machines) pod.admin_controlled = 1 else return From 4538106eeb073ac45eff4eb08fdc58299bb8aa47 Mon Sep 17 00:00:00 2001 From: KorPhaeron Date: Thu, 6 Aug 2015 23:08:11 -0500 Subject: [PATCH 5/7] Fixed --- code/controllers/subsystem/shuttles/emergency.dm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/code/controllers/subsystem/shuttles/emergency.dm b/code/controllers/subsystem/shuttles/emergency.dm index cc4559b39e7..652cff69e34 100644 --- a/code/controllers/subsystem/shuttles/emergency.dm +++ b/code/controllers/subsystem/shuttles/emergency.dm @@ -132,13 +132,13 @@ width = 3 height = 4 - New() - if(id == "pod") - WARNING("[type] id has not been changed from the default. Use the id convention \"pod1\" \"pod2\" etc.") - ..() +/obj/docking_port/mobile/pod/New() + if(id == "pod") + WARNING("[type] id has not been changed from the default. Use the id convention \"pod1\" \"pod2\" etc.") + ..() - cancel() - return +/obj/docking_port/mobile/pod/cancel() + return /* findTransitDock() From 54d91dd632fa02055678722c7a8c55a27617fb73 Mon Sep 17 00:00:00 2001 From: KorPhaeron Date: Fri, 14 Aug 2015 20:12:47 -0500 Subject: [PATCH 6/7] Fixed --- code/modules/security levels/security levels.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/modules/security levels/security levels.dm b/code/modules/security levels/security levels.dm index a41e018fdaa..a7a256589cb 100644 --- a/code/modules/security levels/security levels.dm +++ b/code/modules/security levels/security levels.dm @@ -26,8 +26,6 @@ for(var/obj/machinery/firealarm/FA in machines) if(FA.z == ZLEVEL_STATION) FA.update_icon() - for(var/obj/machinery/computer/shuttle/pod/pod in machines) - pod.admin_controlled = 1 if(SEC_LEVEL_BLUE) if(security_level < SEC_LEVEL_BLUE) minor_announce(config.alert_desc_blue_upto, "Attention! Security level elevated to blue:",1) @@ -37,8 +35,6 @@ for(var/obj/machinery/firealarm/FA in machines) if(FA.z == ZLEVEL_STATION) FA.update_icon() - for(var/obj/machinery/computer/shuttle/pod/pod in machines) - pod.admin_controlled = 1 if(SEC_LEVEL_RED) if(security_level < SEC_LEVEL_RED) minor_announce(config.alert_desc_red_upto, "Attention! Code red!",1) From 9d5981c3b28154d5472d86f0f5a594ad8e6578c6 Mon Sep 17 00:00:00 2001 From: KorPhaeron Date: Fri, 14 Aug 2015 22:44:34 -0500 Subject: [PATCH 7/7] Actually fixed --- code/modules/security levels/security levels.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/security levels/security levels.dm b/code/modules/security levels/security levels.dm index a7a256589cb..19d85889439 100644 --- a/code/modules/security levels/security levels.dm +++ b/code/modules/security levels/security levels.dm @@ -51,7 +51,7 @@ if(FA.z == ZLEVEL_STATION) FA.update_icon() for(var/obj/machinery/computer/shuttle/pod/pod in machines) - pod.admin_controlled = 1 + pod.admin_controlled = 0 if(SEC_LEVEL_DELTA) minor_announce(config.alert_desc_delta, "Attention! Delta security level reached!",1) security_level = SEC_LEVEL_DELTA @@ -59,7 +59,7 @@ if(FA.z == ZLEVEL_STATION) FA.update_icon() for(var/obj/machinery/computer/shuttle/pod/pod in machines) - pod.admin_controlled = 1 + pod.admin_controlled = 0 else return