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.

Sign up for GitHub

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

Thermo-Bluespace Generator (groundside gens rework) #16889

Show file tree
Hide file tree
Changes from 22 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
398 changes: 238 additions & 160 deletions _maps/map_files/BigRed_v2/BigRed_v2.dmm
View file
Open in desktop

Large diffs are not rendered by default.

418 changes: 292 additions & 126 deletions _maps/map_files/Bluesummers/bluesummers.dmm
View file
Open in desktop

Large diffs are not rendered by default.

156 changes: 85 additions & 71 deletions _maps/map_files/DaedalusPrison/DaedalusPrison.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2656,11 +2656,6 @@
/obj/structure/table/mainship,
/turf/open/floor/prison,
/area/daedalusprison/inside/centralhalls)
"ckM" = (
/obj/effect/landmark/weed_node,
/obj/effect/ai_node,
/turf/open/floor/podhatch/floor,
/area/daedalusprison/inside/engineering)
"ckP" = (
/turf/open/floor/prison/red{
dir = 8
Expand Down Expand Up @@ -7084,6 +7079,11 @@
},
/turf/open/floor/prison/sterilewhite,
/area/daedalusprison/inside/medical)
"fPv" = (
/obj/structure/cable,
/obj/machinery/power/geothermal/tbg,
/turf/open/floor/podhatch/floor,
/area/daedalusprison/inside/engineering)
"fPL" = (
/obj/structure/prop/mainship/gelida/smallwire,
/obj/structure/prop/mainship/gelida/smallwire{
Expand Down Expand Up @@ -8276,6 +8276,10 @@
/obj/effect/ai_node,
/turf/open/floor/plating/plating_catwalk/prison,
/area/daedalusprison/inside/cafeteria)
"gTr" = (
/obj/machinery/floor_warn_light/toggleable/generator,
/turf/open/floor/podhatch/floor,
/area/daedalusprison/inside/engineering)
"gTx" = (
/obj/effect/turf_decal/tracks/wheels/bloody,
/obj/machinery/atmospherics/components/unary/vent_scrubber,
Expand Down Expand Up @@ -9521,10 +9525,6 @@
/obj/structure/window/framed/prison/reinforced,
/turf/open/floor/prison,
/area/daedalusprison/inside/security/easternbooth)
"ibh" = (
/obj/effect/decal/cleanable/blood,
/turf/open/floor/podhatch/floor,
/area/daedalusprison/inside/engineering)
"ibj" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/spawner/random/misc/trash,
Expand Down Expand Up @@ -11371,6 +11371,11 @@
},
/turf/open/floor/prison/darkred,
/area/daedalusprison/inside/centralhalls)
"jwv" = (
/obj/structure/cable,
/obj/machinery/power/tbg_turbine/cold,
/turf/open/floor/podhatch/floor,
/area/daedalusprison/inside/engineering)
"jwU" = (
/obj/effect/decal/cleanable/blood/gibs,
/turf/open/floor/prison,
Expand Down Expand Up @@ -11714,10 +11719,6 @@
/obj/effect/landmark/weed_node,
/turf/open/floor/tile/dark2,
/area/daedalusprison/inside/engineering)
"jIL" = (
/obj/effect/ai_node,
/turf/open/floor/podhatch/floor,
/area/daedalusprison/inside/engineering)
"jJc" = (
/obj/machinery/hydroponics,
/obj/effect/landmark/weed_node,
Expand Down Expand Up @@ -12992,6 +12993,10 @@
dir = 1
},
/area/daedalusprison/inside/medical/chemistry)
"kLQ" = (
/obj/machinery/floor_warn_light/toggleable/generator,
/turf/closed/wall/r_wall,
/area/daedalusprison/inside/engineering)
"kLT" = (
/obj/machinery/atmospherics/pipe/simple/green/hidden,
/obj/structure/cable,
Expand Down Expand Up @@ -14050,6 +14055,12 @@
/obj/structure/fence/broken,
/turf/open/floor/plating/ground/snow/layer2,
/area/daedalusprison/outside/south)
"lzT" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/landmark/weed_node,
/obj/machinery/floor_warn_light/toggleable/generator,
/turf/open/floor/tile/dark/yellow2/corner,
/area/daedalusprison/inside/engineering)
"lAz" = (
/turf/open/floor/prison,
/area/daedalusprison/inside/habitationsouth)
Expand Down Expand Up @@ -21968,7 +21979,9 @@
/area/daedalusprison/inside/mechanicshop)
"rSQ" = (
/obj/structure/cable,
/obj/structure/prop/mainship/brokengen,
/obj/machinery/power/tbg_turbine/heat{
dir = 1
},
/turf/open/floor/podhatch/floor,
/area/daedalusprison/inside/engineering)
"rSU" = (
Expand Down Expand Up @@ -24334,6 +24347,7 @@
/area/daedalusprison/inside/centralhalls)
"tMe" = (
/obj/effect/landmark/weed_node,
/obj/machinery/floor_warn_light/toggleable/generator,
/turf/open/floor/podhatch/floor,
/area/daedalusprison/inside/engineering)
"tMn" = (
Expand Down Expand Up @@ -37755,9 +37769,9 @@ prV
prV
pvv
prV
kLQ
prV
prV
prV
kLQ
prV
prV
prV
Expand Down Expand Up @@ -37963,14 +37977,14 @@ iXr
jIk
cvj
oqs
prV
kLQ
tNX
quw
eGQ
eGQ
tMe
eGQ
eGQ
quw
quw
qai
quw
quw
jIk
aTh
prV
Expand Down Expand Up @@ -38178,11 +38192,11 @@ eQn
unB
quw
quw
eGQ
rSQ
rSQ
rSQ
eGQ
quw
quw
quw
quw
quw
quw
oLJ
prV
Expand Down Expand Up @@ -38390,14 +38404,14 @@ jIk
unB
qai
fNy
jIL
jit
eGQ
eGQ
eGQ
iFn
quw
quw
quw
quw
xea
fNy
prV
kLQ
liI
liI
liI
Expand Down Expand Up @@ -38602,11 +38616,11 @@ wUC
unB
fNy
quw
eGQ
rSQ
rSQ
rSQ
eGQ
quw
quw
quw
quw
quw
quw
quw
prV
Expand Down Expand Up @@ -38815,10 +38829,10 @@ unB
quw
quw
tMe
jit
eGQ
eGQ
eGQ
gTr
iFn
qai
bEv
Expand Down Expand Up @@ -39023,12 +39037,12 @@ iql
oVv
fNy
bJM
prV
kLQ
isW
lRR
jit
rSQ
rSQ
jwv
fPv
rSQ
eGQ
fNy
Expand Down Expand Up @@ -39227,19 +39241,19 @@ prV
prV
prV
prV
kLQ
prV
prV
prV
prV
kLQ
unB
xpm
xxK
unB
prV
isW
lRR
gTr
eGQ
jit
eGQ
eGQ
tMe
Expand Down Expand Up @@ -39450,11 +39464,11 @@ sQU
prV
isW
lRR
eGQ
rSQ
rSQ
rSQ
eGQ
quw
quw
quw
quw
quw
quw
fNy
prV
Expand Down Expand Up @@ -39662,14 +39676,14 @@ tMF
dir
mTG
mTG
ckM
jit
eGQ
eGQ
eGQ
xea
quw
quw
quw
quw
rtG
ivm
prV
kLQ
sLx
sLx
sLx
Expand Down Expand Up @@ -39874,11 +39888,11 @@ xUa
quw
gQM
fNy
eGQ
rSQ
rSQ
rSQ
eGQ
quw
quw
quw
quw
quw
qai
ivm
prV
Expand Down Expand Up @@ -40086,11 +40100,11 @@ xUa
prV
tNX
rSL
ibh
eGQ
tMe
eGQ
eGQ
oqs
quw
qai
quw
quw
quw
gsw
prV
Expand Down Expand Up @@ -40290,18 +40304,18 @@ unS
tAH
vFr
sQU
hcH
lzT
uON
abR
xUa
hcH
kLQ
prV
prV
prV
kLQ
prV
prV
prV
prV
kLQ
prV
prV
prV
Expand Down Expand Up @@ -40931,7 +40945,7 @@ hEL
pcf
png
haV
prV
kLQ
sLx
sLx
sLx
Expand Down
Loading
Loading