forked from cmss13-devs/cmss13-pve
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'campaign' into freelancer-fix
- Loading branch information
Showing
18 changed files
with
1,765 additions
and
784 deletions.
There are no files selected for viewing
This file contains 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 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 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 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 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 |
---|---|---|
|
@@ -39,4 +39,7 @@ map lead_hawk | |
endmap | ||
|
||
map corsair | ||
endmap | ||
|
||
map tortuga | ||
endmap |
This file was deleted.
Oops, something went wrong.
This file contains 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,45 @@ | ||
/area/tortuga | ||
icon = 'icons/turf/area_almayer.dmi' | ||
icon_state = "almayer" | ||
ceiling = CEILING_METAL | ||
powernet_name = "tortuga" | ||
sound_environment = SOUND_ENVIRONMENT_ROOM | ||
soundscape_interval = 30 | ||
ambience_exterior = AMBIENCE_ALMAYER | ||
ceiling_muffle = FALSE | ||
|
||
/area/tortuga/hangar | ||
name = "\improper USCSS Tortuga - Hangar" | ||
icon_state = "almayer" | ||
soundscape_playlist = SCAPE_PL_HANGAR | ||
soundscape_interval = 50 | ||
|
||
/area/tortuga/cryo | ||
name = "\improper USCSS Tortuga - Hyper-sleep Chamber" | ||
|
||
/area/tortuga/corridor_upper | ||
name = "\improper USCSS Tortuga - Habitat Deck Hall" | ||
|
||
/area/tortuga/shower | ||
name = "\improper USCSS Tortuga - Shower" | ||
|
||
/area/tortuga/barrack | ||
name = "\improper USCSS Tortuga - Barrack" | ||
|
||
/area/tortuga/jokey_office | ||
name = "\improper USCSS Tortuga - Jokey Office" | ||
|
||
/area/tortuga/canteen | ||
name = "\improper USCSS Tortuga - Dining Hall" | ||
|
||
/area/tortuga/bridge | ||
name = "\improper USCSS Tortuga - Bridge" | ||
|
||
/area/tortuga/corridor_lower | ||
name = "\improper USCSS Tortuga - Work Deck" | ||
|
||
/area/tortuga/lift | ||
name = "\improper USCSS Tortuga - Cargo Lift" | ||
|
||
/area/tortuga/medical | ||
name = "\improper USCSS Tortuga - Medbay" |
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains 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
Oops, something went wrong.