From 092069bdf1e27a67640da281e47c100fb8145f76 Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Mon, 20 Apr 2020 13:23:01 -0400 Subject: [PATCH 1/7] Rename doors to gravity generator --- maps/tether/tether-05-station1.dmm | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/maps/tether/tether-05-station1.dmm b/maps/tether/tether-05-station1.dmm index 468a9571e5..12badd57c4 100644 --- a/maps/tether/tether-05-station1.dmm +++ b/maps/tether/tether-05-station1.dmm @@ -8051,9 +8051,8 @@ opacity = 0 }, /obj/machinery/door/airlock/engineering{ - name = "Engineering Hard Storage"; - req_access = list(11); - req_one_access = newlist() + name = "Gravity Generator"; + req_access = list(11) }, /turf/simulated/floor/tiled/steel_grid, /area/engineering/hallway) @@ -24041,11 +24040,6 @@ }, /area/engineering/gravity_lobby) "sjw" = ( -/obj/machinery/door/airlock/engineering{ - name = "Engineering Hard Storage"; - req_access = list(11); - req_one_access = newlist() - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -24058,6 +24052,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/door/airlock/engineering{ + name = "Gravity Generator"; + req_access = list(11) + }, /turf/simulated/floor/tiled/steel_grid, /area/engineering/gravity_lobby) "sqw" = ( From f8d387f136ee5d8b01aed714cacdd473c29d6345 Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Mon, 20 Apr 2020 13:47:36 -0400 Subject: [PATCH 2/7] Tweak gravity generator icon --- code/modules/power/gravitygenerator_vr.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/power/gravitygenerator_vr.dm b/code/modules/power/gravitygenerator_vr.dm index ae677eaf70..e061f7c5a6 100644 --- a/code/modules/power/gravitygenerator_vr.dm +++ b/code/modules/power/gravitygenerator_vr.dm @@ -93,6 +93,7 @@ GLOBAL_LIST_EMPTY(gravity_generators) . = ..() setup_parts() middle.add_overlay("activated") + overlay_state = "activated" use_power = USE_POWER_ACTIVE // From d1cdea22a9ced75f38da2ef85276a32b507f50fa Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Mon, 20 Apr 2020 13:53:23 -0400 Subject: [PATCH 3/7] Fix gravy gen area detection happening too early --- code/modules/power/gravitygenerator_vr.dm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/code/modules/power/gravitygenerator_vr.dm b/code/modules/power/gravitygenerator_vr.dm index e061f7c5a6..c45100d5e4 100644 --- a/code/modules/power/gravitygenerator_vr.dm +++ b/code/modules/power/gravitygenerator_vr.dm @@ -127,9 +127,13 @@ GLOBAL_LIST_EMPTY(gravity_generators) var/list/areas = list() /obj/machinery/gravity_generator/main/Initialize() - . = ..() + ..() + return INITIALIZE_HINT_LATELOAD + +/obj/machinery/gravity_generator/main/LateInitialize() //Needs to happen after overmap sectors are initialized so we can figure out where we are update_list() update_areas() + return ..() /obj/machinery/gravity_generator/main/set_fix() . = ..() From e9f7a4060033ecb0578cc0c64218f872223c9dfb Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Mon, 20 Apr 2020 13:56:06 -0400 Subject: [PATCH 4/7] Add points for rutile ore --- code/modules/mining/machine_processing.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/mining/machine_processing.dm b/code/modules/mining/machine_processing.dm index d515f42925..03b23b15a6 100644 --- a/code/modules/mining/machine_processing.dm +++ b/code/modules/mining/machine_processing.dm @@ -177,7 +177,8 @@ "platinum" = 40, "lead" = 40, "mhydrogen" = 40, - "verdantium" = 60) + "verdantium" = 60, + "rutile" = 40) //VOREStation Add /obj/machinery/mineral/processing_unit/New() ..() From 638686039f16677a39852a64a2c0522051d5e713 Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Mon, 20 Apr 2020 14:21:57 -0400 Subject: [PATCH 5/7] Re-fix gravity gen icon --- code/modules/power/gravitygenerator_vr.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/power/gravitygenerator_vr.dm b/code/modules/power/gravitygenerator_vr.dm index c45100d5e4..7b1bfca64d 100644 --- a/code/modules/power/gravitygenerator_vr.dm +++ b/code/modules/power/gravitygenerator_vr.dm @@ -93,7 +93,7 @@ GLOBAL_LIST_EMPTY(gravity_generators) . = ..() setup_parts() middle.add_overlay("activated") - overlay_state = "activated" + current_overlay = "activated" use_power = USE_POWER_ACTIVE // From 43a198ea4c8409f555e9723a1ae8f27a906cc76e Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Mon, 20 Apr 2020 15:08:59 -0400 Subject: [PATCH 6/7] Make pointdef blink red for a moment when they fail to shoot --- code/game/machinery/pointdefense.dm | 1 + icons/obj/pointdefense.dmi | Bin 8047 -> 8329 bytes 2 files changed, 1 insertion(+) diff --git a/code/game/machinery/pointdefense.dm b/code/game/machinery/pointdefense.dm index 3ca0ed601e..1deaf1a58b 100644 --- a/code/game/machinery/pointdefense.dm +++ b/code/game/machinery/pointdefense.dm @@ -268,6 +268,7 @@ GLOBAL_LIST_BOILERPLATE(pointdefense_turrets, /obj/machinery/power/pointdefense) s.set_up(5, 1, src) s.start() visible_message("[src] sputters as browns out while attempting to fire.") + flick(src, "[initial(icon_state)]_off") return //We throw a laser but it doesnt have to hit for meteor to explode var/obj/item/projectile/beam/pointdefense/beam = new(get_turf(src)) diff --git a/icons/obj/pointdefense.dmi b/icons/obj/pointdefense.dmi index c0d0e09ffc1d6386d55b6baedc38f821e4ce543b..847a4056b308e4b35ea2b33972a59954c87d1574 100644 GIT binary patch literal 8329 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 Date: Mon, 20 Apr 2020 15:09:19 -0400 Subject: [PATCH 7/7] Slow down meteors 3x to give pointdef a chance This is the speed Bay uses and the pointdef values are from there --- code/game/gamemodes/meteor/meteors.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/gamemodes/meteor/meteors.dm b/code/game/gamemodes/meteor/meteors.dm index de4bf442af..020ab54f0e 100644 --- a/code/game/gamemodes/meteor/meteors.dm +++ b/code/game/gamemodes/meteor/meteors.dm @@ -55,7 +55,7 @@ var/obj/effect/meteor/M = new Me(pickedstart) M.dest = pickedgoal spawn(0) - walk_towards(M, M.dest, 1) + walk_towards(M, M.dest, 3) //VOREStation Edit - Slower Meteors return /proc/spaceDebrisStartLoc(startSide, Z)