Merge pull request #7354 from VOREStation/aro-tweaks

Smol Fixes
This commit is contained in:
Aronai Sieyes
2020-04-20 19:39:47 -04:00
committed by GitHub
6 changed files with 16 additions and 11 deletions
+1 -1
View File
@@ -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)
+1
View File
@@ -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))
+2 -1
View File
@@ -177,7 +177,8 @@
"platinum" = 40,
"lead" = 40,
"mhydrogen" = 40,
"verdantium" = 60)
"verdantium" = 60,
"rutile" = 40) //VOREStation Add
/obj/machinery/mineral/processing_unit/New()
..()
+6 -1
View File
@@ -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()
. = ..()
Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.9 KiB

After

Width:  |  Height:  |  Size: 8.1 KiB

+6 -8
View File
@@ -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" = (