Skip to content

Commit

Permalink
Fat batch of changes.
Browse files Browse the repository at this point in the history
- Made "outpost" structures allow LAZ (CAS laser marking).
- Carp lake now have "hole" in celling, now there is low temperature and weather.
- Made MOST areas weedable, except LZ's and surrounding of LZ's.
- Changed way for monkeys to spawn, now they prefer grass as their spawning place (with some exceptions).
- Added more grass bushes to lush caves.
- Some structures outside have thicker celling, allowing only green flares for CAS. (to give xenos some place to hide and take break)
- Mini medical got shutters and windows removed, replaced them with walls so runners cannot just run in and out without consequences.
  • Loading branch information
Venuska1117 committed Jul 25, 2024
1 parent 65dd060 commit be27f58
Show file tree
Hide file tree
Showing 5 changed files with 880 additions and 727 deletions.
1 change: 1 addition & 0 deletions code/__DEFINES/__game.dm
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,7 @@
/// Blocks mortar placement, lasing, and medevac
#define CEILING_PROTECTION_TIER_1 1
#define CEILING_METAL 1.1
#define CEILING_REINFORCED_GLASS_ALLOW_LAS 1.2

/// Blocks CAS signals, supply drops, fultoning, and mortar fire
#define CEILING_PROTECTION_TIER_2 2
Expand Down
39 changes: 17 additions & 22 deletions code/game/area/strata.dm
Original file line number Diff line number Diff line change
Expand Up @@ -40,26 +40,28 @@ EXTERIOR is FUCKING FREEZING, and refers to areas out in the open and or exposed
/area/strata/ag
name = "Above Ground Area"
icon_state = "ag"
is_resin_allowed = TRUE

/area/strata/ag/exterior
name = "Exterior Above Ground Area"
icon_state = "ag_e"
ceiling = CEILING_NONE
//always_unpowered = 1 So exterior lights work, this will be commented out unless it causes unforseen issues.
is_resin_allowed = FALSE

/area/strata/ag/interior
name = "Interior Above Ground Area"
icon_state = "ag_i"
requires_power = 1
temperature = T20C //Nice and room temp
ceiling = CEILING_METAL
ceiling = CEILING_REINFORCED_GLASS_ALLOW_LAS


//-Under Ground (ug)

/area/strata/ug
name = "Under Ground Area"
icon_state = "ug"
is_resin_allowed = TRUE
ceiling = CEILING_UNDERGROUND_ALLOW_CAS

/area/strata/ug/interior
Expand All @@ -74,6 +76,7 @@ EXTERIOR is FUCKING FREEZING, and refers to areas out in the open and or exposed
requires_power = 1
temperature = T20C
ceiling = CEILING_NONE
weather_enabled = TRUE


////////////////////////////////////////
Expand Down Expand Up @@ -103,8 +106,8 @@ EXTERIOR is FUCKING FREEZING, and refers to areas out in the open and or exposed
name = "Do not use."
icon_state = "landingzone_1"
minimap_color = MINIMAP_AREA_LZ
weather_enabled = FALSE
is_resin_allowed = FALSE
weather_enabled = FALSE

/area/strata/ag/interior/landing_zones/lz1
name = "Landing Zone 1 Pad - Mining Aerodrome"
Expand All @@ -123,11 +126,15 @@ EXTERIOR is FUCKING FREEZING, and refers to areas out in the open and or exposed

/area/strata/ag/exterior/caves/shed_five_caves
name = "Terminal Five Topside Caves"
is_resin_allowed = TRUE

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

/area/strata/ag/exterior/jungle/carplake_center
name = "Deep Jungle - Carp Lake Center Island"
icon_state = "ug_jung_1"
weather_enabled = TRUE

//-Marsh

/area/strata/ag/exterior/marsh
Expand Down Expand Up @@ -181,7 +188,6 @@ EXTERIOR is FUCKING FREEZING, and refers to areas out in the open and or exposed
/area/strata/ag/exterior/outpost_decks
name = "Outpost Decks"
icon_state = "rdecks"
is_resin_allowed = TRUE
minimap_color = MINIMAP_AREA_RESEARCH


Expand All @@ -190,14 +196,12 @@ EXTERIOR is FUCKING FREEZING, and refers to areas out in the open and or exposed
/area/strata/ag/exterior/paths
name = "Ice Path"
icon_state = "path"
is_resin_allowed = TRUE

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

/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 @@ -211,18 +215,6 @@ EXTERIOR is FUCKING FREEZING, and refers to areas out in the open and or exposed
minimap_color = MINIMAP_AREA_RESEARCH
name = "South Of The Outpost"

//-Underground "open" Lake

/area/strata/ug/exterior/jungle
name = "Do not use."
icon_state = "ug_jung_0"

/area/strata/ug/exterior/jungle/carplake_center
name = "Deep Jungle - Carp Lake Center Island"
icon_state = "ug_jung_1"



////////////////////////////////////////
// ------===| Interior |===------ //
////////////////////////////////////////
Expand Down Expand Up @@ -293,7 +285,6 @@ 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."
is_resin_allowed = FALSE

/area/strata/ag/interior/mining_outpost/central
name = "Mining Outpost Central Hallway"
Expand All @@ -306,12 +297,10 @@ EXTERIOR is FUCKING FREEZING, and refers to areas out in the open and or exposed
/area/strata/ag/interior/mining_outpost/maintenance
name = "Mining Outpost Dormitory Maintenance"
icon_state = "outpost_maint"
is_resin_allowed = TRUE

/area/strata/ag/interior/mining_outpost/hive
name = "Mining Outpost Dormitory Thermal Storage"
icon_state = "dorms_beno"
is_resin_allowed = TRUE

/area/strata/ag/interior/mining_outpost/canteen
name = "Mining Outpost Dormitory Canteen"
Expand All @@ -333,6 +322,7 @@ EXTERIOR is FUCKING FREEZING, and refers to areas out in the open and or exposed
name = "Flight Control Offices"
icon_state = "offices"
minimap_color = MINIMAP_AREA_COMMAND
ceiling = CEILING_UNDERGROUND_METAL_ALLOW_CAS

/area/strata/ag/interior/outside/wooden_hospital
name = "Wooden Hospital - Hospital Proper"
Expand All @@ -349,6 +339,7 @@ EXTERIOR is FUCKING FREEZING, and refers to areas out in the open and or exposed
/area/strata/ag/interior/outside/checkpoints
name= "Do not use."
icon_state = "security_station"
ceiling = CEILING_UNDERGROUND_METAL_ALLOW_CAS
minimap_color = MINIMAP_AREA_SEC

/area/strata/ag/interior/outside/checkpoints/north_armor
Expand Down Expand Up @@ -377,14 +368,18 @@ EXTERIOR is FUCKING FREEZING, and refers to areas out in the open and or exposed

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

/area/strata/ag/interior/outside/bball //come on and SLAM.
name = "Outpost Basket Ball Court"
icon_state = "outpost_gen_4"
ceiling = CEILING_UNDERGROUND_METAL_ALLOW_CAS

/area/strata/ag/interior/outside/bball/cave //come on BURST AND DIE.
name = "Outpost - B-Ball Caves"
icon_state = "hive_1"
ceiling = CEILING_UNDERGROUND_BLOCK_CAS


//-Underground Dorms
Expand Down
2 changes: 2 additions & 0 deletions code/game/objects/items/devices/binoculars.dm
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,8 @@
is_outside = TRUE
if(CEILING_GLASS)
is_outside = TRUE
if(CEILING_REINFORCED_GLASS_ALLOW_LAS)
is_outside = TRUE

if (protected_by_pylon(TURF_PROTECTION_CAS, TU))
is_outside = FALSE
Expand Down
4 changes: 3 additions & 1 deletion code/game/turfs/turf.dm
Original file line number Diff line number Diff line change
Expand Up @@ -523,7 +523,7 @@
turfs += F

switch(A.ceiling)
if(CEILING_GLASS)
if(CEILING_GLASS, CEILING_REINFORCED_GLASS_ALLOW_LAS)
playsound(src, "sound/effects/Glassbr1.ogg", 60, 1)
spawn(8)
if(amount >1)
Expand Down Expand Up @@ -571,6 +571,8 @@
return "The ceiling above is glass. That's not going to stop anything."
if(CEILING_METAL)
return "The ceiling above is metal. You can't see through it with a camera from above, but that's not going to stop anything."
if(CEILING_REINFORCED_GLASS_ALLOW_LAS)
return "The ceiling above is reinforced glass. You can see sky above, doesn't look like it's going to stop much."
if(CEILING_UNDERGROUND_ALLOW_CAS)
return "It is underground. A thin cavern roof lies above. Doesn't look like it's going to stop much."
if(CEILING_UNDERGROUND_BLOCK_CAS)
Expand Down
Loading

0 comments on commit be27f58

Please sign in to comment.