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

Better Control of Weeding and Areas - Landing Zone edition. #7363

Merged
merged 31 commits into from
Oct 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
6cc04d9
added lz proximity deweeding code
hry-gh Oct 19, 2024
d69943b
weedkillerification
hry-gh Oct 19, 2024
0b15b2d
support `linked_lz` being a list, eg list(DROPSHIP_LZ1, DROPSHIP_LZ2)
hry-gh Oct 22, 2024
8b2f6c7
Area Changes, Deweedable Areas on Drop Test - 5min timer
Nanu308 Oct 22, 2024
012014c
Added missed APC's to new areas.
Nanu308 Oct 22, 2024
a18d219
Merge branch 'master' into nanu/deweedv2+
Nanu308 Oct 22, 2024
444d181
Out of order moment
Nanu308 Oct 22, 2024
acf81d0
Fixes bug, extends timer to 8 Minutes, Adds two new areas
Nanu308 Oct 25, 2024
8ede739
adds mapping helpers for scraping away turfs/toggling destructibility
hry-gh Oct 26, 2024
7c054ea
out of order...
hry-gh Oct 26, 2024
adfcf41
correct order
hry-gh Oct 26, 2024
03a14c6
i have no idea what is wrong with my dme extension
hry-gh Oct 26, 2024
4596caf
SW Cave Big Red Timers
Nanu308 Oct 26, 2024
e013f14
adds code to make areas unoviable
hry-gh Oct 26, 2024
62f52b2
wrong announcement color for xneomorphs
hry-gh Oct 26, 2024
30acc61
Area Fixes, Removes unused areas on Trijent, Deovi areas set.
Nanu308 Oct 26, 2024
f9cd443
sentry spawn landmarks
hry-gh Oct 26, 2024
babea75
address create & destroy, creating hivecores in unoviable area
hry-gh Oct 26, 2024
cfe753f
sentry spawn landmarks should be different for different lzs
hry-gh Oct 26, 2024
b137d4c
clean up properly
hry-gh Oct 26, 2024
fd4c36a
typo'd
hry-gh Oct 26, 2024
6a69316
Gets rid of Is_Resin_allowed protection for playable areas
Nanu308 Oct 26, 2024
2c1f0f0
Merge branch 'nanu/deweedv2+' of https://github.com/Nanu308/cmss13 in…
Nanu308 Oct 26, 2024
0634418
Turret rng placements landmarks added per map
Nanu308 Oct 26, 2024
738c5e4
Merge branch 'master' into nanu/deweedv2+
Nanu308 Oct 26, 2024
41303d5
correct gc errors
hry-gh Oct 26, 2024
9c1a019
two birds with one stone
hry-gh Oct 27, 2024
e55912e
include all resin objects in cleanup
hry-gh Oct 28, 2024
2e5a785
Adds Ovi positions to Trijent Dam
Nanu308 Oct 29, 2024
ce76f40
fix walls not updating connections when scraped away
hry-gh Oct 29, 2024
1ce880b
Apply suggestions from code review
hry-gh Oct 29, 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
1 change: 1 addition & 0 deletions code/__DEFINES/__game.dm
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,7 @@
#define DOCK_ATTEMPT_TIMEOUT 20 SECONDS
#define DROPSHIP_WARMUP_TIME 10 SECONDS
#define DROPSHIP_DROP_MSG_DELAY 30 SECONDS
#define DROPSHIP_DROP_FIRE_DELAY 20 SECONDS
#define DROPSHIP_TRANSIT_DURATION 100 SECONDS
#define DROPSHIP_CORSAT_DURATION 30 SECONDS
#define ELEVATOR_TRANSIT_DURATION 5 SECONDS
Expand Down
2 changes: 2 additions & 0 deletions code/__DEFINES/dcs/signals/atom/signals_area.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/// From /area/proc/purge_weeds()
#define COMSIG_AREA_RESIN_DISALLOWED "area_weeds_disallowed"
5 changes: 5 additions & 0 deletions code/__DEFINES/maps.dm
Original file line number Diff line number Diff line change
Expand Up @@ -120,3 +120,8 @@ require only minor tweaks.

/// A map key that corresponds to being one exclusively for Space.
#define SPACE_KEY "space"

#define SENTRY_TOP_LEFT "top_left"
#define SENTRY_TOP_RIGHT "top_right"
#define SENTRY_BOTTOM_LEFT "bottom_left"
#define SENTRY_BOTTOM_RIGHT "bottom_right"
19 changes: 19 additions & 0 deletions code/datums/components/resin_cleanup.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
/**
* Handles cleaning up resin when the area requests it
*/
/datum/component/resin_cleanup

/datum/component/resin_cleanup/Initialize(...)
var/area/parent_area = get_area(parent)

RegisterSignal(parent_area, COMSIG_AREA_RESIN_DISALLOWED, PROC_REF(cleanup_resin))

/datum/component/resin_cleanup/proc/cleanup_resin()
SIGNAL_HANDLER

if(isturf(parent))
var/turf/parent_turf = parent
addtimer(CALLBACK(parent_turf, TYPE_PROC_REF(/turf, ScrapeAway)), rand(1 SECONDS, 5 SECONDS))
return

QDEL_IN(parent, rand(1 SECONDS, 5 SECONDS))
38 changes: 29 additions & 9 deletions code/game/area/BigRed.dm
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
name = "\improper Garage Workshop"
icon_state = "green"
ceiling = CEILING_METAL
linked_lz = DROPSHIP_LZ1

/area/bigred/ground/ship
name = "\improper Crashed Vessel"
Expand Down Expand Up @@ -262,6 +263,7 @@
sound_environment = SOUND_ENVIRONMENT_ROOM
soundscape_playlist = list()
minimap_color = MINIMAP_AREA_RESEARCH
unoviable_timer = FALSE

/area/bigredv2/caves/lambda/virology
name = "\improper Lambda Virology"
Expand Down Expand Up @@ -289,6 +291,7 @@
ambience_exterior = AMBIENCE_CAVE
soundscape_playlist = SCAPE_PL_CAVE
base_muffle = MUFFLE_HIGH
unoviable_timer = FALSE

// serve for the security checkpoint.
/area/bigredv2/outside/lambda_cave_cas
Expand Down Expand Up @@ -329,7 +332,7 @@
/area/bigredv2/outside/nw
name = "\improper Northwest Colony Grounds"
icon_state = "northwest"
is_resin_allowed = FALSE
linked_lz = DROPSHIP_LZ1
soundscape_playlist = SCAPE_PL_DESERT_STORM

/area/bigredv2/outside/nw/ceiling
Expand All @@ -348,7 +351,7 @@
/area/bigredv2/outside/w
name = "\improper Western Colony Grounds"
icon_state = "west"
is_resin_allowed = FALSE
linked_lz = DROPSHIP_LZ2

/area/bigredv2/outside/e
name = "\improper Eastern Colony Grounds"
Expand All @@ -368,7 +371,7 @@
/area/bigredv2/outside/sw
name = "\improper Southwest Colony Grounds"
icon_state = "southwest"
is_resin_allowed = FALSE
linked_lz = DROPSHIP_LZ2
soundscape_playlist = SCAPE_PL_DESERT_STORM

/area/bigredv2/caves
Expand All @@ -387,14 +390,15 @@
name = "\improper Southwest Abandoned Mining Caves"
icon_state = "bluenew"
color = "purple"

unoviable_timer = FALSE

/area/bigredv2/caves/eta
ceiling = CEILING_UNDERGROUND_METAL_BLOCK_CAS
ceiling_muffle = FALSE
ambience_exterior = AMBIENCE_ALMAYER
sound_environment = SOUND_ENVIRONMENT_ROOM
soundscape_playlist = list()
unoviable_timer = FALSE

/area/bigredv2/outside/eta
name = "\improper Eta Labs Compound"
Expand Down Expand Up @@ -422,25 +426,27 @@
name = "\improper Cargo"
icon_state = "storage"
ceiling = CEILING_METAL
is_resin_allowed = FALSE
linked_lz = DROPSHIP_LZ2

/area/bigredv2/outside/general_store
name = "\improper General Store"
icon_state = "blueold"
ceiling = CEILING_METAL

linked_lz = DROPSHIP_LZ2

/area/bigredv2/outside/marshal_office
name = "\improper Marshal Offices"
icon_state = "brig"
ceiling = CEILING_METAL
minimap_color = MINIMAP_AREA_SEC
linked_lz = DROPSHIP_LZ1

/area/bigredv2/outside/medical
name = "\improper Hospital"
icon_state = "CMO"
ceiling = CEILING_METAL
minimap_color = MINIMAP_AREA_MEDBAY
linked_lz = DROPSHIP_LZ1

/area/bigredv2/outside/admin_building
name = "\improper Administration"
Expand All @@ -461,6 +467,7 @@
ceiling_muffle = FALSE
base_muffle = MUFFLE_MEDIUM
minimap_color = MINIMAP_AREA_MEDBAY
linked_lz = DROPSHIP_LZ1

/area/bigredv2/outside/dorms
name = "\improper Dormitories"
Expand Down Expand Up @@ -496,14 +503,14 @@
name = "\improper Space Port"
icon_state = "green"
ceiling = CEILING_GLASS
is_resin_allowed = FALSE
linked_lz = DROPSHIP_LZ1
is_landing_zone = TRUE

/area/bigredv2/outside/space_port_lz2
name = "\improper Cargo Landing Pad"
icon_state = "green"
ceiling = CEILING_NONE
is_resin_allowed = FALSE
linked_lz = DROPSHIP_LZ2
is_landing_zone = TRUE
minimap_color = MINIMAP_AREA_LZ

Expand All @@ -512,7 +519,7 @@
name = "\improper LZ1 Communications Relay"
icon_state = "ass_line"
ceiling = CEILING_UNDERGROUND_METAL_ALLOW_CAS
is_resin_allowed = FALSE
linked_lz = DROPSHIP_LZ1
ceiling_muffle = FALSE
base_muffle = MUFFLE_LOW
is_landing_zone = TRUE
Expand All @@ -524,6 +531,7 @@
/area/bigredv2/outside/telecomm/n_cave
name = "\improper North Cave Communications Relay"
is_landing_zone = FALSE
linked_lz = DROPSHIP_LZ1

/area/bigredv2/outside/telecomm/warehouse
name = "\improper Warehouse Communications Relay"
Expand All @@ -550,6 +558,11 @@
name = "\improper Engineering Complex"
icon_state = "engine"
ceiling = CEILING_METAL
linked_lz = DROPSHIP_LZ2

/area/bigredv2/outside/engineering/reactor
name = "\improper Main Reactor"
linked_lz = null

/area/bigredv2/outside/storage
name = "\improper Storage"
Expand Down Expand Up @@ -601,6 +614,7 @@
soundscape_playlist = SCAPE_PL_CAVE
base_muffle = MUFFLE_HIGH
minimap_color = MINIMAP_AREA_RESEARCH_CAVE
unoviable_timer = FALSE

/area/bigredv2/caves_se
name = "\improper Southeastern Caves"
Expand All @@ -611,6 +625,7 @@
ambience_exterior = AMBIENCE_CAVE
soundscape_playlist = SCAPE_PL_CAVE
base_muffle = MUFFLE_HIGH
unoviable_timer = FALSE

/area/bigredv2/caves_east
name = "\improper Eastern Caves"
Expand All @@ -621,6 +636,7 @@
ambience_exterior = AMBIENCE_CAVE
soundscape_playlist = SCAPE_PL_CAVE
base_muffle = MUFFLE_HIGH
unoviable_timer = FALSE

/area/bigredv2/caves_north
name = "\improper Northern Caves"
Expand Down Expand Up @@ -650,21 +666,25 @@
name = "\improper Northern Caves Entrance"
icon_state = "garden"
ceiling = CEILING_UNDERGROUND_ALLOW_CAS
linked_lz = DROPSHIP_LZ1

/area/bigredv2/outside/lz1_telecomm_cas
name = "\improper Virology Caves Entrance"
icon_state = "garden"
ceiling = CEILING_UNDERGROUND_ALLOW_CAS
linked_lz = DROPSHIP_LZ1

/area/bigredv2/outside/lz2_west_cas
name = "\improper Southwestern Caves Entrance"
icon_state = "garden"
ceiling = CEILING_UNDERGROUND_ALLOW_CAS
linked_lz = DROPSHIP_LZ2

/area/bigredv2/outside/lz2_south_cas
name = "\improper ETA Lockdown Caves Entrance"
icon_state = "garden"
ceiling = CEILING_UNDERGROUND_ALLOW_CAS
linked_lz = DROPSHIP_LZ2

/area/bigredv2/outside/filtration_cave_cas
name = "\improper Filtration Lockdown Caves Entrance"
Expand Down
Loading
Loading