Merge pull request #7424 from VOREStation/aro-alienfix

Swap the 3 fake void cores on derelict.dmm for real ones
This commit is contained in:
Aronai Sieyes
2020-04-25 13:36:46 -04:00
committed by GitHub
2 changed files with 31 additions and 31 deletions
+27 -27
View File
@@ -143,7 +143,6 @@
/turf/simulated/floor/bluegrid,
/area/tether_away/debrisfield/derelict/interior)
"ay" = (
/obj/structure/prop/alien/power,
/obj/structure/cable,
/obj/structure/cable{
icon_state = "1-8"
@@ -158,6 +157,7 @@
alpha = 0;
invisibility = 101
},
/obj/machinery/power/rtg/abductor/built,
/turf/simulated/floor/bluegrid,
/area/tether_away/debrisfield/derelict/interior)
"az" = (
@@ -234,6 +234,30 @@
"aK" = (
/turf/space,
/area/tether_away/debrisfield/derelict)
"aL" = (
/obj/structure/cable{
d2 = 2;
icon_state = "0-2";
pixel_y = 0
},
/obj/machinery/power/fractal_reactor{
alpha = 0;
invisibility = 101
},
/obj/machinery/power/rtg/abductor/built,
/turf/simulated/floor/reinforced,
/area/tether_away/debrisfield/derelict/interior)
"aM" = (
/obj/structure/cable{
icon_state = "0-4"
},
/obj/machinery/power/fractal_reactor{
alpha = 0;
invisibility = 101
},
/obj/machinery/power/rtg/abductor/built,
/turf/simulated/floor/reinforced,
/area/tether_away/debrisfield/derelict/interior)
"aN" = (
/obj/random/humanoidremains,
/obj/structure/cable{
@@ -328,30 +352,6 @@
/obj/structure/prop/alien/computer/camera,
/turf/simulated/floor/reinforced,
/area/tether_away/debrisfield/derelict/interior)
"bf" = (
/obj/structure/prop/alien/power,
/obj/structure/cable{
d2 = 2;
icon_state = "0-2";
pixel_y = 0
},
/obj/machinery/power/fractal_reactor{
alpha = 0;
invisibility = 101
},
/turf/simulated/floor/reinforced,
/area/tether_away/debrisfield/derelict/interior)
"bg" = (
/obj/structure/prop/alien/power,
/obj/structure/cable{
icon_state = "0-4"
},
/obj/machinery/power/fractal_reactor{
alpha = 0;
invisibility = 101
},
/turf/simulated/floor/reinforced,
/area/tether_away/debrisfield/derelict/interior)
"bh" = (
/obj/structure/prop/alien/computer/camera/flipped,
/obj/structure/cable{
@@ -1484,7 +1484,7 @@ aa
ao
ao
ao
bf
aL
bj
bj
bs
@@ -4222,7 +4222,7 @@ aa
ao
ao
ao
bg
aM
bi
bp
bi
+4 -4
View File
@@ -1617,10 +1617,10 @@
#include "code\modules\ai\ai_holder_targeting.dm"
#include "code\modules\ai\interfaces.dm"
#include "code\modules\ai\say_list.dm"
#include "code\modules\ai\aI_holder_subtypes\simple_mob_ai.dm"
#include "code\modules\ai\aI_holder_subtypes\simple_mob_ai_vr.dm"
#include "code\modules\ai\aI_holder_subtypes\slime_xenobio_ai.dm"
#include "code\modules\ai\aI_holder_subtypes\slime_xenobio_ai_vr.dm"
#include "code\modules\ai\ai_holder_subtypes\simple_mob_ai.dm"
#include "code\modules\ai\ai_holder_subtypes\simple_mob_ai_vr.dm"
#include "code\modules\ai\ai_holder_subtypes\slime_xenobio_ai.dm"
#include "code\modules\ai\ai_holder_subtypes\slime_xenobio_ai_vr.dm"
#include "code\modules\alarm\alarm.dm"
#include "code\modules\alarm\alarm_handler.dm"
#include "code\modules\alarm\atmosphere_alarm.dm"