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.

Sign up for GitHub

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

Fix Auto Oviable Areas #7507

Merged
merged 6 commits into from
Nov 6, 2024
Merged

Fix Auto Oviable Areas #7507

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b39d885
Fix auto oviable locations using a xvx landmark instead of the distre…
Drulikar Nov 5, 2024
3c8b109
Fix xvx having ovi restrictions
Drulikar Nov 5, 2024
77f0aff
Merge remote-tracking branch 'upstream/master' into Fix_Auto_Oviable
Drulikar Nov 6, 2024
f88e77a
More area tweaks
Drulikar Nov 6, 2024
8081af4
A little more on chances too
Drulikar Nov 6, 2024
02c1304
Ship tumor too
Drulikar Nov 6, 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
2 changes: 2 additions & 0 deletions code/game/area/DesertDam.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,10 +240,12 @@
/area/desert_dam/building/substation/northeast
name = "Command Substation"
icon_state = "northeastern_ss"
unoviable_timer = FALSE

/area/desert_dam/building/substation/central
name = "Command Substation"
icon_state = "central_ss"
unoviable_timer = FALSE

/area/desert_dam/building/substation/southwest
name = "Command Substation"
Expand Down
1 change: 1 addition & 0 deletions code/game/area/LV522_Chances_Claim.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@
/area/lv522/outdoors/colony_streets/containers
name = "Colony Streets - Container Yard"
icon_state = "yellow"
unoviable_timer = FALSE

/area/lv522/outdoors/colony_streets/windbreaker
name = "Colony Windbreakers"
Expand Down
3 changes: 3 additions & 0 deletions code/game/area/kutjevo.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,11 +251,13 @@
name = "Kutjevo - Abandoned Construction Interior"
ceiling = CEILING_METAL
icon_state = "construction_int"
unoviable_timer = FALSE

/area/kutjevo/interior/foremans_office
name = "Kutjevo - Foreman's Office"
ceiling = CEILING_METAL
icon_state = "foremans"
unoviable_timer = FALSE

/area/kutjevo/interior/botany_bay_int
name = "Kutjevo - Space Weed Farm Interior"
Expand Down Expand Up @@ -313,3 +315,4 @@
ceiling = CEILING_DEEP_UNDERGROUND
icon_state = "colony_caves_3"
minimap_color = MINIMAP_AREA_ENGI_CAVE
unoviable_timer = FALSE
1 change: 0 additions & 1 deletion code/game/area/prison_v3_fiorina.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
icon_state = "tumor1"
requires_power = 0
minimap_color = MINIMAP_AREA_SHIP
unoviable_timer = 25 MINUTES

/area/fiorina/tumor/civres
name = "Fiorina - Green Block Residences"
Expand Down
7 changes: 7 additions & 0 deletions code/game/area/shiva.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@
/area/shiva/exterior/cp_colony_grounds
name = "Shiva's Snowball - Colony Grounds"
icon_state = "junkyard2"
unoviable_timer = FALSE

/area/shiva/exterior/junkyard
name = "Shiva's Snowball - Junkyard"
Expand All @@ -148,10 +149,12 @@
/area/shiva/exterior/junkyard/cp_bar
name = "Shiva's Snowball - Bar Grounds"
icon_state = "bar0"
unoviable_timer = FALSE

/area/shiva/exterior/cp_s_research
name = "Shiva's Snowball - Research Hab Exterior"
icon_state = "junkyard1"
unoviable_timer = FALSE

/area/shiva/exterior/cp_lz2
name = "Shiva's Snowball - North Colony Grounds"
Expand Down Expand Up @@ -261,18 +264,22 @@
/area/shiva/interior/valley_huts
name = "Shiva's Snowball - Valley Bunker 1"
icon_state = "hangars1"
unoviable_timer = FALSE

/area/shiva/interior/valley_huts/no2
name = "Shiva's Snowball - Valley Bunker 2"
icon_state = "hangars2"
unoviable_timer = FALSE

/area/shiva/interior/valley_huts/disposals
name = "Shiva's Snowball - Valley Disposals"
icon_state = "hangars3"
unoviable_timer = FALSE

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

/area/shiva/interior/lz2_habs
name = "Shiva's Snowball - Argentinian Research Headquarters"
Expand Down
6 changes: 3 additions & 3 deletions code/game/gamemodes/colonialmarines/xenovsxeno.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,9 @@
initialize_post_xenomorph_list(GLOB.xeno_hive_spawns)

round_time_lobby = world.time
for(var/area/A in GLOB.all_areas)
if(!(A.is_resin_allowed))
A.is_resin_allowed = TRUE
for(var/area/cur_area in GLOB.all_areas)
cur_area.is_resin_allowed = TRUE
cur_area.unoviable_timer = FALSE

open_podlocks("map_lockdown")

Expand Down
10 changes: 5 additions & 5 deletions code/game/objects/effects/landmarks/landmarks.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,10 @@

/obj/effect/landmark/queen_spawn/Initialize(mapload, ...)
. = ..()

var/area/area = get_area(src)
area.unoviable_timer = FALSE

GLOB.queen_spawns += src

/obj/effect/landmark/queen_spawn/Destroy()
Expand All @@ -232,15 +236,11 @@
return ..()

/obj/effect/landmark/xeno_hive_spawn
name = "xeno hive spawn"
name = "xeno vs xeno hive spawn"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

😄

icon_state = "hive_spawn"

/obj/effect/landmark/xeno_hive_spawn/Initialize(mapload, ...)
. = ..()

var/area/area = get_area(src)
area.unoviable_timer = FALSE

GLOB.xeno_hive_spawns += src

/obj/effect/landmark/xeno_hive_spawn/Destroy()
Expand Down
Loading