Skip to content

Commit

Permalink
Rad collectors gone, tesla coils to generate power (#61917)
Browse files Browse the repository at this point in the history
Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
  • Loading branch information
Ghilker and Mothblocks committed Oct 9, 2021
1 parent 7b9c807 commit cc3bf70
Show file tree
Hide file tree
Showing 20 changed files with 258 additions and 162 deletions.
11 changes: 8 additions & 3 deletions _maps/RandomRuins/SpaceRuins/oldstation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2853,7 +2853,7 @@
/area/ruin/space/has_grav/ancientstation/betacorridor)
"hK" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/power/rad_collector,
/obj/machinery/power/tesla_coil,
/turf/open/floor/plating,
/area/ruin/space/has_grav/ancientstation/deltacorridor)
"hL" = (
Expand Down Expand Up @@ -6300,6 +6300,11 @@
/obj/effect/spawner/random/maintenance/three,
/turf/open/floor/plating,
/area/ruin/space/has_grav/ancientstation/deltacorridor)
"rZ" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/power/grounding_rod,
/turf/open/floor/plating,
/area/ruin/space/has_grav/ancientstation/deltacorridor)
"sy" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
Expand Down Expand Up @@ -11432,8 +11437,8 @@ bE
hK
hK
dh
dh
dh
rZ
rZ
dh
Zk
DC
Expand Down
24 changes: 20 additions & 4 deletions _maps/map_files/Deltastation/DeltaStation2.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -46795,8 +46795,8 @@
/obj/structure/window/reinforced/plasma/spawner/west{
dir = 4
},
/obj/machinery/power/rad_collector/anchored,
/obj/structure/cable,
/obj/machinery/power/tesla_coil/anchored,
/turf/open/floor/engine,
/area/engineering/supermatter)
"hVZ" = (
Expand Down Expand Up @@ -73462,6 +73462,14 @@
},
/turf/open/floor/iron,
/area/security/brig)
"pKk" = (
/obj/structure/window/reinforced/plasma/spawner/west{
dir = 1
},
/obj/structure/cable,
/obj/machinery/power/grounding_rod/anchored,
/turf/open/floor/engine,
/area/engineering/supermatter)
"pKR" = (
/obj/structure/cable,
/obj/effect/turf_decal/tile/purple{
Expand Down Expand Up @@ -82388,6 +82396,14 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/hallway/primary/central/aft)
"spy" = (
/obj/structure/window/reinforced/plasma/spawner/west{
dir = 4
},
/obj/structure/cable,
/obj/machinery/power/grounding_rod/anchored,
/turf/open/floor/engine,
/area/engineering/supermatter)
"spz" = (
/obj/structure/cable,
/obj/effect/turf_decal/tile/neutral{
Expand Down Expand Up @@ -87254,8 +87270,8 @@
/obj/structure/window/reinforced/plasma/spawner/west{
dir = 1
},
/obj/machinery/power/rad_collector/anchored,
/obj/structure/cable,
/obj/machinery/power/tesla_coil/anchored,
/turf/open/floor/engine,
/area/engineering/supermatter)
"tLT" = (
Expand Down Expand Up @@ -123183,7 +123199,7 @@ cnP
kuB
qzf
hVW
hVW
spy
hVW
qzf
qzf
Expand Down Expand Up @@ -123699,7 +123715,7 @@ hWu
rgQ
uqa
wrL
tLP
pKk
vyP
eZx
hfD
Expand Down
26 changes: 22 additions & 4 deletions _maps/map_files/IceBoxStation/IceBoxStation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -27392,12 +27392,12 @@
/turf/open/floor/iron,
/area/hallway/primary/aft)
"kpY" = (
/obj/machinery/power/rad_collector/anchored,
/obj/structure/window/reinforced/plasma{
dir = 8
},
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible,
/obj/machinery/power/tesla_coil/anchored,
/turf/open/floor/engine,
/area/engineering/supermatter)
"kqc" = (
Expand Down Expand Up @@ -27506,12 +27506,12 @@
/turf/open/floor/iron,
/area/science/xenobiology)
"ksu" = (
/obj/machinery/power/rad_collector/anchored,
/obj/structure/window/reinforced/plasma{
dir = 4
},
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible,
/obj/machinery/power/tesla_coil/anchored,
/turf/open/floor/engine,
/area/engineering/supermatter)
"ksz" = (
Expand Down Expand Up @@ -37796,6 +37796,15 @@
/obj/machinery/status_display/evac/directional/south,
/turf/open/floor/iron,
/area/hallway/primary/central)
"pRi" = (
/obj/structure/window/reinforced/plasma{
dir = 4
},
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible,
/obj/machinery/power/grounding_rod/anchored,
/turf/open/floor/engine,
/area/engineering/supermatter)
"pRo" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
Expand Down Expand Up @@ -39646,6 +39655,15 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/commons/storage/primary)
"qTt" = (
/obj/structure/window/reinforced/plasma{
dir = 8
},
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible,
/obj/machinery/power/grounding_rod/anchored,
/turf/open/floor/engine,
/area/engineering/supermatter)
"qTA" = (
/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
Expand Down Expand Up @@ -81684,7 +81702,7 @@ wOE
hua
tLr
ksu
ksu
pRi
ksu
hua
mLE
Expand Down Expand Up @@ -82712,7 +82730,7 @@ hua
mWg
tLr
kpY
kpY
qTt
kpY
hua
mLE
Expand Down
30 changes: 26 additions & 4 deletions _maps/map_files/KiloStation/KiloStation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -39143,6 +39143,17 @@
icon_state = "platingdmg1"
},
/area/maintenance/disposal)
"hHY" = (
/obj/structure/window/reinforced/plasma{
dir = 8
},
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible,
/obj/machinery/power/grounding_rod/anchored,
/turf/open/floor/circuit/green{
luminosity = 2
},
/area/engineering/supermatter)
"hIk" = (
/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
Expand Down Expand Up @@ -48254,12 +48265,12 @@
/turf/open/floor/iron,
/area/hallway/primary/fore)
"kVo" = (
/obj/machinery/power/rad_collector/anchored,
/obj/structure/window/reinforced/plasma{
dir = 4
},
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible,
/obj/machinery/power/tesla_coil/anchored,
/turf/open/floor/circuit/green{
luminosity = 2
},
Expand Down Expand Up @@ -65924,12 +65935,12 @@
/turf/open/floor/iron/showroomfloor,
/area/science/mixing)
"rzN" = (
/obj/machinery/power/rad_collector/anchored,
/obj/structure/window/reinforced/plasma{
dir = 8
},
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible,
/obj/machinery/power/tesla_coil/anchored,
/turf/open/floor/circuit/green{
luminosity = 2
},
Expand Down Expand Up @@ -79766,6 +79777,17 @@
},
/turf/open/floor/plating,
/area/cargo/warehouse)
"wRq" = (
/obj/structure/window/reinforced/plasma{
dir = 4
},
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible,
/obj/machinery/power/grounding_rod/anchored,
/turf/open/floor/circuit/green{
luminosity = 2
},
/area/engineering/supermatter)
"wRx" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet/masks,
Expand Down Expand Up @@ -118881,7 +118903,7 @@ eAV
gOw
eux
kVo
kVo
wRq
kVo
qkL
jts
Expand Down Expand Up @@ -119909,7 +119931,7 @@ qkL
qoR
opS
rzN
rzN
hHY
rzN
qkL
dlF
Expand Down

0 comments on commit cc3bf70

Please sign in to comment.