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) 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/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() ..() diff --git a/code/modules/power/gravitygenerator_vr.dm b/code/modules/power/gravitygenerator_vr.dm index ae677eaf70..7b1bfca64d 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") + current_overlay = "activated" use_power = USE_POWER_ACTIVE // @@ -126,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() . = ..() diff --git a/icons/obj/pointdefense.dmi b/icons/obj/pointdefense.dmi index c0d0e09ffc..847a4056b3 100644 Binary files a/icons/obj/pointdefense.dmi and b/icons/obj/pointdefense.dmi differ 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" = (