Skip to content

Commit

Permalink
Lift more weed restrictions (#7611)
Browse files Browse the repository at this point in the history
# About the pull request

This PR is a follow up to #7363 #7556 and #7535 which have been changing
where xenos are allowed to weed. This should be the final update to
allow xenos weeding capabilities anywhere but OOB and the AI Core
(atleast until marines land then there is a temporary restriction).

Also fixes an oversight where resin walls and doors were not getting
weed killed.

# Explain why it's good for the game

Fixes #7583

# Testing Photographs and Procedure
<!-- Include any screenshots/videos/debugging steps of the modified code
functioning successfully, ideally including edge cases. -->

<!-- !! If you are modifying sprites, you **must** include one or more
in-game screenshots or videos of the new sprites. !! -->

<details>
<summary>Screenshots & Videos</summary>

https://youtu.be/0qA55ZizGoE

Weed killer on structures:

![example](https://github.com/user-attachments/assets/fe56de81-8381-45b1-93e1-6d06612cde5c)

</details>

# Changelog
:cl: Drathek
code: Added sanity checks for whenever AREA_UNWEEDABLE is used or when
an area is somehow null
balance: All maps have their round start is_resin_allowed restriction
lifted unless out of bounds
maptweak: All maps with OOB areas have now AREA_UNWEEDABLE set to make
the restriction permanent
fix: Resin walls and doors will now properly get weed killed
/:cl:
  • Loading branch information
Drulikar authored Nov 19, 2024
1 parent cbd8af9 commit 13b24a8
Show file tree
Hide file tree
Showing 20 changed files with 33 additions and 78 deletions.
3 changes: 1 addition & 2 deletions code/game/area/BigRed.dm
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@
icon = 'icons/turf/area_kutjevo.dmi'
icon_state = "oob"
is_resin_allowed = FALSE
flags_area = AREA_NOTUNNEL
flags_area = AREA_NOTUNNEL|AREA_UNWEEDABLE
can_build_special = FALSE
soundscape_interval = 0

Expand Down Expand Up @@ -653,7 +653,6 @@
minimap_color = MINIMAP_AREA_LZ
icon_state = "tcomsatcham"
requires_power = FALSE
is_resin_allowed = FALSE

/area/bigredv2/landing/console
name = "\improper LZ1 'Telecomms'"
Expand Down
11 changes: 0 additions & 11 deletions code/game/area/Corsat.dm
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,10 @@
/area/corsat/sigma/north
name = "\improper Sigma Sector North Hallway"
icon_state = "sigma_hallway_north"
is_resin_allowed = FALSE

/area/corsat/sigma/hangar
name = "\improper Landing Bay Sigma"
icon_state = "sigma_hangar"
is_resin_allowed = FALSE
is_landing_zone = TRUE

/area/corsat/sigma/hangar/monorail
Expand Down Expand Up @@ -104,22 +102,18 @@
/area/corsat/sigma/cargo
name = "\improper Sigma Cargo"
icon_state = "sigma_cargo"
is_resin_allowed = FALSE

/area/corsat/sigma/laundry
name = "\improper Sigma Laundry"
icon_state = "sigma_laundry"
is_resin_allowed = FALSE

/area/corsat/sigma/lavatory
name = "\improper Sigma Lavatory"
icon_state = "sigma_lavatory"
is_resin_allowed = FALSE

/area/corsat/sigma/cafe
name = "\improper Sigma Cafe"
icon_state = "sigma_cafe"
is_resin_allowed = FALSE

/area/corsat/sigma/dorms
name = "\improper Sigma Residential Module"
Expand Down Expand Up @@ -216,7 +210,6 @@
/area/corsat/gamma/hangar
name = "\improper Landing Bay Gamma"
icon_state = "gamma_hangar"
is_resin_allowed = FALSE
is_landing_zone = TRUE

/area/corsat/gamma/hangar/monorail
Expand Down Expand Up @@ -260,7 +253,6 @@
/area/corsat/gamma/foyer
name = "\improper Gamma Foyer"
icon_state = "gamma_foyer"
is_resin_allowed = FALSE

/area/corsat/gamma/hallwaymain
name = "\improper Gamma Sector West Hallway"
Expand Down Expand Up @@ -309,7 +301,6 @@
/area/corsat/gamma/cargo
name = "\improper Gamma Cargo"
icon_state = "gamma_cargo"
is_resin_allowed = FALSE

/area/corsat/gamma/cargo/lobby
name = "\improper Gamma Cargo Lobby"
Expand Down Expand Up @@ -378,12 +369,10 @@
/area/corsat/gamma/rnr/bar
name = "\improper CORSAT Bar"
icon_state = "corsat_bar"
is_resin_allowed = FALSE

/area/corsat/gamma/rnr/arcade
name = "\improper CORSAT Arcade"
icon_state = "corsat_arcade"
is_resin_allowed = FALSE

/area/corsat/gamma/rnr/library
name = "\improper CORSAT Library"
Expand Down
10 changes: 0 additions & 10 deletions code/game/area/IceColony.dm
Original file line number Diff line number Diff line change
Expand Up @@ -56,30 +56,26 @@
/area/ice_colony/exterior/surface/landing_pad
name = "\improper Aerodrome Landing Pad"
icon_state = "landing_pad"
is_resin_allowed = FALSE
minimap_color = MINIMAP_AREA_LZ

//Landing Pad for the Vindi. THIS IS NOT THE SHUTTLE AREA
/area/ice_colony/exterior/surface/landing_pad2
name = "\improper Emergency Landing Pad"
icon_state = "landing_pad"
minimap_color = MINIMAP_AREA_LZ
is_resin_allowed = FALSE


//Everything around the physical landing pad
/area/ice_colony/exterior/surface/landing_pad_external
name = "\improper Aerodrome Landing Valley"
icon_state = "landing_pad_ext"
is_resin_allowed = FALSE
minimap_color = MINIMAP_AREA_LZ

//Aerodrome Container Yard
/area/ice_colony/exterior/surface/container_yard
name = "\improper Aerodrome Container Yard"
icon_state = "container_yard"
minimap_color = MINIMAP_AREA_LZ
is_resin_allowed = FALSE

//
// Valleys
Expand Down Expand Up @@ -357,7 +353,6 @@

/area/ice_colony/surface/hangar/hallway
name = "\improper Aerodrome Hangar Hallway"
is_resin_allowed = FALSE

/area/ice_colony/surface/hangar/alpha
name = "\improper Aerodrome Hangar 'Alpha'"
Expand All @@ -366,7 +361,6 @@
/area/ice_colony/surface/hangar/beta
name = "\improper Aerodrome Hangar 'Beta'"
icon_state = "hangar_beta"
is_resin_allowed = FALSE

/area/ice_colony/surface/hangar/checkpoint
name = "\improper Aerodrome Hangar Security Checkpoint"
Expand Down Expand Up @@ -631,7 +625,6 @@
/area/ice_colony/underground/maintenance/north
name = "\improper Underground Northern Maintenance"
icon_state = "asmaint"
is_resin_allowed = FALSE

/*
* Underground - Medbay
Expand Down Expand Up @@ -692,7 +685,6 @@
/area/ice_colony/underground/requesition
name = "\improper Underground Requesitions"
icon_state = "quart"
is_resin_allowed = FALSE

/area/ice_colony/underground/requesition/lobby
name = "\improper Underground Requesitions Lobby"
Expand All @@ -705,7 +697,6 @@
/area/ice_colony/underground/requesition/sec_storage
name = "\improper Underground Requesitions Secure Storage"
icon_state = "storage"
is_resin_allowed = TRUE

/*
* Underground - Research
Expand Down Expand Up @@ -773,7 +764,6 @@
name = "\improper Underground Hangar"
icon_state = "hangar"
ceiling = CEILING_NONE
is_resin_allowed = FALSE

/*
* Underground - Storage
Expand Down
5 changes: 1 addition & 4 deletions code/game/area/LV522_Chances_Claim.dm
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
icon_state = "unknown"
ceiling = CEILING_MAX
is_resin_allowed = FALSE
flags_area = AREA_NOTUNNEL
flags_area = AREA_NOTUNNEL|AREA_UNWEEDABLE

/area/lv522/oob/w_y_vault
name = "LV522 - Weyland Secure Vault"
Expand All @@ -37,7 +37,6 @@
/area/lv522/landing_zone_1
name = "Chance's Claim - Landing Zone One"
icon_state = "explored"
is_resin_allowed = FALSE
is_landing_zone = TRUE
minimap_color = MINIMAP_AREA_LZ
linked_lz = DROPSHIP_LZ1
Expand Down Expand Up @@ -70,7 +69,6 @@
/area/lv522/landing_zone_2
name = "Chance's Claim - Landing Zone Two"
icon_state = "explored"
is_resin_allowed = FALSE
is_landing_zone = TRUE
minimap_color = MINIMAP_AREA_LZ
linked_lz = DROPSHIP_LZ2
Expand Down Expand Up @@ -199,7 +197,6 @@
name = "North LZ1 - Spaceport"
icon_state = "red"
minimap_color = MINIMAP_AREA_LZ
is_resin_allowed = FALSE

/area/lv522/indoors/lone_buildings/outdoor_bot
name = "East LZ1 - Outdoor T-Comms"
Expand Down
1 change: 0 additions & 1 deletion code/game/area/LV624.dm
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,6 @@

/area/lv624/lazarus/landing_zones
ceiling = CEILING_NONE
is_resin_allowed = FALSE
is_landing_zone = TRUE

/area/lv624/lazarus/landing_zones/lz1
Expand Down
17 changes: 0 additions & 17 deletions code/game/area/Prison_Station_FOP.dm
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
/area/prison/security
name = "\improper Security Department"
icon_state = "security"
is_resin_allowed = FALSE
minimap_color = MINIMAP_AREA_SEC

/area/prison/security/briefing
Expand All @@ -35,7 +34,6 @@

/area/prison/security/monitoring
icon_state = "sec_prison"
is_resin_allowed = TRUE

/area/prison/security/monitoring/lowsec/ne
name = "\improper Northeast Low-Security Monitoring"
Expand Down Expand Up @@ -64,7 +62,6 @@

/area/prison/security/checkpoint
icon_state = "checkpoint1"
is_resin_allowed = TRUE

/area/prison/security/checkpoint/medsec
name = "\improper Medium-Security Checkpoint"
Expand All @@ -89,7 +86,6 @@

/area/prison/security/checkpoint/hangar
name = "\improper Main Hangar Traffic Control"
is_resin_allowed = FALSE
is_landing_zone = TRUE

/area/prison/storage
Expand Down Expand Up @@ -168,7 +164,6 @@

/area/prison/toilet/security
name = "\improper Security Restooms"
is_resin_allowed = FALSE

/area/prison/toilet/research
name = "\improper Research Restooms"
Expand Down Expand Up @@ -202,7 +197,6 @@
/area/prison/maintenance/staff_research
name = "\improper Staff-Research Maintenance"
icon_state = "maint_research_starboard"
is_resin_allowed = FALSE

/area/prison/maintenance/research_medbay
name = "\improper Research-Infirmary Maintenance"
Expand All @@ -211,7 +205,6 @@
/area/prison/maintenance/hangar_barracks
name = "\improper Hangar-Barracks Maintenance"
icon_state = "maint_e_shuttle"
is_resin_allowed = FALSE
is_landing_zone = TRUE

/area/prison/canteen
Expand Down Expand Up @@ -262,7 +255,6 @@
/area/prison/hallway/entrance
name = "\improper Entrance Hallway"
icon_state = "entry"
is_resin_allowed = FALSE

/area/prison/hallway/central
name = "\improper Central Ring"
Expand Down Expand Up @@ -409,17 +401,14 @@
/area/prison/research
name = "\improper Biological Research Department"
icon_state = "research"
is_resin_allowed = FALSE

/area/prison/research/RD
name = "\improper Research Director's office"
icon_state = "disposal"
is_resin_allowed = FALSE

/area/prison/research/secret
name = "\improper Classified Research"
icon_state = "toxlab"
is_resin_allowed = TRUE

/area/prison/research/secret/dissection
name = "\improper Dissection"
Expand Down Expand Up @@ -458,15 +447,11 @@

/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"

/area/prison/hanger
is_resin_allowed = FALSE

/area/prison/hanger/main
name = "\improper Main Hanger"
icon_state = "hangar_alpha"
Expand All @@ -484,7 +469,6 @@
/area/prison/hangar_storage/research
name = "\improper Research Hangar Storage"
icon_state = "toxstorage"
is_resin_allowed = FALSE
is_landing_zone = TRUE

/area/prison/hangar_storage/research/shuttle
Expand All @@ -494,7 +478,6 @@
/area/prison/telecomms
name = "\improper Telecommunications"
icon_state = "tcomsatcham"
is_resin_allowed = FALSE

/area/prison/pirate
name = "Tramp Freighter \"Rocinante\""
Expand Down
6 changes: 2 additions & 4 deletions code/game/area/Sulaco.dm
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
/area/shuttle/drop1
//soundscape_playlist = list('sound/soundscape/drum1.ogg')
soundscape_interval = 30 //seconds
is_resin_allowed = FALSE
flags_area = AREA_NOTUNNEL
is_landing_zone = TRUE
ceiling = CEILING_REINFORCED_METAL
Expand All @@ -26,6 +25,7 @@
icon_state = "shuttlered"
base_muffle = MUFFLE_HIGH
base_lighting_alpha = 255
is_resin_allowed = FALSE

/area/shuttle/drop1/LV624
name = "\improper Dropship Alamo"
Expand Down Expand Up @@ -69,7 +69,6 @@
/area/shuttle/drop2
//soundscape_playlist = list('sound/soundscape/drum1.ogg')
soundscape_interval = 30 //seconds
is_resin_allowed = FALSE
flags_area = AREA_NOTUNNEL
is_landing_zone = TRUE
ceiling = CEILING_REINFORCED_METAL
Expand All @@ -80,6 +79,7 @@
icon_state = "shuttle"
base_muffle = MUFFLE_HIGH
base_lighting_alpha = 255
is_resin_allowed = FALSE

/area/shuttle/drop2/LV624
name = "\improper Dropship Normandy"
Expand Down Expand Up @@ -123,7 +123,6 @@
/area/shuttle/drop3
//soundscape_playlist = list('sound/soundscape/drum1.ogg')
soundscape_interval = 30 //seconds
is_resin_allowed = FALSE
flags_area = AREA_NOTUNNEL
is_landing_zone = TRUE
ceiling = CEILING_REINFORCED_METAL
Expand Down Expand Up @@ -177,7 +176,6 @@

/area/shuttle/drop_upp
soundscape_interval = 30 //seconds
is_resin_allowed = FALSE
flags_area = AREA_NOTUNNEL
is_landing_zone = TRUE
ceiling = CEILING_REINFORCED_METAL
Expand Down
4 changes: 4 additions & 0 deletions code/game/area/areas.dm
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,10 @@
if(unoviable_timer)
SSticker.OnRoundstart(CALLBACK(src, PROC_REF(handle_ovi_timer)))

if((flags_area & AREA_UNWEEDABLE) && is_resin_allowed)
is_resin_allowed = FALSE
log_mapping("[src] has AREA_UNWEEDABLE flag but has is_resin_allowed as true! Forcing is_resin_allowed false...")

/area/proc/initialize_power(override_power)
if(requires_power)
if(override_power) //Reset everything if you want to override.
Expand Down
Loading

0 comments on commit 13b24a8

Please sign in to comment.