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

[MDB IGNORE][Feel Free To TM] LV522 Chances Claim & Lukes Landing Megamap #664

Draft
wants to merge 65 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
65 commits
Select commit Hold shift + click to select a range
9153b75
A
spartanbobby Dec 1, 2024
b576894
Fireshutters :\
spartanbobby Dec 1, 2024
7a0b51b
Idk what this commit is
spartanbobby Dec 1, 2024
c38582e
Test
spartanbobby Dec 2, 2024
560ecc5
a
spartanbobby Dec 2, 2024
9ff3f01
Merge remote-tracking branch 'dev/master' into Dark_Decent
spartanbobby Dec 2, 2024
33ad5e8
this?
spartanbobby Dec 2, 2024
662b643
Final Expand
spartanbobby Dec 2, 2024
8bb04a1
a
spartanbobby Dec 2, 2024
0e5547c
test
spartanbobby Dec 3, 2024
5fae9c8
FUUUUUUUUUUUUUUUCK YOU VAAAAAAAAAAAAAAAAAR EDIT LIIIIIIIIIIIIITNER
spartanbobby Dec 3, 2024
2681eac
a
spartanbobby Dec 3, 2024
05ab757
"Complete"
spartanbobby Dec 3, 2024
a36973a
Forgot 1 thing gg
spartanbobby Dec 3, 2024
7b0567f
Holy shit I am so stupid
spartanbobby Dec 3, 2024
4eeb6e1
Better mining
spartanbobby Dec 3, 2024
46ada80
Map Table, Admin
spartanbobby Dec 3, 2024
03c63c4
Merge remote-tracking branch 'dev/master' into Dark_Decent
spartanbobby Dec 3, 2024
66f8dc0
T-comms prop area
spartanbobby Dec 3, 2024
29f0f1f
Area broken
spartanbobby Dec 3, 2024
9c75620
a
spartanbobby Dec 3, 2024
672b469
More detail in the colony streets
spartanbobby Dec 3, 2024
33e1fbe
Fixes weird lighting interaction, fixes lack of APC for mining outski…
spartanbobby Dec 3, 2024
968c1b0
Replaces comms relay prop with something marines could fix, adds more…
spartanbobby Dec 4, 2024
219d839
Missing lighting
spartanbobby Dec 4, 2024
387d434
Decal fix
spartanbobby Dec 4, 2024
6402a94
Merge remote-tracking branch 'dev/master' into Dark_Decent
spartanbobby Dec 18, 2024
8365c3e
Merge branch 'master' into Dark_Decent
spartanbobby Dec 19, 2024
31c591a
Merge branch 'master' into Dark_Decent
spartanbobby Dec 23, 2024
3a55489
Merge branch 'master' into Dark_Decent
spartanbobby Jan 2, 2025
77d352a
Merge branch 'master' into Dark_Decent
spartanbobby Jan 3, 2025
bd57f1e
a
spartanbobby Jan 7, 2025
2d1e1ef
a
spartanbobby Jan 8, 2025
e5ef8ac
Merge branch 'Dark_Decent' into big522
spartanbobby Jan 8, 2025
b5e0eb5
BIG
spartanbobby Jan 8, 2025
6b2c1b4
a
spartanbobby Jan 8, 2025
8cbf054
Merge remote-tracking branch 'dev/master' into big522
spartanbobby Jan 9, 2025
cac6158
a
spartanbobby Jan 10, 2025
95dd5c1
a
spartanbobby Jan 11, 2025
90c40b2
a
spartanbobby Jan 11, 2025
745dde7
A
spartanbobby Jan 12, 2025
b791b29
TAGS?
spartanbobby Jan 12, 2025
6905c5a
BANNED STACKING
spartanbobby Jan 12, 2025
1da1bf6
a\
spartanbobby Jan 12, 2025
813c508
walls in doors
spartanbobby Jan 12, 2025
04d7518
a
spartanbobby Jan 12, 2025
e2cf241
a
spartanbobby Jan 12, 2025
9dabb65
mn
spartanbobby Jan 12, 2025
d25ac72
critical bug fix
spartanbobby Jan 12, 2025
7768e67
YES
spartanbobby Jan 13, 2025
adc106f
Weewap
spartanbobby Jan 14, 2025
66c7681
teleport
spartanbobby Jan 14, 2025
336454e
aaa
spartanbobby Jan 15, 2025
fffa6af
a
spartanbobby Jan 15, 2025
419b944
a
spartanbobby Jan 15, 2025
8a45379
fix?
spartanbobby Jan 15, 2025
4278f14
bewarpowarp Aweebaba
spartanbobby Jan 15, 2025
c47823a
Merge remote-tracking branch 'dev/master' into big522
spartanbobby Jan 15, 2025
fb6ca84
pra zooooiebabe weeeebapoppp WORBY
spartanbobby Jan 15, 2025
62e05fd
Aweeeee babwooooobawaaaba
spartanbobby Jan 17, 2025
609843c
Waeeeeeeeeeerrrrrrrrrrffffffffff
spartanbobby Jan 17, 2025
8f2092d
aaa
spartanbobby Jan 18, 2025
1ea0887
sueweeelaboba
spartanbobby Jan 18, 2025
a907168
aa
spartanbobby Jan 19, 2025
6ffee03
APC
spartanbobby Jan 19, 2025
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/__DEFINES/__game.dm
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@
#define MAP_NEW_VARADERO_REPAIRED "New Varadero Repaired"
#define MAP_CHINOOK "Chinook 91 GSO" //admin level
#define MAP_DERELICT_ALMAYER "Derelict Almayer"
#define MAP_LV522_LUKES_LANDING "LV-522 Lukes Landing"
#define MAP_LV522_CHANCES_CLAIM_LUKES_LANDING "LV-522 Chances Claim & Lukes Landing"

#define GAMEMODE_WHISKEY_OUTPOST "Whiskey Outpost"
#define GAMEMODE_HIVE_WARS "Hive Wars"
Expand Down
7 changes: 7 additions & 0 deletions code/datums/weather/weather_events/lv522_lukes_landing.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
/datum/weather_event/heavy_rain/lv522_lukes_landing
name = "LV522 Heavy Rain"
display_name = "Rain Storm"
length = 3 HOURS
lightning_chance = 4

fire_smothering_strength = 2
19 changes: 19 additions & 0 deletions code/datums/weather/weather_map_holders/lv522_lukes_landing.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
/datum/weather_ss_map_holder/lv522_lukes_landing
name = "LV-522 Lukes Landing Map Holder"

warn_time = 1 MINUTES
min_time_between_events = 1 MINUTES
min_time_between_checks = 0
min_check_variance = 0

no_weather_turf_icon_state = "strata_clearsky"

potential_weather_events = list(
/datum/weather_event/heavy_rain/lv522_lukes_landing,
)

/datum/weather_ss_map_holder/lv522_lukes_landing/should_affect_area(area/A)
return !CEILING_IS_PROTECTED(A.ceiling, CEILING_GLASS)

/datum/weather_ss_map_holder/lv522_lukes_landing/should_start_event()
return TRUE
36 changes: 36 additions & 0 deletions code/game/area/LV522_Chances_Claim.dm
Original file line number Diff line number Diff line change
Expand Up @@ -475,3 +475,39 @@
name = "Atmospheric Processor - Garage"
icon_state = "green"
ceiling = CEILING_UNDERGROUND_METAL_BLOCK_CAS

//Megamap

/area/lv522/indoors/garrison
name = "LV522 - Colonial Garrison Canteen"
icon_state = "green"

/area/lv522/indoors/garrison/storage
name = "LV522 - Colonial Garrison Storage"
icon_state = "red"

/area/lv522/indoors/garrison/barracks
name = "LV522 - Colonial Garrison Barracks"
icon_state = "blue"

/area/lv522/indoors/garrison/gas
name = "LV522 - Barrens Gas Station"
icon_state = "blue"

/area/lv522/indoors/garrison/engi
name = "LV522 - Colonial Garrison Engineering Prefab"
icon_state = "yellow"

/area/lv522/outdoors/garrison/
name = "LV522 - Colonial Garrison Comms Relay"
icon_state = "yellow"

/area/lv522/basement
name = "Chances Claim - Underground"
icon_state = "cliff_blocked"
ceiling = CEILING_REINFORCED_METAL

/area/lv522/basement/colony
name = "Chances Claim - Colony Sublevel"
icon_state = "red"
requires_power = FALSE
110 changes: 110 additions & 0 deletions code/game/area/LV522_Lukes_Landing.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
//lv522 AREAS--------------------------------------//

/area/lv522_l_l
icon_state = "lv-626"
can_build_special = TRUE
powernet_name = "ground"
minimap_color = MINIMAP_AREA_COLONY

//parent types

/area/lv522_l_l/indoors
name = "Lukes Landing - Indoors"
icon_state = "cliff_blocked" //because this is a PARENT TYPE and you should not be using it and should also be changing the icon!!!
ceiling = CEILING_METAL
soundscape_playlist = SCAPE_PL_LV522_INDOORS


/area/lv522_l_l/outdoors
name = "Lukes Landing - Outdoors"
icon_state = "cliff_blocked" //because this is a PARENT TYPE and you should not be using it and should also be changing the icon!!!
ceiling = CEILING_NONE
soundscape_playlist = SCAPE_PL_LV522_OUTDOORS

/area/lv522_l_l/basement
name = "Lukes Landing - Underground"
icon_state = "cliff_blocked"
ceiling = CEILING_REINFORCED_METAL

//Colony

/area/lv522_l_l/indoors/corporate
name = "A Block - Corporate"
icon_state = "blue"
minimap_color = MINIMAP_AREA_COMMAND

/area/lv522_l_l/indoors/canteen
name = "B Block - Canteen"
icon_state = "green"

/area/lv522_l_l/indoors/clinic
name = "B Block - Clinic"
icon_state = "medbay"
minimap_color = MINIMAP_AREA_MEDBAY

/area/lv522_l_l/indoors/storage
name = "B Block - Storage"
icon_state = "storage"

/area/lv522_l_l/indoors/sec
name = "B Block - Office Of Colonial Marshals"
icon_state = "head_quarters"
minimap_color = MINIMAP_AREA_SEC

/area/lv522_l_l/indoors/slaughterhouse
name = "D Block - Slaughterhouse"
icon_state = "kitchen"

/area/lv522_l_l/indoors/engineering
name = "B Block - Engineering Storehouse"
icon_state = "yellow"
minimap_color = MINIMAP_AREA_ENGI

/area/lv522_l_l/indoors/dorms
name = "C Block - Dorms"
icon_state = "purple"

/area/lv522_l_l/indoors/airtraffic
name = "D Block - Air Traffic Tower"
icon_state = "blue"

/area/lv522_l_l/indoors/mining
name = "LV522 Lukes Landing - Colony Outskirts - Mining"
icon_state = "blue"

//Colony Outside

/area/lv522_l_l/outdoors/engineering
name = "Outdoors - Engineering Storehouse"
icon_state = "mechbay"
minimap_color = MINIMAP_AREA_ENGI

/area/lv522_l_l/outdoors/colony
name = "LV522 Lukes Landing - Colony Interior"
icon_state = "east"

/area/lv522_l_l/outdoors/comms_relay
name = "LV522 Colony Outskirts - Communications Relay"
icon_state = "blue"

/area/lv522_l_l/outdoors/mining
name = "LV522 Colony Outskirts - Mining"
icon_state = "blue"

//colony outskirts

/area/lv522_l_l/outdoors/colony_outskirts
name = "LV522 - Barrens"
icon_state = "west"

//Basement

/area/lv522_l_l/basement/colony
name = "Lukes Landing - Colony Sublevel"
icon_state = "red"
requires_power = FALSE

/area/lv522_l_l/basement/mine
name = "LV522 - Location indeterminate"
icon_state = "blue"
requires_power = FALSE
22 changes: 22 additions & 0 deletions code/game/objects/structures/props.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1216,3 +1216,25 @@
mouse_opacity = 0
layer = 6
density = 0

/obj/structure/prop/invuln/prop_fog //scary fog effect for cool scary places pick from these 3 see what works better for ur area
name = "Fog Prop"
icon = 'icons/effects/effects.dmi'
icon_state = "smoke"
layer = 6 //above marines and other stuff
density = 0
mouse_opacity = 0
opacity = 0

/obj/structure/prop/invuln/prop_fog/smoke
name = "Smoke Prop"
icon = 'icons/effects/96x96.dmi'
icon_state = "smoke"
pixel_x = -29
pixel_y = -29
layer = 6.1

/obj/structure/prop/invuln/prop_fog/mist
name = "Mist Prop"
icon = 'icons/obj/structures/props/watercloset.dmi'
icon_state = "mist"
2 changes: 2 additions & 0 deletions code/modules/cm_marines/equipment/maps.dm
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,8 @@ GLOBAL_LIST_INIT_TYPED(map_type_list, /obj/item/map, setup_all_maps())
MAP_NEW_VARADERO = new /obj/item/map/new_varadero(),
MAP_NEW_VARADERO_REPAIRED = new /obj/item/map/new_varadero(),
MAP_DERELICT_ALMAYER = new /obj/item/map/almayer(),
MAP_LV522_LUKES_LANDING = new /obj/item/map/lv522_map(),
MAP_LV522_CHANCES_CLAIM_LUKES_LANDING = new /obj/item/map/lv522_map()
)

//used by marine equipment machines to spawn the correct map.
Expand Down
3 changes: 3 additions & 0 deletions colonialmarines.dme
Original file line number Diff line number Diff line change
Expand Up @@ -725,12 +725,14 @@
#include "code\datums\weather\weather_events\faction_clash.dm"
#include "code\datums\weather\weather_events\long.dm"
#include "code\datums\weather\weather_events\lv522_chances_claim.dm"
#include "code\datums\weather\weather_events\lv522_lukes_landing.dm"
#include "code\datums\weather\weather_events\lv624.dm"
#include "code\datums\weather\weather_events\new_varadero.dm"
#include "code\datums\weather\weather_events\sorokyne.dm"
#include "code\datums\weather\weather_map_holders\big_red.dm"
#include "code\datums\weather\weather_map_holders\faction_clash.dm"
#include "code\datums\weather\weather_map_holders\lv522_chances_claim.dm"
#include "code\datums\weather\weather_map_holders\lv522_lukes_landing.dm"
#include "code\datums\weather\weather_map_holders\lv624.dm"
#include "code\datums\weather\weather_map_holders\new_varadero.dm"
#include "code\datums\weather\weather_map_holders\shivas_snowball.dm"
Expand Down Expand Up @@ -771,6 +773,7 @@
#include "code\game\area\IceColony.dm"
#include "code\game\area\kutjevo.dm"
#include "code\game\area\LV522_Chances_Claim.dm"
#include "code\game\area\LV522_Lukes_Landing.dm"
#include "code\game\area\LV624.dm"
#include "code\game\area\prison.dm"
#include "code\game\area\Prison_Station_FOP.dm"
Expand Down
6 changes: 6 additions & 0 deletions map_config/maps.txt
Original file line number Diff line number Diff line change
Expand Up @@ -73,3 +73,9 @@ endmap

map whiskey_outpost_v2
endmap

map lv522_chances_claim_lukes_landing
endmap

map lv522_lukes_landing
endmap
10 changes: 10 additions & 0 deletions maps/lv522_chances_claim_lukes_landing.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"map_name": "LV-522 Chances Claim & Lukes Landing",
"short_name": "Chances Claim & Lukes Landing",
"map_path": "map_files/LV522_Chances_Claim_Lukes_Landing",
"map_file": "LV522_Chances_Claim_Lukes_Landing.dmm",
"webmap_url": "LV552",
"weather_holder": "/datum/weather_ss_map_holder/lv522_lukes_landing",
"map_item_type": "/obj/item/map/lv522_map",
"camouflage": "jungle"
}
14 changes: 14 additions & 0 deletions maps/lv522_lukes_landing.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"map_name": "LV-522 Lukes Landing",
"short_name": "Lukes Landing",
"map_path": "map_files/LV522_Lukes_Landing",
"map_file": "LV522_Lukes_Landing.dmm",
"webmap_url": "LV552",

"weather_holder": "/datum/weather_ss_map_holder/lv522_lukes_landing",

"map_item_type": "/obj/item/map/lv522_map",

"camouflage": "jungle"

}
Loading
Loading