Skip to content

Commit

Permalink
TGS Test Merge (#7307)
Browse files Browse the repository at this point in the history
  • Loading branch information
cm13-github committed Oct 17, 2024
2 parents 054f7dc + a8f34a8 commit 9480e1d
Show file tree
Hide file tree
Showing 14 changed files with 3,557 additions and 2,897 deletions.
15 changes: 13 additions & 2 deletions code/game/area/BigRed.dm
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
name = "\improper Garage Workshop"
icon_state = "green"
ceiling = CEILING_METAL
is_resin_allowed = FALSE

/area/bigred/ground/ship
name = "\improper Crashed Vessel"
Expand Down Expand Up @@ -428,19 +429,21 @@
name = "\improper General Store"
icon_state = "blueold"
ceiling = CEILING_METAL

is_resin_allowed = FALSE

/area/bigredv2/outside/marshal_office
name = "\improper Marshal Offices"
icon_state = "brig"
ceiling = CEILING_METAL
minimap_color = MINIMAP_AREA_SEC
is_resin_allowed = FALSE

/area/bigredv2/outside/medical
name = "\improper Hospital"
icon_state = "CMO"
ceiling = CEILING_METAL
minimap_color = MINIMAP_AREA_MEDBAY
is_resin_allowed = FALSE

/area/bigredv2/outside/admin_building
name = "\improper Administration"
Expand Down Expand Up @@ -545,11 +548,15 @@
name = "\improper Engineering Communications Relay"
is_landing_zone = FALSE


/area/bigredv2/outside/engineering
name = "\improper Engineering Complex"
icon_state = "engine"
ceiling = CEILING_METAL
is_resin_allowed = FALSE

/area/bigredv2/outside/engineering/reactor
name = "\improper Main Reactor"
is_resin_allowed = TRUE

/area/bigredv2/outside/storage
name = "\improper Storage"
Expand Down Expand Up @@ -650,21 +657,25 @@
name = "\improper Northern Caves Entrance"
icon_state = "garden"
ceiling = CEILING_UNDERGROUND_ALLOW_CAS
is_resin_allowed = FALSE

/area/bigredv2/outside/lz1_telecomm_cas
name = "\improper Virology Caves Entrance"
icon_state = "garden"
ceiling = CEILING_UNDERGROUND_ALLOW_CAS
is_resin_allowed = FALSE

/area/bigredv2/outside/lz2_west_cas
name = "\improper Southwestern Caves Entrance"
icon_state = "garden"
ceiling = CEILING_UNDERGROUND_ALLOW_CAS
is_resin_allowed = FALSE

/area/bigredv2/outside/lz2_south_cas
name = "\improper ETA Lockdown Caves Entrance"
icon_state = "garden"
ceiling = CEILING_UNDERGROUND_ALLOW_CAS
is_resin_allowed = FALSE

/area/bigredv2/outside/filtration_cave_cas
name = "\improper Filtration Lockdown Caves Entrance"
Expand Down
7 changes: 7 additions & 0 deletions code/game/area/LV624.dm
Original file line number Diff line number Diff line change
Expand Up @@ -177,10 +177,12 @@
/area/lv624/ground/colony/north_tcomms_road
name = "\improper North T-Comms Road"
icon_state = "north"
is_resin_allowed = FALSE

/area/lv624/ground/colony/west_tcomms_road
name = "\improper West T-Comms Road"
icon_state = "west"
is_resin_allowed = FALSE

/area/lv624/ground/colony/telecomm
name = "\improper LZ1 Communications Relay"
Expand Down Expand Up @@ -295,6 +297,7 @@
/area/lv624/lazarus/corporate_dome
name = "\improper Corporate Dome"
icon_state = "green"
is_resin_allowed = FALSE

/area/lv624/lazarus/yggdrasil
name = "\improper Yggdrasil Tree"
Expand All @@ -315,6 +318,7 @@
name = "\improper Security"
icon_state = "security"
minimap_color = MINIMAP_AREA_SEC
is_resin_allowed = FALSE

/area/lv624/lazarus/captain
name = "\improper Commandant's Quarters"
Expand All @@ -325,6 +329,7 @@
name = "\improper Head of Personnel's Office"
icon_state = "head_quarters"
minimap_color = MINIMAP_AREA_COMMAND
is_resin_allowed = FALSE

/area/lv624/lazarus/kitchen
name = "\improper Kitchen"
Expand All @@ -348,11 +353,13 @@
/area/lv624/lazarus/chapel
name = "\improper Chapel"
icon_state = "chapel"
is_resin_allowed = FALSE
//ambience = list('sound/ambience/ambicha1.ogg','sound/ambience/ambicha2.ogg','sound/ambience/ambicha3.ogg','sound/ambience/ambicha4.ogg')

/area/lv624/lazarus/toilet
name = "\improper Dormitory Toilet"
icon_state = "toilet"
is_resin_allowed = FALSE

/area/lv624/lazarus/sleep_male
name = "\improper Male Dorm"
Expand Down
6 changes: 6 additions & 0 deletions code/game/area/kutjevo.dm
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@
/area/kutjevo/exterior/lz_river
name = "Kutjevo - Power Station River"
icon_state = "lz_river"
is_resin_allowed = FALSE

/area/kutjevo/exterior/spring
name = "Kutjevo - Southern Spring"
Expand All @@ -75,10 +76,12 @@
/area/kutjevo/exterior/scrubland
name = "Kutjevo - Scrubland"
icon_state = "scrubland"
is_resin_allowed = FALSE

/area/kutjevo/exterior/stonyfields
name = "Kutjevo - Stony Fields"
icon_state = "stone_fields"
is_resin_allowed = FALSE

/area/kutjevo/exterior/Northwest_Colony
name = "Kutjevo - Northwest Colony Grounds"
Expand All @@ -88,6 +91,7 @@
/area/kutjevo/exterior/runoff_dunes
name = "Kutjevo - Runoff Dunes"
icon_state = "rf_dunes"
is_resin_allowed = FALSE

/area/kutjevo/exterior/runoff_river
name = "Kutjevo - Runoff River"
Expand Down Expand Up @@ -227,11 +231,13 @@
ceiling = CEILING_METAL
icon_state = "power"
minimap_color = MINIMAP_AREA_ENGI
is_resin_allowed = FALSE

/area/kutjevo/interior/power/comms
name = "Kutjevo - Hydroelectric Dam Comms Relay"
ceiling = CEILING_METAL
icon_state = "power"
is_resin_allowed = FALSE

/area/kutjevo/interior/construction
name = "Kutjevo - Abandoned Construction Interior"
Expand Down
25 changes: 24 additions & 1 deletion code/game/area/prison_v3_fiorina.dm
Original file line number Diff line number Diff line change
Expand Up @@ -108,23 +108,42 @@
name = "Fiorina - Low Security Cells"
icon_state = "station1"

/area/fiorina/station/lowsec/showers_laundry
name = "Fiorina - Low Security Showers & Laundry"
is_resin_allowed = FALSE

/area/fiorina/station/lowsec/east
name = "Fiorina - Low Security Eastside"
is_resin_allowed = FALSE

/area/fiorina/station/power_ring
name = "Fiorina - Engineering Ring"
icon_state = "power0"
minimap_color = MINIMAP_AREA_ENGI
is_resin_allowed = FALSE

/area/fiorina/station/power_ring/reactor
name = "Fiorina - Engineering Reactor"
is_resin_allowed = TRUE

/area/fiorina/station/disco
name = "Fiorina - Disco Storage"
name = "Fiorina - West Disco Storage"
icon_state = "disco"

/area/fiorina/station/disco/east_disco
name = "Fiorina - East Disco Storage"
is_resin_allowed = FALSE

/area/fiorina/station/flight_deck
name = "Fiorina - Flight Deck"
icon_state = "police_line"
is_resin_allowed = FALSE

/area/fiorina/station/security
name = "Fiorina - Security Hub"
icon_state = "security_hub"
minimap_color = MINIMAP_AREA_SEC
is_resin_allowed = FALSE

/area/fiorina/station/security/wardens
name = "Fiorina - Warden's Office"
Expand Down Expand Up @@ -165,7 +184,11 @@
name = "Fiorina - Research Cellblock"
icon_state = "station0"
minimap_color = MINIMAP_AREA_RESEARCH
is_resin_allowed = FALSE

/area/fiorina/station/research_cells/basketball
name = "Fiorina - Basketball Court"
is_resin_allowed = TRUE

//telecomms areas
/area/fiorina/station/telecomm
Expand Down
13 changes: 13 additions & 0 deletions code/game/area/shiva.dm
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,12 @@
/area/shiva/exterior/telecomm/lz2_southeast
name = "Shiva's Snowball - South-East LZ2 Communications Relay"
minimap_color = MINIMAP_AREA_LZ
is_resin_allowed = TRUE

/area/shiva/exterior/telecomm/lz2_northeast
name = "Shiva's Snowball - North-East LZ2 Communications Relay"
minimap_color = MINIMAP_AREA_LZ
is_resin_allowed = TRUE


//telecomms areas - interior
Expand Down Expand Up @@ -124,6 +126,11 @@
name = "Shiva's Snowball - Storage Bunker Valley"
icon_state = "junkyard1"

/area/shiva/exterior/southwest_valley
name = "Shiva's Snowball - Southwest Valley"
icon_state = "sw"
is_resin_allowed = FALSE

/area/shiva/exterior/cp_colony_grounds
name = "Shiva's Snowball - Colony Grounds"
icon_state = "junkyard2"
Expand All @@ -147,6 +154,7 @@
/area/shiva/exterior/cp_lz2
name = "Shiva's Snowball - North Colony Grounds"
icon_state = "junkyard3"
is_resin_allowed = FALSE

/area/shiva/exterior/research_alley
name = "Shiva's Snowball - South Research Alley"
Expand Down Expand Up @@ -174,10 +182,12 @@
name = "Shiva's Snowball - South LZ2 Caves"
icon_state = "caves3"
minimap_color = MINIMAP_AREA_LZ
is_resin_allowed = FALSE

/area/shiva/interior/caves/cp_camp
name = "Shiva's Snowball - Cave Camp"
icon_state = "bar3"
is_resin_allowed = FALSE

/area/shiva/interior/caves/research_caves
name = "Shiva's Snowball - South Research Hab Caves"
Expand Down Expand Up @@ -227,6 +237,7 @@
/area/shiva/interior/aerodrome
name = "Shiva's Snowball - Aerodrome"
icon_state = "hangars0"
is_resin_allowed = FALSE

/area/shiva/interior/bar
name = "Shiva's Snowball - Anti-Freeze Bar"
Expand All @@ -239,6 +250,7 @@
/area/shiva/interior/warehouse
name = "Shiva's Snowball - Blue Warehouse"
icon_state = "hangars1"
is_resin_allowed = FALSE

/area/shiva/interior/warehouse/caves
name = "Shiva's Snowball - Blue Warehouse Ice Cave"
Expand All @@ -264,6 +276,7 @@
name = "Shiva's Snowball - Argentinian Research Headquarters"
icon_state = "bar1"
is_landing_zone = TRUE
is_resin_allowed = FALSE

/area/shiva/interior/aux_power
name = "Shiva's Snowball - Auxiliary Generator Station"
Expand Down
13 changes: 13 additions & 0 deletions code/game/area/strata.dm
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ EXTERIOR is FUCKING FREEZING, and refers to areas out in the open and or exposed

/area/strata/ag/exterior/caves/lz_caves
name = "External Mining Aerodrome Caves"
is_resin_allowed = FALSE

/area/strata/ag/exterior/jungle/carplake_center
name = "Deep Jungle - Carp Lake Center Island"
Expand All @@ -144,6 +145,7 @@ EXTERIOR is FUCKING FREEZING, and refers to areas out in the open and or exposed
/area/strata/ag/exterior/marsh
name = "Do not use."
icon_state = "marsh"
is_resin_allowed = FALSE

/area/strata/ag/exterior/marsh/spring_marshes
name = "Cryo-Thermal Springs Marshes"
Expand Down Expand Up @@ -195,6 +197,7 @@ EXTERIOR is FUCKING FREEZING, and refers to areas out in the open and or exposed
name = "Outpost Decks"
icon_state = "rdecks"
minimap_color = MINIMAP_AREA_CAVES
is_resin_allowed = FALSE

//-Paths

Expand All @@ -204,9 +207,11 @@ EXTERIOR is FUCKING FREEZING, and refers to areas out in the open and or exposed

/area/strata/ag/exterior/paths/flight_control_exterior
name = "Flight Control Exterior"
is_resin_allowed = FALSE

/area/strata/ag/exterior/paths/mining_outpost_exterior
name = "Mining Outpost Exterior"
is_resin_allowed = FALSE

/area/strata/ag/exterior/paths/north_outpost
name = "Outpost - North Access Channel"
Expand All @@ -219,6 +224,7 @@ EXTERIOR is FUCKING FREEZING, and refers to areas out in the open and or exposed
/area/strata/ag/exterior/paths/south_outpost
name = "South Of The Outpost"
ceiling = CEILING_NONE
is_resin_allowed = FALSE

////////////////////////////////////////
// ------===| Interior |===------ //
Expand Down Expand Up @@ -304,6 +310,7 @@ EXTERIOR is FUCKING FREEZING, and refers to areas out in the open and or exposed
/area/strata/ag/interior/mining_outpost
name = "Do not use."
minimap_color = MINIMAP_AREA_MINING
is_resin_allowed = FALSE

/area/strata/ag/interior/mining_outpost/central
name = "Mining Outpost Central Hallway"
Expand Down Expand Up @@ -347,6 +354,7 @@ EXTERIOR is FUCKING FREEZING, and refers to areas out in the open and or exposed
icon_state = "offices"
minimap_color = MINIMAP_AREA_COMMAND
ceiling = CEILING_UNDERGROUND_METAL_ALLOW_CAS
is_resin_allowed = FALSE

/area/strata/ag/interior/outside/wooden_hospital
name = "Wooden Hospital - Hospital Proper"
Expand Down Expand Up @@ -379,10 +387,12 @@ EXTERIOR is FUCKING FREEZING, and refers to areas out in the open and or exposed
/area/strata/ag/interior/outside/checkpoints/south
name = "Landing Zone South Security Checkpoint"
is_landing_zone = TRUE
is_resin_allowed = FALSE

/area/strata/ag/interior/outside/checkpoints/outpost
name = "Outpost Deck Security Checkpoint"
icon_state = "rdecks_sec"
is_resin_allowed = FALSE

/area/strata/ag/interior/outside/engineering
name = "Do not use."
Expand All @@ -393,16 +403,19 @@ EXTERIOR is FUCKING FREEZING, and refers to areas out in the open and or exposed
name = "Engineering Parts Storage"
icon_state = "outpost_engi_1"
ceiling = CEILING_UNDERGROUND_METAL_ALLOW_CAS
is_resin_allowed = FALSE

/area/strata/ag/interior/outside/engineering/parts_storage_exterior
name = "Engineering Parts Storage Exterior"
weather_enabled = TRUE
is_resin_allowed = FALSE

/area/strata/ag/interior/outside/engineering/parts_storage_cave
name = "Engineering Parts Storage Exterior"
icon_state = "outpost_engi_4"
minimap_color = MINIMAP_AREA_ENGI_CAVE
ceiling = CEILING_UNDERGROUND_BLOCK_CAS
is_resin_allowed = FALSE

/area/strata/ag/interior/outside/bball //come on and SLAM.
name = "Outpost Basket Ball Court"
Expand Down
Loading

0 comments on commit 9480e1d

Please sign in to comment.