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

Thermo-Bluespace Generator (groundside gens rework) #16889

Merged
merged 28 commits into from
Feb 28, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
c956ac5
Adds the TBG generator
breadhunt Jan 9, 2025
a6613de
Generator now has its own subtype for lights; Improves explosion timing
breadhunt Jan 9, 2025
63b91cd
Fixes the winding down animation
breadhunt Jan 9, 2025
6c56012
Slightly smoother starting of the loop
breadhunt Jan 9, 2025
c26e429
Fixes broken circ sprite being slightly different from its fixed variant
breadhunt Jan 9, 2025
645b3dd
Fixed winding-down feedback; added more technobabble feedback
breadhunt Jan 9, 2025
9158cf8
Typo
breadhunt Jan 9, 2025
bb76788
Adds bluespace gen to all groundside maps
breadhunt Jan 10, 2025
51112a1
Map fixes + I forgot Magmoor
breadhunt Jan 10, 2025
705cc2e
Copies vendor TTS effect
breadhunt Jan 10, 2025
8f679a0
Prison fixes
breadhunt Jan 10, 2025
0a0c446
Merge branch 'master' into generator
breadhunt Jan 24, 2025
29101e8
Removes harddel
breadhunt Jan 24, 2025
25f5add
Removes unused sparks variable
breadhunt Jan 24, 2025
647d62e
Review compliance
breadhunt Feb 8, 2025
0eb109c
Merge branch 'master' into generator
breadhunt Feb 11, 2025
cb416ac
Moves Icy Caves generator away from disks (more to come)
breadhunt Feb 12, 2025
2d54e13
Several fixes; Adds minimap icon; No more hunter stealth; time_to_bre…
breadhunt Feb 14, 2025
f4e54b0
possible fix for mapping?
breadhunt Feb 15, 2025
ab8468c
Moves gens away from disk on Ice Colony
breadhunt Feb 17, 2025
4816250
Moves Prison gens away from disks, remaps gen approach
breadhunt Feb 18, 2025
0ccb4f5
Removes disk spawn near gens
breadhunt Feb 18, 2025
767f3d1
No more rooms floating in the ocean
breadhunt Feb 20, 2025
57ebbab
Merge branch 'master' into generator
breadhunt Feb 20, 2025
98a3b7f
Fixed failing linters
breadhunt Feb 21, 2025
7029670
fixes linters pt2
breadhunt Feb 21, 2025
468a9b0
Fixes duplicate APC
breadhunt Feb 23, 2025
05a94ac
Merge branch 'master' into generator
breadhunt Feb 25, 2025
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
434 changes: 256 additions & 178 deletions _maps/map_files/BigRed_v2/BigRed_v2.dmm

Large diffs are not rendered by default.

418 changes: 292 additions & 126 deletions _maps/map_files/Bluesummers/bluesummers.dmm

Large diffs are not rendered by default.

444 changes: 229 additions & 215 deletions _maps/map_files/DaedalusPrison/DaedalusPrison.dmm

Large diffs are not rendered by default.

1,398 changes: 843 additions & 555 deletions _maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm

Large diffs are not rendered by default.

879 changes: 454 additions & 425 deletions _maps/map_files/LV624/LV624.dmm

Large diffs are not rendered by default.

469 changes: 280 additions & 189 deletions _maps/map_files/LV759/LV759.dmm

Large diffs are not rendered by default.

177 changes: 100 additions & 77 deletions _maps/map_files/Lawanka_Outpost/LawankaOutpost.dmm

Large diffs are not rendered by default.

111 changes: 71 additions & 40 deletions _maps/map_files/Magmoor_Digsite_IV/Magmoor_Digsite_IV.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2711,13 +2711,10 @@
},
/area/magmoor/command/conference)
"bOr" = (
/obj/machinery/power/monitor{
name = "Core Power Monitoring"
},
/obj/machinery/light{
dir = 1
/obj/machinery/power/tbg_turbine/heat{
dir = 4
},
/turf/open/floor/mainship/tcomms,
/turf/open/floor/plating/plating_catwalk,
/area/magmoor/engi/thermal)
"bOC" = (
/turf/open/floor/plating/ground/mars/dirttosand{
Expand Down Expand Up @@ -3295,6 +3292,13 @@
/obj/effect/landmark/weed_node,
/turf/open/floor/mainship/mono,
/area/magmoor/engi)
"ckg" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/obj/machinery/floor_warn_light/toggleable/generator,
/turf/open/floor/plating/plating_catwalk,
/area/magmoor/engi/power)
"cki" = (
/obj/structure/largecrate/random/case/small,
/turf/open/floor/mainship/floor,
Expand Down Expand Up @@ -8881,6 +8885,10 @@
dir = 6
},
/area/magmoor/compound)
"gao" = (
/obj/machinery/floor_warn_light/toggleable/generator,
/turf/closed/wall,
/area/magmoor/engi/thermal)
"gaE" = (
/obj/structure/table/wood,
/turf/open/floor/wood,
Expand Down Expand Up @@ -9541,6 +9549,9 @@
"gxS" = (
/obj/structure/cable,
/obj/effect/landmark/weed_node,
/obj/machinery/power/monitor{
name = "Main Power Grid Monitoring"
},
/turf/open/floor/plating/plating_catwalk,
/area/magmoor/engi/thermal)
"gxU" = (
Expand Down Expand Up @@ -11025,6 +11036,13 @@
dir = 10
},
/area/magmoor/engi/power)
"hKa" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{
dir = 4
},
/obj/machinery/floor_warn_light/toggleable/generator,
/turf/open/floor/plating/plating_catwalk,
/area/magmoor/engi/power)
"hKg" = (
/obj/effect/turf_decal/tile/blue{
dir = 1
Expand Down Expand Up @@ -13666,6 +13684,10 @@
},
/turf/open/floor/tile/white,
/area/magmoor/civilian/pool)
"jCa" = (
/obj/machinery/floor_warn_light/toggleable/generator,
/turf/closed/wall/r_wall,
/area/magmoor/engi/thermal)
"jCp" = (
/turf/open/floor/plating/ground/concrete/lines{
dir = 1
Expand Down Expand Up @@ -18779,10 +18801,6 @@
/obj/effect/landmark/weed_node,
/turf/open/floor/mainship/sterile/side,
/area/magmoor/medical/lobby)
"njq" = (
/obj/machinery/light,
/turf/open/floor/mainship/orange,
/area/magmoor/engi/thermal)
"njG" = (
/obj/structure/window_frame/colony,
/obj/item/shard,
Expand Down Expand Up @@ -20773,6 +20791,9 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/cable,
/obj/machinery/power/geothermal/tbg{
dir = 4
},
/turf/open/floor/plating/plating_catwalk,
/area/magmoor/engi/thermal)
"oJc" = (
Expand Down Expand Up @@ -23673,6 +23694,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 9
},
/obj/machinery/light,
/turf/open/floor/mainship/orange/corner,
/area/magmoor/engi/thermal)
"qHK" = (
Expand Down Expand Up @@ -26630,6 +26652,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{
dir = 5
},
/obj/machinery/light,
/turf/open/floor/mainship/orange/corner{
dir = 8
},
Expand Down Expand Up @@ -26758,6 +26781,10 @@
"sVr" = (
/turf/open/liquid/lava/autosmoothing,
/area/magmoor/compound/northeast)
"sVs" = (
/obj/machinery/floor_warn_light/toggleable/generator,
/turf/open/floor/plating/plating_catwalk,
/area/magmoor/engi/thermal)
"sWk" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber{
dir = 4
Expand Down Expand Up @@ -30414,6 +30441,13 @@
},
/turf/closed/mineral/smooth/lavawall/indestructible,
/area/magmoor/cave/rock)
"vAF" = (
/obj/structure/cable,
/obj/machinery/light{
dir = 1
},
/turf/open/floor/plating/plating_catwalk,
/area/magmoor/engi/thermal)
"vAK" = (
/obj/effect/turf_decal/warning_stripes/thin{
dir = 5
Expand Down Expand Up @@ -34566,13 +34600,10 @@
/turf/open/liquid/lava/autosmoothing,
/area/magmoor/compound/south)
"ylq" = (
/obj/machinery/power/monitor{
name = "Main Power Grid Monitoring"
},
/obj/machinery/light{
dir = 1
/obj/machinery/power/tbg_turbine/cold{
dir = 8
},
/turf/open/floor/mainship/tcomms,
/turf/open/floor/plating/plating_catwalk,
/area/magmoor/engi/thermal)
"ylX" = (
/obj/effect/spawner/random/misc/plant,
Expand Down Expand Up @@ -53531,9 +53562,9 @@ mNI
mNI
hUg
wwg
wwg
jCa
pJV
wwg
jCa
pJV
wwg
gKh
Expand Down Expand Up @@ -54459,7 +54490,7 @@ jYO
jxX
jxX
jxX
wwg
jCa
wwg
xdD
qAe
Expand Down Expand Up @@ -54700,7 +54731,7 @@ yco
ruR
pWV
sQM
xdD
gao
nQM
wwg
hUg
Expand Down Expand Up @@ -54921,16 +54952,16 @@ xmI
fcs
ajM
fwF
jYO
ckg
cVC
qzH
ivX
wwg
yco
vAF
oiI
xdD
xdD
sVs
guR
sVs
pyN
poK
tvB
Expand Down Expand Up @@ -55158,10 +55189,10 @@ jYO
aWS
ldU
fwA
wwg
jCa
yco
njq
xdD
oiI
guR
ylq
guR
fkU
Expand All @@ -55170,7 +55201,7 @@ oZS
oZS
dLW
tQo
wwg
jCa
amF
mJw
mJw
Expand Down Expand Up @@ -55624,10 +55655,10 @@ uRD
lNt
hmK
lMq
wwg
jCa
yco
njq
xdD
oiI
guR
bOr
guR
pyN
Expand All @@ -55636,7 +55667,7 @@ sue
pCV
kTN
ojh
wwg
jCa
lRV
lRV
lRV
Expand Down Expand Up @@ -55853,16 +55884,16 @@ xmI
jDH
eVT
oPF
uRD
hKa
cVC
qzH
ivX
wwg
yco
vAF
oiI
xdD
xdD
sVs
guR
sVs
pyN
yhm
mCt
Expand Down Expand Up @@ -56098,7 +56129,7 @@ yco
knJ
neU
qHm
xdD
gao
iDQ
wwg
hUg
Expand Down Expand Up @@ -56323,7 +56354,7 @@ uRD
nWI
nWI
nWI
wwg
jCa
wwg
xdD
qAe
Expand Down Expand Up @@ -57259,9 +57290,9 @@ fbE
mNI
hUg
wwg
wwg
jCa
pJV
wwg
jCa
pJV
wwg
gKh
Expand Down
Loading
Loading