Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
71 commits
Select commit Hold shift + click to select a range
111b3d7
InitalCommitTwo
Jun 8, 2026
a9c15fa
RiverN
Jun 8, 2026
d636086
More
Jun 8, 2026
f71f6af
WortForTheDay
Jun 8, 2026
06db177
CodeBackend
Jun 8, 2026
3e03348
AestheticMultiz
Jun 8, 2026
9cd9831
AdditChanges
Jun 8, 2026
1df2005
FunSprites
Jun 8, 2026
a2338aa
MoreWorkAdditAudio
Jun 9, 2026
3b793a7
Save
Jun 9, 2026
50b5571
arghh
Jun 9, 2026
ede79da
Yikes
Jun 9, 2026
246e3ea
Merge branch 'master' into Jungle_Map
Jun 9, 2026
bf0451b
AreaCodeApplication
Jun 9, 2026
a64e9f8
CLFSpecFor
Jun 10, 2026
4678afe
New
Jun 10, 2026
f13f1eb
Ergh
Jun 10, 2026
ac53fd4
Merge branch 'master' into Jungle_Map
Jun 10, 2026
9340ab3
ergh
Jun 10, 2026
b7384a6
argh
Jun 10, 2026
16e83d7
UpdatesForTheDay
Jun 10, 2026
5155429
SouthComms
Jun 11, 2026
f4d1618
Addit
Jun 12, 2026
d12f146
err
Jun 15, 2026
9a7e9f5
sssssssss
Jun 15, 2026
3baaf38
Save
Jun 16, 2026
e8f8c2d
MoreWork
Jun 16, 2026
4d644ee
argh
Jun 16, 2026
2d1295e
bbbb
Jun 16, 2026
e3edb69
Maker
Jun 17, 2026
ffc9c27
Fixer
Jun 17, 2026
b3df7cf
erg
Jun 17, 2026
63f49b1
erg
Jun 17, 2026
6ddeff3
surv
Jun 17, 2026
a582d56
Survivors
Jun 17, 2026
e2ceedb
Merge branch 'master' into Jungle_Map
Jun 17, 2026
16e78e5
MoreSurvsAndSynth
Jun 17, 2026
ba65bf5
CLFAndSynth
Jun 17, 2026
1e9d40a
erg
Jun 17, 2026
5395ee7
altheadset
Jun 17, 2026
9d369b8
Fine
Jun 17, 2026
50c204d
AestheticsAndCLFCamp
Jun 18, 2026
715141b
NewDaysWork
Jun 19, 2026
eaf330a
LittleRedCap
Jun 19, 2026
0131b6d
IconFixAndLightFix
Jun 19, 2026
af50186
Corpses
Jun 19, 2026
86924ef
MinorChange
Jun 20, 2026
232dfc0
Addit
Jun 21, 2026
27364e5
err
Jun 22, 2026
85823bc
asd
Jun 22, 2026
0dae544
UpdateTM1
Jun 23, 2026
c42a374
MoreWork
Jun 23, 2026
817b8a9
Addit
Jun 23, 2026
01a164c
blergh
Jun 23, 2026
f86df3a
move
Jun 23, 2026
d9995df
More
Jun 23, 2026
29a5cf7
Addit
Jun 24, 2026
8debaa2
More
Jun 24, 2026
dad3b9b
Addit
Jun 24, 2026
7a0cea1
AestheticEast
Jun 24, 2026
a27893d
map
Jun 24, 2026
7142e37
FirstChanges
Jun 24, 2026
f5e9d20
Addit
Jun 24, 2026
3156c5a
Flooring
Jun 24, 2026
938382f
testFeedbackNew
Jun 25, 2026
0d797a5
ergo
Jun 25, 2026
b9b8321
Ship
Jun 25, 2026
116a2c1
roof
Jun 25, 2026
ec73bfd
area
Jun 25, 2026
af528a0
minor
Jun 25, 2026
b84dc38
Comms
Jun 26, 2026
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 @@ -42,6 +42,7 @@
#define MAP_NEW_VARADERO "New Varadero"//ice colony underground but as its own map
#define MAP_TYRARGO_RIFT "Tyrargo Rift"
#define MAP_WHITE_ANTRE_RESEARCH_FACILITY "White Antre Research Facility"
#define MAP_LV1021_FALCONS_FURY "LV-1021: Operation Falcon's Fury"
#define MAP_CHINOOK "Chinook 91 GSO" //admin level
#define MAP_ROSTOCK "SSV Rostock" //UPP Warship
#define MAP_HUNTERSHIP "Hunter Ship"
Expand Down
34 changes: 34 additions & 0 deletions code/defines/procs/announcement.dm
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#define CLF_COMMAND_ANNOUNCE "CLF Command Announcement"
#define PMC_COMMAND_ANNOUNCE "PMC Command Announcement"
#define VENIR_ANNOUNCE "White Antre Central Announcement"
#define CLF_ANNOUNCE "CLF Camp Coordinator Announcement"
#define QUEEN_ANNOUNCE "The words of the Queen reverberate in your head..."
#define QUEEN_LORE_ANNOUNCE "The words of the Queen reverberate in your head..."
#define QUEEN_MOTHER_ANNOUNCE "Queen Mother Psychic Directive"
Expand Down Expand Up @@ -42,6 +43,39 @@

announcement_helper(message, title, targets, sound_to_play)

//CLF announcement
/proc/clf_announcement(message, title = CLF_ANNOUNCE, sound_to_play = sound('sound/misc/notice2.ogg'), faction_to_display = FACTION_CLF)
var/list/targets = GLOB.human_mob_list + GLOB.dead_mob_list
if(faction_to_display == FACTION_CLF)
for(var/mob/M in targets)
if(isobserver(M)) //observers see everything
continue
var/mob/living/carbon/human/H = M
if(!istype(H) || H.stat != CONSCIOUS || isyautja(H) || ismarinejob(H) || is_mainship_level(H.z)) //base human checks
targets.Remove(H)
continue

else if(faction_to_display == "Everyone (-Yautja)")
for(var/mob/M in targets)
if(isobserver(M)) //observers see everything
continue
var/mob/living/carbon/human/H = M
if(!istype(H) || H.stat != CONSCIOUS || isyautja(H))
targets.Remove(H)

else
for(var/mob/M in targets)
if(isobserver(M)) //observers see everything
continue
var/mob/living/carbon/human/H = M
if(!istype(H) || H.stat != CONSCIOUS || isyautja(H) || ismarinejob(H))
targets.Remove(H)
continue
if(H.faction != faction_to_display)
targets.Remove(H)

announcement_helper(message, title, targets, sound_to_play)

//xenomorph hive announcement
/proc/xeno_announcement(message, hivenumber, title = QUEEN_ANNOUNCE)
var/list/targets = GLOB.living_xeno_list + GLOB.dead_mob_list
Expand Down
229 changes: 229 additions & 0 deletions code/game/area/LV1021_Falcons_Fury.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,229 @@
//LV-1021: Operation Falcon's Fury Areas//

/area/lv1021
// name = "LV-1021"
icon_state = "tutorial"
can_build_special = TRUE
powernet_name = "ground"
minimap_color = MINIMAP_AREA_COLONY
temperature = TROPICAL_TEMP

//parent types

/area/lv1021/indoors
name = "LV-1021 - Indoors"
icon_state = "unknown"
ceiling = CEILING_METAL
soundscape_playlist = SCAPE_PL_LV759_INDOORS
ambience_exterior = AMBIENCE_JUNGLE_ALT
ceiling_muffle = FALSE
base_muffle = -1000

/area/lv1021/outdoors
name = "LV-1021 - Outdoors"
icon_state = "unknown"
ceiling = CEILING_NONE
ambience_exterior = AMBIENCE_JUNGLE_ALT

/area/lv1021/oob
name = "Out Of Bounds"
icon_state = "unknown"
ceiling = CEILING_MAX
is_resin_allowed = FALSE
flags_area = AREA_NOTUNNEL|AREA_NOBURROW
minimap_color = MINIMAP_AREA_OOB
requires_power = FALSE

//Landing Zone

/area/lv1021/landing_zone_1
name = "LV-1021 - North-West Landing Zone"
icon_state = "shuttlered2"
is_landing_zone = TRUE
minimap_color = MINIMAP_AREA_LZ
linked_lz = DROPSHIP_LZ1
soundscape_playlist = SCAPE_PL_LV759_INDOORS
ambience_exterior = AMBIENCE_JUNGLE_ALT

/area/lv1021/landing_zone_1/ceiling
ceiling = CEILING_METAL

/area/lv1021/landing_zone_2
name = "LV-1021 - Southern Landing Zone"
icon_state = "shuttlered2"
is_landing_zone = TRUE
minimap_color = MINIMAP_AREA_LZ
linked_lz = DROPSHIP_LZ2
soundscape_playlist = SCAPE_PL_LV759_INDOORS
ambience_exterior = AMBIENCE_JUNGLE_ALT

/area/lv1021/landing_zone_2/ceiling
ceiling = CEILING_SANDSTONE_ALLOW_CAS

// Comms

/area/lv1021/outdoors/comms
name = "LV-1021 - Communications"
icon_state = "server"
minimap_color = MINIMAP_AREA_CELL_MED

/area/lv1021/outdoors/comms/west_2
name = "LV-1021 - West Jungle - External Communications"

/area/lv1021/outdoors/comms/south_2
name = "LV-1021 - Central Jungle - External Communications"

/area/lv1021/outdoors/comms/north_1
name = "LV-1021 - CLF Camp - Tertiary Communications"

/area/lv1021/outdoors/comms/north_west_1
name = "LV-1021 - CLF Camp - Primary Communications"
ceiling = CEILING_METAL
soundscape_playlist = SCAPE_PL_LV759_INDOORS
ambience_exterior = AMBIENCE_JUNGLE_ALT
ceiling_muffle = FALSE
base_muffle = -1000

//Exterior Areas

// --

/area/lv1021/outdoors/jungle
name = "LV-1021 - Jungle"
icon_state = "green"
minimap_color = MINIMAP_AREA_JUNGLE
// requires_power = FALSE

/area/lv1021/outdoors/jungle/jungleW_north
icon_state = "north"
name = "LV-1021 - West Jungle - North"
linked_lz = DROPSHIP_LZ1

/area/lv1021/outdoors/jungle/jungleW_south
icon_state = "south"
name = "LV-1021 - West Jungle - South"

// --

/area/lv1021/outdoors/jungle/jungleC_clf_n
icon_state = "north"
name = "LV-1021 - CLF Camp - North"

/area/lv1021/outdoors/jungle/jungleC_clf_e
icon_state = "east"
name = "LV-1021 - CLF Camp - East"

/area/lv1021/outdoors/jungle/jungleC_mid
icon_state = "central"
name = "LV-1021 - Central Jungle - Central"

/area/lv1021/outdoors/jungle/jungleC_south
icon_state = "south"
name = "LV-1021 - Central Jungle - South"
linked_lz = DROPSHIP_LZ2

/area/lv1021/outdoors/jungle/jungleC_south_west
icon_state = "southwest"
name = "LV-1021 - Central Jungle - South-West"
linked_lz = DROPSHIP_LZ2

/area/lv1021/outdoors/jungle/jungleC_n_e
icon_state = "northeast"
name = "LV-1021 - Central Jungle - North-East"
unoviable_timer = FALSE

/area/lv1021/outdoors/jungle/jungleC_e
icon_state = "east"
name = "LV-1021 - Central Jungle - East"
unoviable_timer = FALSE

/area/lv1021/outdoors/jungle/jungleC_s_e
icon_state = "southeast"
name = "LV-1021 - Central Jungle - South-East"
unoviable_timer = FALSE

// --

/area/lv1021/outdoors/river
icon_state = "blue2"
name = "LV-1021 - River"
requires_power = FALSE

/area/lv1021/outdoors/river/central_north
name = "LV-1021 - Central River - North"

/area/lv1021/outdoors/river/central_south
name = "LV-1021 - Central River - South"

/area/lv1021/outdoors/river/central_lagoon
name = "LV-1021 - Central River - Lagoon"
flags_area = AREA_NOTUNNEL|AREA_NOBURROW

/area/lv1021/outdoors/river/east_river
name = "LV-1021 - East River"

//Interior Areas

// --

/area/lv1021/indoors/clf_camp
name = "LV-1021 - CLF Camp"
icon_state = "centcom"

/area/lv1021/indoors/clf_camp/coordinator
name = "LV-1021 - CLF Camp - Coordinators Cabin"
minimap_color = MINIMAP_AREA_COMMAND

/area/lv1021/indoors/clf_camp/ancil_n
name = "LV-1021 - CLF Camp - North Ancillery Cabins"
minimap_color = MINIMAP_AREA_MEDBAY

/area/lv1021/indoors/clf_camp/education
name = "LV-1021 - CLF Camp - Educational Cabin"
minimap_color = MINIMAP_AREA_MINING

/area/lv1021/indoors/clf_camp/landing
name = "LV-1021 - CLF Camp - Resupply and Landing Cabin"
minimap_color = MINIMAP_AREA_ENGI

/area/lv1021/indoors/clf_camp/ancil_e
name = "LV-1021 - CLF Camp - East Ancillery Cabins"
minimap_color = MINIMAP_AREA_MEDBAY

/area/lv1021/indoors/clf_camp/ancil_s
name = "LV-1021 - CLF Camp - South Ancillery Cabin"
minimap_color = MINIMAP_AREA_MEDBAY

/area/lv1021/indoors/clf_camp/ancil_se
name = "LV-1021 - CLF Camp - South-East Ancillery Cabin"
minimap_color = MINIMAP_AREA_MEDBAY

// --

//Cave Areas

/area/lv1021/indoors/caves
name = "Caves"
icon_state = "cave"
ceiling = CEILING_UNDERGROUND_BLOCK_CAS
soundscape_playlist = SCAPE_PL_LV759_DEEPCAVES
ceiling_muffle = FALSE
minimap_color = MINIMAP_AREA_HYBRISACAVES
unoviable_timer = FALSE

/area/lv1021/indoors/caves/landing_zone
name = "LV-1021 - Cave - Landing Zone 2"
unoviable_timer = TRUE
ceiling = CEILING_UNDERGROUND_ALLOW_CAS

/area/lv1021/indoors/caves/landing_zone/weedkiller
linked_lz = DROPSHIP_LZ2

/area/lv1021/indoors/caves/clf_tunnel
name = "LV-1021 - CLF Tunnel"

/area/lv1021/indoors/caves/cave_north
name = "LV-1021 - Eastern Cave - North"

/area/lv1021/indoors/caves/cave_south
name = "LV-1021 - Eastern Cave - South"
3 changes: 3 additions & 0 deletions code/game/gamemodes/colonialmarines/colonialmarines.dm
Original file line number Diff line number Diff line change
Expand Up @@ -486,6 +486,9 @@
addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(xeno_announcement), "My children. I sense the hostile, putrid, hive has fled this area, but some of the hosts that entrapped you remain alive within this metal complex, and I sense even more are on their way. Defeat these hosts to showcase your supremacy!", "everything", QUEEN_MOTHER_ANNOUNCE), 165 SECONDS)
if(MAP_LV_624)
addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(marine_announcement), "Attention: Initial scan over the Area of Operations indicates a localized atmospheric anomaly: a dense fog forming over in and around the river bed.\nInitial assessment algorithm predicts dissipation in T-20 minutes.", "ARES V3.2", 'sound/AI/commandreport.ogg'), 5 MINUTES) // 5 minute lobby + 5 minutes into the game means the fog drops 20 minutes from now.
if(MAP_LV1021_FALCONS_FURY)
addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(marine_announcement), "Falcons, this is Snake Eaters, FORECON, we have completed our recon of the site. We have identified two viable LZs.\n\nLZ1 is north-west of the camp. The LZ is fairly open with a river to the east which you'll have to cross. We've eliminated all CLF active near this LZ for you.\n\nLZ2 is located to the south. It is on the same side of the river as the camp and is better protected. However, it is exposed to infiltration from the west and east.\n\n Caution, we've also noticed traps in the undergrowth.\n\nGood luck Falling Falcons. Pay them back for Tychon.", "Snake Eaters Platoon Commander", 'sound/AI/commandreport.ogg'), 3 MINUTES)
addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(clf_announcement), "Fighters, this is the camp coordinator, arm up! Alien bugs are pouring out of the jungle and just killed the team I sent to the east and I’ve lost contact with our fighters west of the river. Drop whatever you are doing and secure whatever weapons and supplies you can find. We are under siege! Prepare to defend the camp at all costs!", "CLF Camp Coordinator", 'sound/AI/commandreport.ogg'), 5 SECONDS)

//This is processed each tick, but check_win is only checked 5 ticks, so we don't go crazy with scanning for mobs.
/datum/game_mode/colonialmarines/process()
Expand Down
41 changes: 41 additions & 0 deletions code/game/objects/effects/decals/strata_decals.dm
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,47 @@
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
keep_as_object = TRUE

/obj/effect/decal/lv_decals
icon = 'icons/turf/floors/auto_lv_turf.dmi'
icon_state = "grass_0_mud_alt_innercorner"
icon_state = "grass_0_mud_alt_innercorner"
name = "mud"
desc = null
layer = TURF_LAYER
anchored = TRUE

/obj/effect/decal/lv_decals/cave_mud_corner
icon = 'icons/turf/floors/auto_lv_turf.dmi'
icon_state = "grass_0_mud_alt_innercorner"
name = "mud"
desc = null
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
keep_as_object = TRUE

/obj/effect/decal/lv_decals/red_mud_corner
icon = 'icons/turf/floors/auto_lv_turf.dmi'
icon_state = "varadero_innercorner"
name = "mud"
desc = null
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
keep_as_object = TRUE

/obj/effect/decal/lv_decals/grass_inner_corner
icon = 'icons/turf/floors/auto_lv_turf.dmi'
icon_state = "alt_grass_innercorner"
name = "grass"
desc = null
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
keep_as_object = TRUE

/obj/effect/decal/lv_decals/grass_outer_corner
icon = 'icons/turf/floors/auto_lv_turf.dmi'
icon_state = "alt_grass_outercorner"
name = "grass"
desc = null
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
keep_as_object = TRUE

////////////////INDOORS STUFF////////////////////

/obj/effect/decal/strata_decals/grime
Expand Down
8 changes: 8 additions & 0 deletions code/game/objects/effects/landmarks/corpsespawner.dm
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,14 @@
name = "Colonial Liberation Front Soldier"
equip_path = /datum/equipment_preset/corpse/clf

/obj/effect/landmark/corpsespawner/clf/lv1021
name = "LV1021 - Colonial Liberation Front Soldier"
equip_path = /datum/equipment_preset/corpse/clf_lv1021

/obj/effect/landmark/corpsespawner/clf/veteran
name = "LV1021 - Colonial Liberation Front Veteran"
equip_path = /datum/equipment_preset/corpse/clf_veteran

/obj/effect/landmark/corpsespawner/clf/burst
name = "Burst Colonial Liberation Front Soldier"
equip_path = /datum/equipment_preset/corpse/clf/burst
Expand Down
Loading