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

First Drop Protections: Gas and Static Turrets #6363

Merged
merged 33 commits into from
Jun 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
e3258de
Smoke refactoring
Drulikar Jun 2, 2024
b01b415
Sentry name fixes
Drulikar Jun 2, 2024
d515c61
Initial implementation of miasma smoke and static deployable gauss se…
Drulikar Jun 2, 2024
9eda611
Shiva LZ2 habs
Drulikar Jun 2, 2024
857d745
Tweak smoke damage and blur
Drulikar Jun 2, 2024
0389ccc
Fix auto deployment having wrong sentry range
Drulikar Jun 2, 2024
dc495b7
Fix sentry_holder hiding north facing barricades
Drulikar Jun 2, 2024
7972fdc
Add niche logged for toggling deployment of lz turrets
Drulikar Jun 2, 2024
bb3604b
Add examine text if okay battery
Drulikar Jun 2, 2024
68f5711
Tweak examine text
Drulikar Jun 3, 2024
e036f75
Consistency
Drulikar Jun 3, 2024
158cf26
More smoke refactoring
Drulikar Jun 3, 2024
7a3b6bc
Miasma in LZ1 tcoms
Drulikar Jun 3, 2024
b1110b8
Shivas warehouse
Drulikar Jun 3, 2024
7b63bc1
Trijent Dam
Drulikar Jun 3, 2024
1ca3a12
Kutjevo Refinery
Drulikar Jun 3, 2024
8d00007
Chances claim
Drulikar Jun 3, 2024
f4bb33c
New Varadero
Drulikar Jun 3, 2024
35e29ed
Fiorina Cellblocks
Drulikar Jun 3, 2024
142f6af
Corsat
Drulikar Jun 3, 2024
79a1b2d
Combine battery durations into one var
Drulikar Jun 4, 2024
d190f94
Revert shuttle lighting change for alamo/normandy since they don't ha…
Drulikar Jun 4, 2024
b6ca725
increase spaceborne sentry range
Drulikar Jun 4, 2024
d00cb16
Shrink LZ2 area on shivas
Drulikar Jun 4, 2024
f7f75b3
Faster droppod sentries
Drulikar Jun 4, 2024
134bb83
Sanity check in case somehow first drop occurred somehow
Drulikar Jun 4, 2024
b08a6f5
Expand LZ1 area on sci annex
Drulikar Jun 4, 2024
bafdedb
Tweak LZ area poking out.
Drulikar Jun 4, 2024
f3b5a98
Fix vehicles in miasma
Drulikar Jun 4, 2024
589d2ca
No explosions
Drulikar Jun 4, 2024
c0a981c
3 min timer for lz hazards
Drulikar Jun 6, 2024
a50f945
Rework miasma in vehicles
Drulikar Jun 6, 2024
bb9a7df
New Varadero - though this will likely need to discarded and reapplie…
Drulikar Jun 8, 2024
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
6 changes: 6 additions & 0 deletions code/__DEFINES/defenses.dm
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,12 @@
#define DEFENSE_BELL_TOWER 4
#define DEFENSE_TESLA_COIL 5

// Defines for /obj/structure/machinery/defenses/sentry/premade/deployable/colony/landing_zone
#define TURRET_BATTERY_STATE_OK 0
#define TURRET_BATTERY_STATE_LOW 1
#define TURRET_BATTERY_STATE_CRITICAL 2
#define TURRET_BATTERY_STATE_DEAD 3

// What range the generator has to be in or defenses has to be in.
#define GEN_SEARCH_RANGE 5
#define GEN_PLASTEEL_COST 10
Expand Down
1 change: 1 addition & 0 deletions code/__DEFINES/misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#define SMOKE_RANK_MED 3
#define SMOKE_RANK_HIGH 4
#define SMOKE_RANK_BOILER 5
#define SMOKE_RANK_MAX 6

// What kind of function to use for Explosions falling off.

Expand Down
8 changes: 8 additions & 0 deletions code/game/area/BigRed.dm
Original file line number Diff line number Diff line change
Expand Up @@ -515,27 +515,35 @@
is_resin_allowed = FALSE
ceiling_muffle = FALSE
base_muffle = MUFFLE_LOW
is_landing_zone = TRUE

/area/bigredv2/outside/telecomm/lz2_cave
name = "\improper Central Grounds Communications Relay"
is_landing_zone = FALSE

/area/bigredv2/outside/telecomm/n_cave
name = "\improper North Cave Communications Relay"
is_landing_zone = FALSE

/area/bigredv2/outside/telecomm/warehouse
name = "\improper Warehouse Communications Relay"
is_landing_zone = FALSE

/area/bigredv2/outside/telecomm/security
name = "\improper Security Communications Relay"
is_landing_zone = FALSE

/area/bigredv2/outside/telecomm/store
name = "\improper General Store Communications Relay"
is_landing_zone = FALSE

/area/bigredv2/outside/telecomm/admin
name = "\improper Administrative Communications Relay"
is_landing_zone = FALSE

/area/bigredv2/outside/telecomm/engi
name = "\improper Engineering Communications Relay"
is_landing_zone = FALSE


/area/bigredv2/outside/engineering
Expand Down
1 change: 0 additions & 1 deletion code/game/area/Corsat.dm
Original file line number Diff line number Diff line change
Expand Up @@ -523,7 +523,6 @@
/area/corsat/omega/hangar
name = "\improper Landing Bay Omega"
icon_state = "omega_hangar"
is_landing_zone = TRUE

/area/corsat/omega/hangar/office
name = "\improper Omega Hangar Office"
Expand Down
1 change: 1 addition & 0 deletions code/game/area/DesertDam.dm
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,7 @@
/area/desert_dam/building/substation/northwest
name = "Command Substation"
icon_state = "northewestern_ss"
is_landing_zone = TRUE
/area/desert_dam/building/substation/northeast
name = "Command Substation"
icon_state = "northeastern_ss"
Expand Down
5 changes: 5 additions & 0 deletions code/game/area/LV522_Chances_Claim.dm
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,11 @@
name = "Chance's Claim - Landing Zone One Tunnels"
ceiling = CEILING_METAL

/area/lv522/landing_zone_1/tunnel/far
name = "Chance's Claim - Landing Zone One Tunnels"
ceiling = CEILING_METAL
is_landing_zone = FALSE

/area/shuttle/drop1/lv522
name = "Chance's Claim - Dropship Alamo Landing Zone"
icon_state = "shuttle"
Expand Down
7 changes: 7 additions & 0 deletions code/game/area/Prison_Station_FOP.dm
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@
/area/prison/security/checkpoint/hangar
name = "\improper Main Hangar Traffic Control"
is_resin_allowed = FALSE
is_landing_zone = TRUE

/area/prison/storage
icon_state = "engine_storage"
Expand Down Expand Up @@ -211,6 +212,7 @@
name = "\improper Hangar-Barracks Maintenance"
icon_state = "maint_e_shuttle"
is_resin_allowed = FALSE
is_landing_zone = TRUE

/area/prison/canteen
name = "\improper Canteen"
Expand Down Expand Up @@ -457,6 +459,7 @@
/area/prison/monorail/east
name = "\improper East Monorail Station"
is_resin_allowed = FALSE
is_landing_zone = TRUE

/area/prison/monorail/west
name = "\improper West Monorail Station"
Expand All @@ -467,10 +470,12 @@
/area/prison/hanger/main
name = "\improper Main Hanger"
icon_state = "hangar_alpha"
is_landing_zone = TRUE

/area/prison/hanger/research
name = "\improper Research Hanger"
icon_state = "hangar_beta"
is_landing_zone = TRUE

/area/prison/hangar_storage/main
name = "\improper Main Hangar Storage"
Expand All @@ -480,9 +485,11 @@
name = "\improper Research Hangar Storage"
icon_state = "toxstorage"
is_resin_allowed = FALSE
is_landing_zone = TRUE

/area/prison/hangar_storage/research/shuttle
name = "Corporate Shuttle"
is_landing_zone = FALSE

/area/prison/telecomms
name = "\improper Telecommunications"
Expand Down
4 changes: 4 additions & 0 deletions code/game/area/Sulaco.dm
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
flags_area = AREA_NOTUNNEL
is_landing_zone = TRUE
ceiling = CEILING_REINFORCED_METAL
base_lighting_alpha = 0

/area/shuttle/drop1/Enter(atom/movable/O, atom/oldloc)
if(istype(O, /obj/structure/barricade))
Expand All @@ -24,6 +25,7 @@
name = "\improper Dropship Alamo"
icon_state = "shuttlered"
base_muffle = MUFFLE_HIGH
base_lighting_alpha = 255

/area/shuttle/drop1/LV624
name = "\improper Dropship Alamo"
Expand Down Expand Up @@ -71,11 +73,13 @@
flags_area = AREA_NOTUNNEL
is_landing_zone = TRUE
ceiling = CEILING_REINFORCED_METAL
base_lighting_alpha = 0

/area/shuttle/drop2/sulaco
name = "\improper Dropship Normandy"
icon_state = "shuttle"
base_muffle = MUFFLE_HIGH
base_lighting_alpha = 255

/area/shuttle/drop2/LV624
name = "\improper Dropship Normandy"
Expand Down
3 changes: 3 additions & 0 deletions code/game/area/kutjevo.dm
Original file line number Diff line number Diff line change
Expand Up @@ -203,19 +203,22 @@
icon_state = "Colony_int"
ceiling = CEILING_METAL
is_resin_allowed = FALSE
is_landing_zone = TRUE

/area/kutjevo/interior/complex/Northwest_Flight_Control
name = "Kutjevo Complex - Northwest Flight Control Room"
icon_state = "Colony_int"
ceiling = CEILING_METAL
is_resin_allowed = FALSE
is_landing_zone = TRUE

/area/kutjevo/interior/complex/Northwest_Security_Checkpoint
name = "Kutjevo Complex - Northwest Security Checkpoint"
icon_state = "Colony_int"
ceiling = CEILING_METAL
is_resin_allowed = FALSE
minimap_color = MINIMAP_AREA_SEC
is_landing_zone = TRUE

//Out buildings + foremans
/area/kutjevo/interior/power
Expand Down
1 change: 1 addition & 0 deletions code/game/area/prison.dm
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
name = "\improper control room"
icon_state = "bridge"
minimap_color = MINIMAP_AREA_COMMAND
is_landing_zone = TRUE

/area/prison/hallway/central_ring
name = "\improper central ring"
Expand Down
1 change: 1 addition & 0 deletions code/game/area/prison_v3_fiorina.dm
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,7 @@

/area/fiorina/station/telecomm/lz1_tram
name = "Fiorina - LZ1 Aux Port Communications Relay"
is_landing_zone = TRUE

/area/fiorina/station/telecomm/lz1_engineering
name = "Fiorina - Engineering Primary Communications Relay"
Expand Down
9 changes: 5 additions & 4 deletions code/game/area/shiva.dm
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,10 @@
name = "Shiva's Snowball - Blue Warehouse"
icon_state = "hangars1"

/area/shiva/interior/warehouse/caves
name = "Shiva's Snowball - Blue Warehouse Ice Cave"
icon_state = "caves1"

/area/shiva/interior/valley_huts
name = "Shiva's Snowball - Valley Bunker 1"
icon_state = "hangars1"
Expand All @@ -251,17 +255,14 @@
name = "Shiva's Snowball - Valley Disposals"
icon_state = "hangars3"

/area/shiva/interior/warehouse/caves
name = "Shiva's Snowball - Blue Warehouse Ice Cave"
icon_state = "caves1"

/area/shiva/interior/garage
name = "Shiva's Snowball - Cargo Tug Repair Station"
icon_state = "hangars2"

/area/shiva/interior/lz2_habs
name = "Shiva's Snowball - Argentinian Research Headquarters"
icon_state = "bar1"
is_landing_zone = TRUE

/area/shiva/interior/aux_power
name = "Shiva's Snowball - Auxiliary Generator Station"
Expand Down
7 changes: 7 additions & 0 deletions code/game/area/varadero.dm
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@
requires_power = FALSE
is_resin_allowed = FALSE
minimap_color = MINIMAP_AREA_LZ
is_landing_zone = TRUE

/area/varadero/exterior/lz1_console/two
name = "New Varadero - Palm Airfield"
Expand All @@ -98,19 +99,24 @@
icon_state = "lz1"
is_resin_allowed = FALSE
minimap_color = MINIMAP_AREA_LZ
is_landing_zone = TRUE

/area/varadero/exterior/lz2_near
name = "New Varadero - Palm Airfield"
icon_state = "lz2"
is_resin_allowed = FALSE
minimap_color = MINIMAP_AREA_LZ
is_landing_zone = TRUE

/area/varadero/exterior/pontoon_beach
name = "New Varadero - Rockabilly Beach"
icon_state = "varadero0"
is_resin_allowed = FALSE
minimap_color = MINIMAP_AREA_JUNGLE

/area/varadero/exterior/pontoon_beach/lz
is_landing_zone = TRUE

/area/varadero/exterior/eastbeach
name = "New Varadero - East Beach"
is_resin_allowed = FALSE
Expand Down Expand Up @@ -157,6 +163,7 @@
is_resin_allowed = FALSE
minimap_color = MINIMAP_AREA_JUNGLE
sound_environment = SOUND_ENVIRONMENT_ROOM
is_landing_zone = TRUE

/area/varadero/interior/cargo
name = "New Varadero - Cargo"
Expand Down
Loading
Loading