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

Linked LZ Adjustments and Remote Queen Boosted Building Restrictions #7535

Merged
merged 4 commits into from
Nov 10, 2024
Merged
Show file tree
Hide file tree
Changes from 3 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/BigRed.dm
Original file line number Diff line number Diff line change
Expand Up @@ -527,6 +527,7 @@
/area/bigredv2/outside/telecomm/lz2_cave
name = "\improper Central Grounds Communications Relay"
is_landing_zone = FALSE
linked_lz = DROPSHIP_LZ2

/area/bigredv2/outside/telecomm/n_cave
name = "\improper North Cave Communications Relay"
Expand Down
6 changes: 6 additions & 0 deletions code/game/area/DesertDam.dm
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@
/area/desert_dam/interior/dam_interior/hanger
name = "Engineering Hangar"
icon_state = "hangar"
linked_lz = DROPSHIP_LZ1

/area/desert_dam/interior/dam_interior/hangar_storage
name = "Engineering Hangar Storage"
Expand Down Expand Up @@ -236,6 +237,7 @@
name = "Command Substation"
icon_state = "northewestern_ss"
is_landing_zone = TRUE
linked_lz = DROPSHIP_LZ1

/area/desert_dam/building/substation/northeast
name = "Command Substation"
Expand Down Expand Up @@ -721,6 +723,10 @@
icon_state = "valley_west"
linked_lz = DROPSHIP_LZ2

/area/desert_dam/exterior/valley/valley_security
name = "Security Valley"
icon_state = "valley_west"

// Generic bridge used in nightmare inserts... Can in fact be different places (sigh)
/area/desert_dam/exterior/valley/valley_bridge
name = "Valley Bridge"
Expand Down
19 changes: 19 additions & 0 deletions code/game/area/LV522_Chances_Claim.dm
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
is_resin_allowed = FALSE
is_landing_zone = TRUE
minimap_color = MINIMAP_AREA_LZ
linked_lz = DROPSHIP_LZ1

/area/lv522/landing_zone_1/ceiling
ceiling = CEILING_METAL
Expand All @@ -57,6 +58,7 @@
name = "Chance's Claim - Dropship Alamo Landing Zone"
icon_state = "shuttle"
icon = 'icons/turf/area_shiva.dmi'
linked_lz = DROPSHIP_LZ1

/area/lv522/landing_zone_1/lz1_console
name = "Chance's Claim - Dropship Alamo Console"
Expand All @@ -71,6 +73,7 @@
is_resin_allowed = FALSE
is_landing_zone = TRUE
minimap_color = MINIMAP_AREA_LZ
linked_lz = DROPSHIP_LZ2

/area/lv522/landing_zone_2/ceiling
ceiling = CEILING_METAL
Expand All @@ -79,6 +82,7 @@
name = "Chance's Claim - Dropship Normandy Landing Zone"
icon_state = "shuttle2"
icon = 'icons/turf/area_shiva.dmi'
linked_lz = DROPSHIP_LZ2

/area/lv522/landing_zone_2/lz2_console
name = "Chance's Claim - Dropship Normandy Console"
Expand Down Expand Up @@ -136,22 +140,27 @@
/area/lv522/outdoors/colony_streets/central_streets
name = "Central Streets - West"
icon_state = "west"
linked_lz = DROPSHIP_LZ1

/area/lv522/outdoors/colony_streets/east_central_street
name = "Central Streets - East"
icon_state = "east"
linked_lz = DROPSHIP_LZ2

/area/lv522/outdoors/colony_streets/south_street
name = "Colony Streets - South"
icon_state = "south"
linked_lz = list(DROPSHIP_LZ2, DROPSHIP_LZ1)

/area/lv522/outdoors/colony_streets/south_east_street
name = "Colony Streets - Southeast"
icon_state = "southeast"
linked_lz = DROPSHIP_LZ2

/area/lv522/outdoors/colony_streets/south_west_street
name = "Colony Streets - Southwest"
icon_state = "southwest"
linked_lz = DROPSHIP_LZ1

/area/lv522/outdoors/colony_streets/north_west_street
name = "Colony Streets - Northwest"
Expand All @@ -178,11 +187,13 @@
/area/lv522/indoors/toilet
name = "LV522 - Outdoor Toilets"
icon_state = "green"
linked_lz = DROPSHIP_LZ2

/area/lv522/indoors/lone_buildings/engineering
name = "Emergency Engineering"
icon_state = "engine_smes"
minimap_color = MINIMAP_AREA_ENGI
linked_lz = DROPSHIP_LZ1

/area/lv522/indoors/lone_buildings/spaceport
name = "North LZ1 - Spaceport"
Expand All @@ -194,14 +205,17 @@
name = "East LZ1 - Outdoor T-Comms"
icon_state = "yellow"
ceiling = CEILING_GLASS
linked_lz = DROPSHIP_LZ1

/area/lv522/indoors/lone_buildings/storage_blocks
name = "Outdoor Storage"
icon_state = "blue"
linked_lz = list(DROPSHIP_LZ2, DROPSHIP_LZ1)

/area/lv522/indoors/lone_buildings/chunk
name = "Chunk 'N Dump"
icon_state = "blue"
linked_lz = DROPSHIP_LZ1

//A Block
/area/lv522/indoors/a_block
Expand Down Expand Up @@ -322,6 +336,7 @@
name = "B-Block"
icon_state = "red"
ceiling = CEILING_METAL
linked_lz = DROPSHIP_LZ1

/area/lv522/indoors/b_block/hydro
name = "B-Block - Hydroponics"
Expand All @@ -330,6 +345,7 @@

/area/lv522/indoors/b_block/hydro/glass
ceiling = CEILING_GLASS
linked_lz = list(DROPSHIP_LZ2, DROPSHIP_LZ1)

/area/lv522/indoors/b_block/bar
name = "B-Block - Bar"
Expand All @@ -339,12 +355,14 @@
name = "B-Block - Hydroponics Bridge Network"
icon_state = "hallC1"
ceiling = CEILING_GLASS
linked_lz = list(DROPSHIP_LZ2, DROPSHIP_LZ1)

//C Block

/area/lv522/indoors/c_block
name = "C-Block"
icon_state = "green"
linked_lz = DROPSHIP_LZ2

/area/lv522/indoors/c_block/cargo
name = "C-Block - Cargo"
Expand All @@ -353,6 +371,7 @@
/area/lv522/indoors/c_block/mining
name = "C-Block - Mining"
icon_state = "yellow"
linked_lz = DROPSHIP_LZ2

/area/lv522/indoors/c_block/garage
name = "C-Block - Garage"
Expand Down
7 changes: 2 additions & 5 deletions code/game/area/LV624.dm
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@
name ="\improper West Central Jungle"
icon_state = "west"
//ambience = list('sound/ambience/jungle_amb1.ogg')
linked_lz = DROPSHIP_LZ2

/area/lv624/ground/jungle/east_central_jungle
name ="\improper East Central Jungle"
Expand Down Expand Up @@ -309,7 +310,6 @@
name = "\improper Yggdrasil Tree"
icon_state = "atmos"
ceiling = CEILING_GLASS
linked_lz = DROPSHIP_LZ1

/area/lv624/lazarus/medbay
name = "\improper Medbay"
Expand All @@ -325,19 +325,16 @@
name = "\improper Security"
icon_state = "security"
minimap_color = MINIMAP_AREA_SEC
linked_lz = DROPSHIP_LZ1

/area/lv624/lazarus/captain
name = "\improper Commandant's Quarters"
icon_state = "captain"
minimap_color = MINIMAP_AREA_COMMAND
linked_lz = DROPSHIP_LZ1

/area/lv624/lazarus/hop
name = "\improper Head of Personnel's Office"
icon_state = "head_quarters"
minimap_color = MINIMAP_AREA_COMMAND
linked_lz = DROPSHIP_LZ1

/area/lv624/lazarus/kitchen
name = "\improper Kitchen"
Expand All @@ -357,7 +354,6 @@
/area/lv624/lazarus/toilet
name = "\improper Dormitory Toilet"
icon_state = "toilet"
linked_lz = DROPSHIP_LZ1

/area/lv624/lazarus/chapel
name = "\improper Chapel"
Expand Down Expand Up @@ -408,6 +404,7 @@
name = "\improper Secure Storage"
icon_state = "storage"
flags_area = AREA_NOTUNNEL
linked_lz = DROPSHIP_LZ2

/area/lv624/lazarus/robotics
name = "\improper Robotics"
Expand Down
4 changes: 4 additions & 0 deletions code/game/area/kutjevo.dm
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,13 @@
name = "Kutjevo - Dropship Alamo Landing Zone"
icon_state = "shuttle"
icon = 'icons/turf/area_kutjevo.dmi'
linked_lz = DROPSHIP_LZ1

/area/shuttle/drop2/kutjevo
name = "Kutjevo - Dropship Normandy Landing Zone"
icon_state = "shuttle2"
icon = 'icons/turf/area_kutjevo.dmi'
linked_lz = DROPSHIP_LZ2

/area/kutjevo/exterior
name = "Kutjevo - Exterior"
Expand Down Expand Up @@ -55,6 +57,7 @@
unlimited_power = 1//ds computer
is_resin_allowed = FALSE
is_landing_zone = TRUE
linked_lz = DROPSHIP_LZ2

/area/kutjevo/exterior/lz_dunes
name = "Kutjevo - Landing Zone Dunes"
Expand All @@ -63,6 +66,7 @@
weather_enabled = FALSE
unlimited_power = 1//DS Computer
is_landing_zone = TRUE
linked_lz = DROPSHIP_LZ1

/area/kutjevo/exterior/lz_river
name = "Kutjevo - Power Station River"
Expand Down
4 changes: 3 additions & 1 deletion code/game/area/prison_v3_fiorina.dm
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,6 @@

/area/fiorina/station/lowsec/east
name = "Fiorina - Low Security Eastside"
linked_lz = DROPSHIP_LZ1

/area/fiorina/station/power_ring
name = "Fiorina - Engineering Ring"
Expand Down Expand Up @@ -226,9 +225,12 @@

/area/fiorina/station/telecomm/lz2_engineering
name = "Fiorina - Engineering Secondary Communications Relay"
linked_lz = DROPSHIP_LZ2

/area/fiorina/station/telecomm/lz2_north
name = "Fiorina - LZ2 North Communications Relay"
linked_lz = DROPSHIP_LZ2

/area/fiorina/station/telecomm/lz2_maint
name = "Fiorina - Backup Communications Relay"
linked_lz = DROPSHIP_LZ2
2 changes: 1 addition & 1 deletion code/game/area/shiva.dm
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@
name = "Shiva's Snowball - Fort Biceps Communications Relay"
icon_state = "hangars0"
minimap_color = MINIMAP_AREA_LZ
linked_lz = DROPSHIP_LZ1

/area/shiva/interior/telecomm/lz1_flight
name = "Shiva's Snowball - LZ1 Aerodrome Communications Relay"
Expand Down Expand Up @@ -285,6 +284,7 @@
name = "Shiva's Snowball - Argentinian Research Headquarters"
icon_state = "bar1"
is_landing_zone = TRUE
linked_lz = DROPSHIP_LZ2

/area/shiva/interior/aux_power
name = "Shiva's Snowball - Auxiliary Generator Station"
Expand Down
1 change: 0 additions & 1 deletion code/game/area/strata.dm
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,6 @@ 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
linked_lz = DROPSHIP_LZ2

////////////////////////////////////////
// ------===| Interior |===------ //
Expand Down
11 changes: 4 additions & 7 deletions code/game/area/varadero.dm
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@

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

/area/varadero/exterior/eastbeach
name = "New Varadero - East Beach"
Expand Down Expand Up @@ -171,7 +172,7 @@
/area/varadero/interior/cargo
name = "New Varadero - Cargo"
icon_state = "req0"
linked_lz = DROPSHIP_LZ2
linked_lz = DROPSHIP_LZ1
minimap_color = MINIMAP_AREA_ENGI

/area/varadero/interior/hall_NW
Expand All @@ -181,7 +182,7 @@
/area/varadero/interior/hall_N
name = "New Varadero - Hallway N"
icon_state = "hall2"
linked_lz = list(DROPSHIP_LZ1, DROPSHIP_LZ2)
linked_lz = DROPSHIP_LZ1

/area/varadero/interior/hall_SE
name = "New Varadero - Hallway SE"
Expand All @@ -196,14 +197,13 @@
/area/varadero/interior/morgue
name = "New Varadero - Morgue"
icon_state = "offices0"
linked_lz = DROPSHIP_LZ2
linked_lz = DROPSHIP_LZ1
minimap_color = MINIMAP_AREA_MEDBAY_CAVE

/area/varadero/interior/medical
name = "New Varadero - Medical"
icon_state = "offices2"
minimap_color = MINIMAP_AREA_MEDBAY
linked_lz = list(DROPSHIP_LZ2, DROPSHIP_LZ1)

/area/varadero/interior/maintenance
name = "New Varadero - Central Maintenance"
Expand All @@ -218,7 +218,6 @@
name = "New Varadero - Research Maintenance"
icon_state = "tunnels1"
minimap_color = MINIMAP_AREA_RESEARCH_CAVE
linked_lz = DROPSHIP_LZ1

/area/varadero/interior/maintenance/security
name = "New Varadero - Sec. Maintenance"
Expand Down Expand Up @@ -276,13 +275,11 @@
name = "New Varadero - Basketball Court"
icon_state = "req4"
minimap_color = MINIMAP_AREA_COMMAND_CAVE
linked_lz = list(DROPSHIP_LZ2, DROPSHIP_LZ1)

/area/varadero/interior/mess
name = "New Varadero - Mess Hall"
icon_state = "req2"
minimap_color = MINIMAP_AREA_COMMAND_CAVE
linked_lz = DROPSHIP_LZ2

/area/varadero/interior/bunks
name = "New Varadero - Level 1 Quarters"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,18 @@

var/boosted = FALSE

/datum/action/xeno_action/activable/secrete_resin/remote/queen/use_ability(atom/target_atom, mods)
if(boosted)
var/area/target_area = get_area(target_atom)
if(!target_area)
return

if(target_area.linked_lz && istype(SSticker.mode, /datum/game_mode/colonialmarines))
to_chat(owner, SPAN_XENONOTICE("It's too early to spread the hive this far."))
return

return ..()

/datum/action/xeno_action/activable/secrete_resin/remote/queen/give_to(mob/L)
. = ..()
SSticker.OnRoundstart(CALLBACK(src, PROC_REF(apply_queen_build_boost)))
Expand Down
Loading
Loading