Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixes issues I had with helio #13

Merged
merged 3 commits into from
Jan 2, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
160 changes: 78 additions & 82 deletions _maps/map_files/Heliostation/Heliostation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -8079,6 +8079,7 @@
dir = 9;
name = "engineering yellow"
},
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/maintenance/solars/port/fore)
"aRj" = (
Expand Down Expand Up @@ -14853,7 +14854,7 @@
/area/station/security/prison/visit)
"brP" = (
/obj/machinery/door/airlock/security/glass{
name = "Security EVAC"
name = "Holding Area"
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
Expand Down Expand Up @@ -16113,6 +16114,7 @@
/area/station/service/bar)
"bxj" = (
/obj/structure/extinguisher_cabinet/directional/east,
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/hallway/primary/central)
"bxk" = (
Expand Down Expand Up @@ -16373,6 +16375,7 @@
location = "brown";
name = "Patrol Beacon"
},
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/hallway/primary/central)
"byF" = (
Expand Down Expand Up @@ -16555,6 +16558,7 @@
},
/obj/effect/mapping_helpers/airlock/access/all/medical/morgue,
/obj/machinery/door/firedoor,
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/medical/morgue)
"bzp" = (
Expand Down Expand Up @@ -22228,29 +22232,6 @@
/turf/open/floor/iron/textured_half,
/area/station/cargo/warehouse)
"cyl" = (
/obj/structure/closet/crate/engineering/electrical,
/obj/item/solar_assembly,
/obj/item/solar_assembly,
/obj/item/solar_assembly,
/obj/item/solar_assembly,
/obj/item/solar_assembly,
/obj/item/solar_assembly,
/obj/item/solar_assembly,
/obj/item/solar_assembly,
/obj/item/solar_assembly,
/obj/item/solar_assembly,
/obj/item/solar_assembly,
/obj/item/solar_assembly,
/obj/item/solar_assembly,
/obj/item/solar_assembly,
/obj/item/solar_assembly,
/obj/item/solar_assembly,
/obj/item/solar_assembly,
/obj/item/solar_assembly,
/obj/item/solar_assembly,
/obj/item/solar_assembly,
/obj/item/stack/sheet/glass/fifty,
/obj/item/stack/cable_coil,
/obj/machinery/power/apc/auto_name/directional/west,
/obj/machinery/light_switch/directional/north,
/obj/effect/turf_decal/box,
Expand Down Expand Up @@ -22588,6 +22569,7 @@
},
/obj/effect/turf_decal/bot,
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable,
/turf/open/floor/iron/dark/textured,
/area/station/maintenance/solars/starboard/aft)
"cAR" = (
Expand Down Expand Up @@ -26293,6 +26275,10 @@
/area/station/maintenance/department/science/central)
"cWX" = (
/obj/structure/cable,
/obj/machinery/power/solar{
id = "aftstarboard";
name = "Aft-Starboard Solar Array"
},
/turf/open/floor/iron/solarpanel/airless,
/area/station/solars/starboard/aft)
"cXg" = (
Expand Down Expand Up @@ -28374,6 +28360,7 @@
name = "Aft Port Solars Control"
},
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/maintenance/solars/port/aft)
"dKY" = (
Expand Down Expand Up @@ -28504,6 +28491,20 @@
/obj/effect/spawner/random/trash/caution_sign,
/turf/open/floor/plating,
/area/station/maintenance/port/fore)
"dPq" = (
/obj/effect/turf_decal/tile/blue{
color = "#73c2fb";
dir = 4;
name = "Medical blue corner"
},
/obj/effect/turf_decal/tile/blue{
color = "#73c2fb";
dir = 1;
name = "Medical blue corner"
},
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
"dPM" = (
/obj/structure/cable,
/turf/open/floor/carpet/royalblack,
Expand Down Expand Up @@ -47712,11 +47713,6 @@
/obj/effect/mapping_helpers/airlock/unres,
/turf/open/floor/iron/textured_half,
/area/station/maintenance/department/eva/abandoned)
"lCH" = (
/obj/structure/lattice,
/obj/structure/cable,
/turf/open/space/basic,
/area/space/nearstation)
"lCI" = (
/obj/machinery/modular_computer/preset/cargochat/service,
/obj/effect/turf_decal/bot,
Expand Down Expand Up @@ -50814,6 +50810,12 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron,
/area/station/science/xenobiology)
"mOe" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/public/glass,
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/hallway/primary/aft)
"mOF" = (
/obj/structure/closet/crate/internals,
/obj/item/tank/internals/generic,
Expand Down Expand Up @@ -62367,10 +62369,8 @@
/area/station/maintenance/department/science/xenobiology)
"rlk" = (
/obj/machinery/power/apc/auto_name/directional/south,
/obj/effect/turf_decal/stripes/end{
dir = 1
},
/obj/structure/cable,
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/iron,
/area/station/cargo/storage)
"rlM" = (
Expand Down Expand Up @@ -73934,6 +73934,7 @@
name = "Fore Starboard Solars Control"
},
/obj/structure/sign/warning/vacuum/external/directional/north,
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/maintenance/solars/starboard/fore)
"vUB" = (
Expand Down Expand Up @@ -74577,7 +74578,6 @@
"whH" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/bot,
/obj/machinery/power/shuttle_engine/propulsion,
/turf/open/floor/iron,
/area/station/cargo/warehouse/upper)
"wib" = (
Expand Down Expand Up @@ -77991,10 +77991,6 @@
/obj/effect/decal/cleanable/blood/old,
/turf/open/floor/wood,
/area/station/maintenance/aft/lesser)
"xBJ" = (
/obj/structure/cable,
/turf/open/space/basic,
/area/space)
"xCy" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden,
/turf/open/floor/engine,
Expand Down Expand Up @@ -112687,19 +112683,19 @@ buI
bxk
bvs
daF
bwl
caP
bwl
bwl
bwl
bwl
bwl
bwl
cJN
bJB
bJB
bJB
bJB
bjW
ccu
bjW
bjW
bjW
bjW
bjW
bjW
mOe
bJe
bJe
bJe
bJe
bJe
bJB
bJB
Expand Down Expand Up @@ -112943,7 +112939,7 @@ bud
edr
bud
bwl
bwl
bjW
byE
mTs
sSf
Expand Down Expand Up @@ -113199,7 +113195,7 @@ bwl
bwl
gXc
bwl
bwl
bjW
bxj
byF
cXB
Expand Down Expand Up @@ -113455,8 +113451,8 @@ bev
btg
bwl
gXc
bwl
bwl
bjW
bjW
cNr
cNr
tdu
Expand Down Expand Up @@ -119620,8 +119616,8 @@ rlZ
dsh
igm
bzn
nBH
eGq
dPq
aKB
iiK
bvu
buR
Expand Down Expand Up @@ -133032,19 +133028,19 @@ xaK
aaa
oCj
aaa
lCH
xBJ
xBJ
xBJ
xBJ
aak
aaa
aaa
aaa
aaa
aaa
iGq
aaa
xBJ
xBJ
xBJ
xBJ
lCH
aaa
aaa
aaa
aaa
aak
aaa
aaR
aaa
Expand Down Expand Up @@ -133547,18 +133543,18 @@ aaa
aaR
aak
sOT
cAR
sOT
cAR
cAR
sOT
sOT
sOT
iGq
lya
cAR
sOT
sOT
cAR
cAR
cAR
sOT
sOT
sOT
aak
aaR
aaa
Expand Down Expand Up @@ -134060,19 +134056,19 @@ aak
aak
oCj
aaa
lCH
xBJ
xBJ
xBJ
xBJ
aak
aaa
aaa
aaa
aaa
aaa
iGq
aaa
xBJ
xBJ
xBJ
xBJ
lCH
aaa
aaa
aaa
aaa
aak
aaa
aaR
aaa
Expand Down