Skip to content

Commit

Permalink
Varadero, Strata, Kutjevo, Shiva energy fix (#6972)
Browse files Browse the repository at this point in the history
# About the pull request

Areas on this maps pull energy from default, and has energy when
generators off
SMES added on Shiva generators points.

# Explain why it's good for the game

Fixes always good


# Testing Photographs and Procedure

<details>
<summary>Screenshots & Videos</summary>

Tested.

</details>


# Changelog

:cl:
fix: Varadero, Strata, Kutjevo, Shiva maps now don't have infinity
energy
add: Added SMES on Shiva generators points
/:cl:
  • Loading branch information
Noname995 authored Aug 23, 2024
1 parent b3444f7 commit 84f1644
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 4 deletions.
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

0 comments on commit 84f1644

Please sign in to comment.