-
Notifications
You must be signed in to change notification settings - Fork 932
Fort McNeil/Abyssal Combo Map [TM ONLY] [MDB IGNORE] #12693
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
Closed
Closed
Changes from all commits
Commits
Show all changes
119 commits
Select commit
Hold shift + click to select a range
8a4d601
InitalCommit
a5d13e1
Layering
9529e64
MaorChanges
217c945
SaveDesperate
146ae24
MorningProgress
64a123d
FinishedRoomDesign
62bbb8c
ComAm81AbyssalNameChange
7e0bc2d
Areas
622e7e3
UndoWhoops
4f7db11
GonzoAddit
e434928
MinorAreaChange
5b3af97
AdditWesternMapCodeAndSprites
881466c
WorkOnGoing
d648dd5
CLBriefAndMoreChanges
4fe98df
Misc
cf4d8af
Merge branch 'WorkMaster' into SpaceStationMap
7d5f91e
Addit
f33f987
FloorsAndMoreMapping
d73e2f9
ConAm
05bf113
ConAmAdditSign
e408b37
Fixes
d04ac74
Fixes2
f1cfb95
Fixe3
d9b725d
MoarFix
a5c9494
InitalHoldstate
c635403
Fixup maps in TGM format
9390a08
Maor
39e3f90
Tunnels
3c5391a
MoreAndMore
2c76afe
Addit
3d2a751
AddConsole
4f24674
AdditStuff
7fc526f
ReProp
9d5a010
SpritesGalore
c99fafb
blank
ae605fa
ChangesGalore
fdedd48
Anchor
6294df3
DiceAndRoles
993b581
NightmareAddit
545d6af
AdditChanges
2fe608d
MissedThing
f4ccd8c
MinorThing
51d4887
MinorMapChangeAndSprite
9307820
Ian
811033e
Merge branch 'WorkMaster' into SpaceStationMap
74b159a
FixUpTanks
d5eb873
Merge branch 'WorkMaster' into SpaceStationMap
6232e57
AnimalFix
001f3c6
SurvChange
b4f6af9
NewSolar
61e63e8
APC
846d059
Walls
a092610
SurvsMandatoryRoleplay
0d9377e
Merge branch 'WorkMaster' into SpaceStationMap
f7517e7
Merge branch 'WorkMaster' into SpaceStationMap
0344062
FixPower
6602665
Merge branch 'master' into SpaceStationMap
Steelpoint 177fe6f
Merge branch 'WorkMaster' into SpaceStationMap
d934e61
Merge branch 'WorkMaster' into SpaceStationMap
1115808
Merge branch 'master' into SpaceStationMap
Detective-Google ce52a4e
Merge branch 'WorkMaster' into SpaceStationMap
2b4a251
Merge branch 'master' into SpaceStationMap
Steelpoint c4d5095
Merge branch 'WorkMaster' into SpaceStationMap
1d6cfaf
Fixer
5e5d0e9
PopChange
4353b58
Suggested
3392a85
Merge branch 'WorkMaster' into SpaceStationMap
47a147f
Merge branch 'WorkMaster' into SpaceStationMap
56b17e9
LandingLight
359aa65
InitalCommit
cfec3b0
FortMcNeil
b2af737
InitalCommit
3347cbf
Areas
afb5c69
SmallTouch
93e3a92
RogueAPC
53e1f8a
WeedingTile
5d027d4
Pipes
6754b4d
TimeToSleep
bdb8723
Lights
ebe7732
MultiZRoofs
7f1b04c
JSON
038fbae
MoreWork
7eef0d0
RoomAddit
3cab750
Fog
91ad352
Save
95dbf89
Addit
8df0cc1
Guns
4700c2b
Map
7b9c65e
Power
d2fa0f6
Merge branch 'WorkMaster' into SpaceStationMap
d4d4539
Signs
68faf6c
Timer
48bd5ac
Sensor
44d95d4
FixArea
cf538f1
AdditHull
da30cb6
Hull
9e13aaa
More
e366162
Teleporter
070c074
Ergh
0aae9f8
Merge branch 'WorkMaster' into Fort_McNair
ce32926
Merge branch 'master' into Fort_McNair
279457b
Merge branch 'master' into SpaceStationMap
580a7c7
Merge branch 'master' into SpaceStationMap
168abc2
Merge branch 'master' into SpaceStationMap
1c0c4e7
Merge branch 'master' into SpaceStationMap
b3670c7
Conam
97b3aff
db
af7a998
addit
cba7d9b
Addit
5a6f975
FixRoof
246d0f5
Merge remote-tracking branch 'origin/SpaceStationMap' into LowpopCombo
48ac37e
yikes
5e8a703
Fix
32fa89b
Merge branch 'SpaceStationMap' into LowpopCombo
de9fd60
ChangeScrapeaway
d16cb3b
aaa
9f3ce4f
Merge branch 'Fort_McNair' into LowpopCombo
4a7af14
AbyssChanges
d8819bd
Merge branch 'SpaceStationMap' into LowpopCombo
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,237 @@ | ||
| //Abyssal Areas--------------------------------------// | ||
|
|
||
| /area/abyssal | ||
| name = "Con-Am 81 'Abyssal'" | ||
| icon = 'icons/turf/area_prison_v3_fiorina.dmi' | ||
| icon_state = "fiorina" | ||
| can_build_special = TRUE | ||
| temperature = T20C | ||
| powernet_name = "ground" | ||
| ceiling = CEILING_GLASS | ||
| minimap_color = MINIMAP_AREA_COLONY | ||
| ceiling_muffle = FALSE | ||
| unoviable_timer = FALSE | ||
|
|
||
| //parent types | ||
|
|
||
| /area/abyssal/interior | ||
| name = "Abyssal - Interior" | ||
| icon_state = "base_icon" | ||
| soundscape_playlist = SCAPE_ABYSSAL_INTERIOR | ||
| ambience_exterior = AMBIENCE_ALMAYER | ||
| soundscape_interval = 45 | ||
|
|
||
| /area/abyssal/exterior | ||
| name = "Abyssal - Exterior" | ||
| icon_state = "base_icon" | ||
| ceiling = CEILING_NONE | ||
| is_resin_allowed = FALSE | ||
| flags_area = AREA_NOTUNNEL|AREA_CONTAINMENT|AREA_UNWEEDABLE|AREA_NOBURROW | ||
| requires_power = FALSE | ||
| ambience_exterior = SCAPE_ABYSSAL_EXTERIOR | ||
| minimap_color = MINIMAP_AREA_GLASS | ||
| temperature = TCMB | ||
| pressure = 0 | ||
| always_unpowered = 1 | ||
| base_lighting_alpha = 255 | ||
|
|
||
| /area/abyssal/oob | ||
| name = "Out Of Bounds" | ||
| icon_state = "oob" | ||
| ceiling = CEILING_MAX | ||
| is_resin_allowed = FALSE | ||
| flags_area = AREA_NOTUNNEL|AREA_NOBURROW | ||
| ambience_exterior = SCAPE_ABYSSAL_EXTERIOR | ||
| minimap_color = MINIMAP_AREA_SPACE | ||
| requires_power = FALSE | ||
| temperature = TCMB | ||
| pressure = 0 | ||
| always_unpowered = 1 | ||
| base_lighting_alpha = 255 | ||
|
|
||
| //// Landing Zone \\\\ | ||
|
|
||
| /area/abyssal/interior/landing_zone | ||
| name = "Con-Am 81 'Abyssal' - Hanger - Landing Zone" | ||
| icon_state = "lz1" | ||
| ceiling = CEILING_NONE | ||
| is_resin_allowed = FALSE | ||
| is_landing_zone = TRUE | ||
| minimap_color = MINIMAP_AREA_LZ | ||
| linked_lz = DROPSHIP_LZ1 | ||
|
|
||
| //// Interior Station \\\\ | ||
|
|
||
| // Survivor Bunker | ||
| /area/abyssal/interior/bunker | ||
| name = "Abyssal - Emergency Radiation Bunker" | ||
| icon_state = "police_line" | ||
| flags_area = AREA_NOTUNNEL|AREA_NOBURROW | ||
| minimap_color = MINIMAP_AREA_JUNGLE | ||
|
|
||
| //Corridor | ||
| /area/abyssal/interior/corridor_west | ||
| name = "Abyssal - Port - Main Corridor" | ||
| icon_state = "station0" | ||
| minimap_color = MINIMAP_DIRT | ||
|
|
||
| /area/abyssal/interior/corridor_central | ||
| name = "Abyssal - Central - Main Corridor" | ||
| icon_state = "station0" | ||
| minimap_color = MINIMAP_DIRT | ||
|
|
||
| /area/abyssal/interior/corridor_east | ||
| name = "Abyssal - Starboard - Main Corridor" | ||
| icon_state = "station0" | ||
| minimap_color = MINIMAP_DIRT | ||
|
|
||
| //Telecommunications | ||
| /area/abyssal/interior/telecomms_1 | ||
| name = "Abyssal - Secondary Telecommunications Hub" | ||
| icon_state = "power0" | ||
| minimap_color = MINIMAP_AREA_ENGI | ||
|
|
||
| /area/abyssal/interior/telecomms_2 | ||
| name = "Abyssal - Primary Telecommunications Hub" | ||
| icon_state = "power0" | ||
| minimap_color = MINIMAP_AREA_ENGI | ||
|
|
||
| //Maintenance | ||
| /area/abyssal/interior/maintenance | ||
| name = "Abyssal - Maintenance" | ||
| icon_state = "maints" | ||
| minimap_color = MINIMAP_LAVA | ||
|
|
||
| /area/abyssal/interior/maintenance/west | ||
| name = "Abyssal - Port - Maintenance" | ||
| linked_lz = DROPSHIP_LZ1 | ||
|
|
||
| /area/abyssal/interior/maintenance/south | ||
| name = "Abyssal - Aft - Maintenance" | ||
|
|
||
| /area/abyssal/interior/maintenance/north | ||
| name = "Abyssal - Fore - Maintenance" | ||
|
|
||
| /area/abyssal/interior/maintenance/east | ||
| name = "Abyssal - Starboard - Maintenance" | ||
|
|
||
| /area/abyssal/interior/maintenance/central | ||
| name = "Abyssal - Central - Maintenance" | ||
|
|
||
| //Solar Control | ||
| /area/abyssal/interior/solar_control_south | ||
| name = "Abyssal - Aft - Solar Interior Controlroom" | ||
| icon_state = "disco" | ||
| minimap_color = MINIMAP_AREA_GLASS | ||
|
|
||
| /area/abyssal/interior/solar_control_north | ||
| name = "Abyssal - Fore - Solar Interior Controlroom" | ||
| icon_state = "disco" | ||
| minimap_color = MINIMAP_AREA_GLASS | ||
|
|
||
| /area/abyssal/interior/solar_control_north_west | ||
| name = "Abyssal - Fore-Port - Solar Interior Controlroom" | ||
| icon_state = "disco" | ||
| minimap_color = MINIMAP_AREA_GLASS | ||
|
|
||
| //Departments | ||
| /area/abyssal/interior/arrivals | ||
| name = "Abyssal - Arrivals Wing" | ||
| icon_state = "station1" | ||
| linked_lz = DROPSHIP_LZ1 | ||
| minimap_color = MINIMAP_AREA_CELL_MED | ||
|
|
||
| /area/abyssal/interior/cargo | ||
| name = "Abyssal - Cargo Wing" | ||
| icon_state = "station1" | ||
| linked_lz = DROPSHIP_LZ1 | ||
| minimap_color = MINIMAP_AREA_SHIP | ||
|
|
||
| /area/abyssal/interior/atmo | ||
| name = "Abyssal - Atmospherics" | ||
| icon_state = "station1" | ||
| minimap_color = MINIMAP_AREA_CELL_VIP | ||
|
|
||
| /area/abyssal/interior/hydro | ||
| name = "Abyssal - Hydroponics" | ||
| icon_state = "botany" | ||
| minimap_color = MINIMAP_AREA_CELL_LOW | ||
|
|
||
| /area/abyssal/interior/dormitory | ||
| name = "Abyssal - Dormitory" | ||
| icon_state = "station2" | ||
| minimap_color = MINIMAP_AREA_CELL_VIP | ||
|
|
||
| /area/abyssal/interior/galley | ||
| name = "Abyssal - Galley Kitchen" | ||
| icon_state = "station2" | ||
| minimap_color = MINIMAP_AREA_CELL_VIP | ||
|
|
||
| /area/abyssal/interior/security | ||
| name = "Abyssal - Security Wing" | ||
| icon_state = "security_hub" | ||
| minimap_color = MINIMAP_AREA_COLONY_MARSHALLS | ||
|
|
||
| /area/abyssal/interior/engineering | ||
| name = "Abyssal - Engineering Wing" | ||
| icon_state = "power0" | ||
| minimap_color = MINIMAP_AREA_COLONY_ENGINEERING | ||
|
|
||
| /area/abyssal/interior/medical | ||
| name = "Abyssal - Medical Wing" | ||
| icon_state = "station3" | ||
| minimap_color = MINIMAP_AREA_COLONY_HOSPITAL | ||
|
|
||
| /area/abyssal/interior/science | ||
| name = "Abyssal - Science Wing" | ||
| icon_state = "station4" | ||
| minimap_color = MINIMAP_AREA_RESEARCH | ||
| ceiling = CEILING_UNDERGROUND_METAL_BLOCK_CAS | ||
|
|
||
| /area/abyssal/interior/command | ||
| name = "Abyssal - Command Wing" | ||
| icon_state = "fiorina" | ||
| minimap_color = MINIMAP_AREA_COMMAND | ||
| ceiling = CEILING_UNDERGROUND_METAL_BLOCK_CAS | ||
|
|
||
| /area/abyssal/interior/liaison | ||
| name = "Abyssal - Executive Coordinators Office" | ||
| icon_state = "station4" | ||
| minimap_color = MINIMAP_AREA_COMMAND | ||
| ceiling = CEILING_UNDERGROUND_METAL_BLOCK_CAS | ||
|
|
||
| //// Exterior Station \\\\ | ||
|
|
||
| /area/abyssal/exterior/fore | ||
| name = "Abyssal - Exterior Fore" | ||
| icon_state = "maints" | ||
|
|
||
| /area/abyssal/exterior/aft | ||
| name = "Abyssal - Exterior Aft" | ||
| icon_state = "maints" | ||
|
|
||
| //// Derelict Shuttle \\\\ | ||
|
|
||
| /area/abyssal/interior/derelict_shuttle | ||
| name = "Unidentified Space Craft (UFO-1)" | ||
| icon_state = "tumor0-deep" | ||
| ceiling = CEILING_REINFORCED_METAL | ||
| flags_area = AREA_NOTUNNEL | ||
| ambience_exterior = AMBIENCE_DERELICT | ||
| soundscape_playlist = SCAPE_PL_LV759_DERELICTSHIP | ||
| minimap_color = MINIMAP_AREA_HYBRISACAVES | ||
| requires_power = FALSE | ||
|
|
||
| //// Gonzo \\\\ | ||
|
|
||
| /area/abyssal/gonzo | ||
| name = "Abyssal - Exterior Starboard" | ||
| icon_state = "maints" | ||
| ceiling = CEILING_MAX | ||
| is_resin_allowed = FALSE | ||
| flags_area = AREA_NOTUNNEL|AREA_NOBURROW | ||
| minimap_color = MINIMAP_AREA_GLASS | ||
| ambience_exterior = SCAPE_ABYSSAL_EXTERIOR | ||
| requires_power = FALSE | ||
| base_lighting_alpha = 255 | ||
| always_unpowered = 1 |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
should make this a proper game mechanic not abyssal-specific btw (just rename it)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fair observation, I'll make the change in the original PR.