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

Varadero, Strata, Kutjevo, Shiva energy fix #6972

Merged
merged 2 commits into from
Aug 23, 2024
Merged
Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions code/game/area/kutjevo.dm
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
//ambience = list('figuresomethingout.ogg')
icon_state = "kutjevo"
can_build_special = TRUE //T-Comms structure
powernet_name = "ground"
temperature = 308.7 //kelvin, 35c, 95f
minimap_color = MINIMAP_AREA_ENGI

Expand Down
1 change: 1 addition & 0 deletions code/game/area/shiva.dm
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
//ambience = list('figuresomethingout.ogg')
icon_state = "shiva"
can_build_special = TRUE //T-Comms structure
powernet_name = "ground"
temperature = ICE_COLONY_TEMPERATURE
minimap_color = MINIMAP_AREA_COLONY

Expand Down
1 change: 1 addition & 0 deletions code/game/area/strata.dm
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ EXTERIOR is FUCKING FREEZING, and refers to areas out in the open and or exposed
//ambience = list('figuresomethingout.ogg')
icon_state = "strata"
can_build_special = TRUE //T-Comms structure
powernet_name = "ground"
temperature = SOROKYNE_TEMPERATURE //If not in a building, it'll be cold. All interior areas are set to T20C
minimap_color = MINIMAP_AREA_COLONY

Expand Down
1 change: 1 addition & 0 deletions code/game/area/varadero.dm
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
ambience_exterior = AMBIENCE_NV
icon_state = "varadero"
can_build_special = TRUE //T-Comms structure
powernet_name = "ground"
temperature = TROPICAL_TEMP
minimap_color = MINIMAP_AREA_COLONY

Expand Down
19 changes: 15 additions & 4 deletions maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -12692,11 +12692,11 @@
/turf/open/auto_turf/snow/layer0,
/area/shiva/interior/warehouse/caves)
"jWL" = (
/obj/structure/machinery/space_heater,
/obj/structure/machinery/light/double{
dir = 1;
pixel_y = 9
},
/obj/structure/machinery/power/smes/buildable,
/turf/open/floor/shiva/yellowfull/west,
/area/shiva/interior/aux_power)
"jXD" = (
Expand Down Expand Up @@ -15502,6 +15502,10 @@
},
/turf/open/auto_turf/ice/layer1,
/area/shiva/interior/caves/research_caves)
"niD" = (
/obj/structure/machinery/space_heater,
/turf/open/floor/shiva/floor3,
/area/shiva/interior/aux_power)
"niL" = (
/obj/structure/platform/strata{
dir = 8
Expand Down Expand Up @@ -19150,6 +19154,9 @@
dir = 1;
pixel_y = 9
},
/obj/structure/machinery/power/smes/buildable{
pixel_x = 1
},
/turf/open/floor/shiva/yellowfull/west,
/area/shiva/interior/aux_power)
"rUW" = (
Expand Down Expand Up @@ -23648,6 +23655,10 @@
/obj/item/tool/warning_cone,
/turf/open/floor/shiva,
/area/shiva/interior/colony/research_hab)
"xEU" = (
/obj/structure/machinery/power/smes/buildable,
/turf/open/floor/shiva/yellowfull/west,
/area/shiva/interior/garage)
"xFp" = (
/obj/structure/bed/chair/comfy/orange{
dir = 4
Expand Down Expand Up @@ -33924,7 +33935,7 @@ puZ
puZ
anc
anc
ctz
niD
cJu
cJu
nTC
Expand Down Expand Up @@ -50679,11 +50690,11 @@ ktd
ktd
ktd
ktd
ktd
xEU
tXd
ado
pSD
ktd
xEU
ktd
ktd
ktd
Expand Down
Loading