Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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_FORT_MCNEIL "Fort McNeil"
#define MAP_CHINOOK "Chinook 91 GSO" //admin level
#define MAP_ROSTOCK "SSV Rostock" //UPP Warship
#define MAP_HUNTERSHIP "Hunter Ship"
Expand Down
266 changes: 266 additions & 0 deletions code/game/area/Fort_NcNeil.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,266 @@
//Fort McNeil Areas//

/area/fort_mcneil
// name = "Fort McNeil"
icon_state = "tutorial"
can_build_special = TRUE
powernet_name = "ground"
minimap_color = MINIMAP_AREA_COLONY

//parent types

/area/fort_mcneil/indoors
name = "Fort McNeil - Indoors"
icon_state = "unknown"
ceiling = CEILING_METAL
soundscape_playlist = SCAPE_PL_LV522_INDOORS

/area/fort_mcneil/outdoors
name = "Fort McNeil - Outdoors"
icon_state = "unknown"
ceiling = CEILING_NONE
soundscape_playlist = SCAPE_PL_LV522_OUTDOORS

/area/fort_mcneil/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
ambience_exterior = AMBIENCE_TYRARGO_CITY

//Landing Zone

/area/fort_mcneil/landing_zone_1
name = "Fort McNeil - Landing Zone"
icon_state = "shuttlered2"
is_landing_zone = TRUE
minimap_color = MINIMAP_AREA_LZ
linked_lz = DROPSHIP_LZ1

/area/fort_mcneil/landing_zone_1/ceiling
ceiling = CEILING_METAL

//Exterior Areas

// --

/area/fort_mcneil/outdoors/road
name = "Outskirts Road"
icon_state = "shuttle"
minimap_color = MINIMAP_AREA_SHIP
requires_power = FALSE

/area/fort_mcneil/outdoors/road/south
name = "Outskirts Road - South"
linked_lz = DROPSHIP_LZ1

/area/fort_mcneil/outdoors/road/central
name = "Outskirts Road - Central"

/area/fort_mcneil/outdoors/road/north
name = "Outskirts Road - North"

// --

/area/fort_mcneil/outdoors/scrublands
name = "Scrublands"
icon_state = "green"
minimap_color = MINIMAP_SNOW
requires_power = FALSE

/area/fort_mcneil/outdoors/scrublands/south
name = "Scrublands - South"
icon_state = "south"
linked_lz = DROPSHIP_LZ1

/area/fort_mcneil/outdoors/scrublands/central
icon_state = "central"
name = "Scrublands - Central"

/area/fort_mcneil/outdoors/scrublands/north
icon_state = "north"
name = "Scrublands - North"

// --

/area/fort_mcneil/outdoors/colony_exterior
name = "Fort McNeil Exterior"
icon_state = "green"
minimap_color = MINIMAP_ICE
requires_power = FALSE

/area/fort_mcneil/outdoors/colony_exterior/south
name = "Fort McNeil Exterior - South"
icon_state = "south"

/area/fort_mcneil/outdoors/colony_exterior/south_east
name = "Fort McNeil Exterior - South-East"
icon_state = "southeast"

/area/fort_mcneil/outdoors/colony_exterior/south_west
name = "Fort McNeil Exterior - South-West"
icon_state = "southwest"

/area/fort_mcneil/outdoors/colony_exterior/central
icon_state = "central"
name = "Fort McNeil Exterior - Central"

/area/fort_mcneil/outdoors/colony_exterior/north
icon_state = "north"
name = "Fort McNeil Exterior - North"

/area/fort_mcneil/outdoors/colony_exterior/north_east
icon_state = "northeast"
name = "Fort McNeil Exterior - North-East"

/area/fort_mcneil/outdoors/colony_exterior/north_west
icon_state = "northwest"
name = "Fort McNeil Exterior - North-West"

/area/fort_mcneil/outdoors/colony_exterior/west
icon_state = "west"
name = "Fort McNeil Exterior - West"

/area/fort_mcneil/outdoors/colony_exterior/east
icon_state = "east"
name = "Fort McNeil Exterior - East"

// --

/area/fort_mcneil/outdoors/comms
name = "Colony Exterior Communications - Exterior"
icon_state = "server"
minimap_color = MINIMAP_AREA_ENGI_CAVE
requires_power = FALSE

//Interior Areas

// --

/area/fort_mcneil/indoors/command
name = "Fort McNeil - Command and Control"
minimap_color = MINIMAP_AREA_COMMAND
ceiling = CEILING_UNDERGROUND_METAL_ALLOW_CAS
icon_state = "centcom"

// --

/area/fort_mcneil/indoors/engi
name = "Fort McNeil - Engineering"
minimap_color = MINIMAP_AREA_ENGI
icon_state = "engine"

// --

/area/fort_mcneil/indoors/hydro
name = "Fort McNeil - Hydroponics"
minimap_color = MINIMAP_AREA_JUNGLE
icon_state = "engine"

// --

/area/fort_mcneil/indoors/hydro
name = "Fort McNeil - Hydroponics"
minimap_color = MINIMAP_AREA_JUNGLE
icon_state = "hydro"

// --

/area/fort_mcneil/indoors/bar
name = "Fort McNeil - Bar"
minimap_color = MINIMAP_AREA_CONTESTED_ZONE
icon_state = "bar"

// --

/area/fort_mcneil/indoors/dorm
name = "Fort McNeil - Dormitory"
minimap_color = MINIMAP_AREA_RESEARCH
icon_state = "maint_dormitory"

// --

/area/fort_mcneil/indoors/connection_paths
name = "Fort McNeil - Hub Connection Hallways"
minimap_color = MINIMAP_AREA_ENGI_CAVE
icon_state = "dk_yellow"

// --

/area/fort_mcneil/indoors/mining
name = "Fort McNeil - Mining"
minimap_color = MINIMAP_AREA_ENGI
icon_state = "mining"

// --

/area/fort_mcneil/indoors/storage
name = "Fort McNeil - Storage"
minimap_color = MINIMAP_AREA_COLONY_SPACE_PORT
icon_state = "maint_cargo"

// --

/area/fort_mcneil/indoors/comms_inside
name = "Fort McNeil - Primary Communications"
minimap_color = MINIMAP_AREA_COLONY_ENGINEERING
icon_state = "engine"

/area/fort_mcneil/indoors/comms_outside
name = "Fort McNeil - Tertiary Communications"
minimap_color = MINIMAP_AREA_COLONY_ENGINEERING
icon_state = "engine"

// --

/area/fort_mcneil/indoors/toilet
name = "Fort McNeil - Lavatory"
minimap_color = MINIMAP_AREA_COLONY_RESANDCOM
icon_state = "bridge"

// --

/area/fort_mcneil/indoors/pod_1
name = "Fort McNeil - Ancillery Pod #1"
minimap_color = MINIMAP_AREA_HYBRISARESEARCH
icon_state = "bridge"

/area/fort_mcneil/indoors/pod_2
name = "Fort McNeil - Ancillery Pod #2"
minimap_color = MINIMAP_AREA_HYBRISARESEARCH
icon_state = "bridge"

/area/fort_mcneil/indoors/pod_3
name = "Fort McNeil - Ancillery Pod #3"
minimap_color = MINIMAP_AREA_HYBRISARESEARCH
icon_state = "bridge"

// --

//Cave Areas

// --

/area/fort_mcneil/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
always_unpowered = TRUE

/area/fort_mcneil/indoors/caves/north
name = "Caves - North"

/area/fort_mcneil/indoors/caves/central
name = "Caves - Central"

/area/fort_mcneil/indoors/caves/south
name = "Caves - South"

// --
5 changes: 5 additions & 0 deletions code/game/objects/structures/landing_signs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -113,3 +113,8 @@
name = "White Antre Research Facility"
desc = "A medium sized sign, designating this area as the White Antre Research Facility."
icon_state = "antre_sign_3"

/obj/structure/lz_sign/mcneil
name = "Fort McNeil - Colony Sign"
desc = "A small sign denoting this as the colony of Fort McNeil. The sign proclaims a population of 536, but a more recent lather of red paint has partially removed the 5."
icon_state = "antre_sign_2"
21 changes: 21 additions & 0 deletions code/game/objects/structures/props.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1168,6 +1168,27 @@
/obj/structure/prop/turret/missile
icon_state = "missile_platform"

// WY/Colonial RT-01

/obj/structure/prop/vehicles/tank/rt01
name = "\improper RT-01 Transport"
desc = "An eight-wheeled, armored, heavy exploration and transport vehicle."
icon = 'icons/obj/vehicles/rt01.dmi'
icon_state = "rt01_base"
density = FALSE
unslashable = TRUE
unacidable = TRUE
explo_proof = TRUE

/obj/structure/prop/vehicles/tank/rt01/wheels
icon_state = "wheels_0"

/obj/structure/prop/vehicles/tank/rt01/wheels/destroyed
icon_state = "wheels_1"

/obj/structure/prop/vehicles/tank/rt01/damaged_frame
icon_state = "damaged_frame"

//overhead prop sets

/obj/structure/prop/invuln/overhead
Expand Down
8 changes: 7 additions & 1 deletion code/modules/cm_marines/equipment/maps.dm
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,11 @@ GLOBAL_LIST_INIT(mapless_maps, list(MAP_RUNTIME, MAP_CHINOOK, MAIN_SHIP_DEFAULT_
html_link = "images/d/da/White_Antre_Research_Facility.png"
color = "cyan"

/obj/item/map/fort_mcneil
name = "\improper Fort McNeil map"
desc = "A labeled blueprint of Fort McNeil, a civilian colony."
html_link = "images/b/b5/Fort_McNeil.png"

/obj/item/map/galaxy
name = "\improper Galaxy map"
desc = "A diagrammatic map of the milky way, laid out by sector."
Expand All @@ -180,7 +185,8 @@ GLOBAL_LIST_INIT_TYPED(map_type_list, /obj/item/map, setup_all_maps())
MAP_LV759_HYBRISA_PROSPERA = new /obj/item/map/lv759_map(),
MAP_NEW_VARADERO = new /obj/item/map/new_varadero(),
MAP_TYRARGO_RIFT = new /obj/item/map/tyrargo_rift(),
MAP_WHITE_ANTRE_RESEARCH_FACILITY = new /obj/item/map/white_antre_map()
MAP_WHITE_ANTRE_RESEARCH_FACILITY = new /obj/item/map/white_antre_map(),
MAP_FORT_MCNEIL = new /obj/item/map/fort_mcneil()
)

//used by marine equipment machines to spawn the correct map.
Expand Down
1 change: 1 addition & 0 deletions colonialmarines.dme
Original file line number Diff line number Diff line change
Expand Up @@ -846,6 +846,7 @@
#include "code\game\area\chinook.dm"
#include "code\game\area\Corsat.dm"
#include "code\game\area\DesertDam.dm"
#include "code\game\area\Fort_NcNeil.dm"
#include "code\game\area\hijack.dm"
#include "code\game\area\IceColony.dm"
#include "code\game\area\kutjevo.dm"
Expand Down
Binary file modified icons/obj/structures/props/landing_signs.dmi
Binary file not shown.
Binary file added icons/obj/vehicles/rt01.dmi
Binary file not shown.
4 changes: 4 additions & 0 deletions map_config/maps.txt
Original file line number Diff line number Diff line change
Expand Up @@ -70,5 +70,9 @@ endmap
map white_antre_research_facility
endmap

map fort_mcneil
maxplayers 100
endmap

map whiskey_outpost_v2
endmap
6 changes: 6 additions & 0 deletions maps/Nightmare/maps/Fort_McNeil/nightmare.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[
{
"type": "map_sprinkle",
"path": "sprinkles/"
}
]
1 change: 1 addition & 0 deletions maps/Nightmare/maps/Fort_McNeil/scenario.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[]
Loading
Loading