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

Abyss Station #80

Closed
wants to merge 67 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
67 commits
Select commit Hold shift + click to select a range
4f3aa90
Add Abyss Station to build
twilightwanderer Jul 30, 2023
bdc5307
Starting to work on the zones
twilightwanderer Aug 2, 2023
9348ab0
Minor edits
twilightwanderer Aug 6, 2023
0c24b47
Minor edits
twilightwanderer Sep 5, 2023
d83a35f
Merge branch 'master' into Abyss-Station
twilightwanderer Sep 5, 2023
972f8bc
Conflict Resolution
twilightwanderer Sep 5, 2023
6789477
Conflict resolution
twilightwanderer Sep 5, 2023
e6e06a1
Minor Edits
twilightwanderer Sep 5, 2023
253b7cf
Edits...
twilightwanderer Sep 5, 2023
35d6717
Edits. Again
twilightwanderer Sep 5, 2023
06545b7
Delete request consoles
twilightwanderer Sep 8, 2023
0f09c0c
Clear Powernets
twilightwanderer Sep 8, 2023
3ee5d17
Clear pipenetes
twilightwanderer Sep 8, 2023
1c5abbe
Clear Object
twilightwanderer Sep 8, 2023
29fb674
Clear Pipenets
twilightwanderer Sep 8, 2023
f7d9d8e
Clear pipenets
twilightwanderer Sep 8, 2023
4550887
Clear objects
twilightwanderer Sep 8, 2023
db19ba8
Clear Zone
twilightwanderer Sep 8, 2023
49baef3
Clear Objects
twilightwanderer Sep 9, 2023
3ecad02
Clear Area
twilightwanderer Sep 9, 2023
b8821a0
Clear Telecomms
twilightwanderer Sep 9, 2023
f22c300
Clear Objects
twilightwanderer Sep 9, 2023
6ba4c43
Clear GPS
twilightwanderer Sep 9, 2023
efe1352
Config fix
twilightwanderer Sep 9, 2023
63cee13
Fix Linters
twilightwanderer Sep 9, 2023
a910bd7
Clear powernets
twilightwanderer Sep 9, 2023
226535d
Add map to black list
twilightwanderer Sep 9, 2023
a88ec5a
Update access
twilightwanderer Sep 9, 2023
3c1b892
Add barber job
twilightwanderer Sep 9, 2023
1f9aaec
Removing Cyrillic alphabet
twilightwanderer Sep 14, 2023
e70042a
Another attempt to resolve conflicts
twilightwanderer Sep 14, 2023
a690a53
Work with areas
twilightwanderer Sep 14, 2023
0e18dcf
Merge branch 'Abyss-Station' of https://github.com/twilightwanderer/F…
twilightwanderer Sep 14, 2023
776056d
Work with areas
twilightwanderer Sep 14, 2023
b880d35
Fix APC
twilightwanderer Sep 14, 2023
ee846e4
Clear areas
twilightwanderer Sep 14, 2023
3b8577f
Clear lints
twilightwanderer Sep 14, 2023
b5e9219
Clear lints
twilightwanderer Sep 14, 2023
8c7f33c
Clear lints
twilightwanderer Sep 14, 2023
0ab3334
Clear lints
twilightwanderer Sep 14, 2023
4624ab8
Clear lints
twilightwanderer Sep 14, 2023
3a9b8a8
clear lints
twilightwanderer Sep 14, 2023
f0d9d95
clear lint
twilightwanderer Sep 14, 2023
700904b
Clear lints
twilightwanderer Sep 14, 2023
b611eda
Clear lints
twilightwanderer Sep 14, 2023
312fe7f
Clean lint
twilightwanderer Sep 14, 2023
feb05b2
Clear lints
twilightwanderer Sep 14, 2023
8a0203b
Clear lints
twilightwanderer Sep 14, 2023
ab9ae0a
Clear lints
twilightwanderer Sep 14, 2023
d58d08e
Minor fix
twilightwanderer Sep 14, 2023
64311f3
Engineering Department Update
twilightwanderer Sep 23, 2023
e58fa68
Nuke resize
twilightwanderer Sep 23, 2023
6e45e94
Minor fix
twilightwanderer Sep 23, 2023
b7947ca
Brig remap
twilightwanderer Sep 26, 2023
dddd818
Minnor fix
twilightwanderer Sep 26, 2023
cbf9a17
Minor fix
twilightwanderer Sep 26, 2023
18d7668
Merge branch 'Fluffy-Frontier:master' into Abyss-Station
twilightwanderer Sep 26, 2023
448fd7c
Merge branch 'Abyss-Station' of https://github.com/twilightwanderer/F…
twilightwanderer Sep 26, 2023
4ec8387
Update Zone
twilightwanderer Sep 26, 2023
a797543
Add trams
twilightwanderer Oct 5, 2023
fa5bd0d
Merge branch 'Fluffy-Frontier:master' into Abyss-Station
twilightwanderer Oct 5, 2023
8bb8d95
Clear Linters
twilightwanderer Oct 5, 2023
252dc65
Add mines
twilightwanderer Oct 9, 2023
c33bfbd
Merge branch 'Abyss-Station' of https://github.com/twilightwanderer/F…
twilightwanderer Oct 9, 2023
5f95afc
Repaire
twilightwanderer Oct 9, 2023
b1bcd08
Repaire DME
twilightwanderer Oct 9, 2023
5d50aea
Minnor fix
twilightwanderer Oct 9, 2023
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
57 changes: 57 additions & 0 deletions _maps/abyssstation.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
{
"version": 1,
"map_name": "Abyss Station",
"map_path": "map_files/AbyssStation",
"map_file": "abyssstation.dmm",
"planetary": 1,
"shuttles": {
"cargo": "cargo_skyrat",
"ferry": "ferry_fancy",
"whiteship": "whiteship_box",
"emergency": "emergency_box"
},
"ignored_unit_tests": [
"/datum/unit_test/atmospherics_sanity"
],
"traits": [
{
"Up": true,
"Gravity": true,
"Baseturf": "/turf/open/chasm",
"No Parallax": true,
"Linkage": "Cross"
},
{
"Up": true,
"Down": true,
"Gravity": true,
"Baseturf": "/turf/open/openspace",
"No Parallax": true,
"Linkage": "Cross"
},
{
"Up": true,
"Down": true,
"Gravity": true,
"Baseturf": "/turf/open/openspace",
"No Parallax": true,
"Linkage": "Cross"
},
{
"Down": true,
"Gravity": true,
"Baseturf": "/turf/open/openspace",
"No Parallax": true,
"Linkage": "Cross"
}
],
"job_changes": {
"Cook": {
"additional_cqc_areas": ["/area/station/service/kitchen/diner"]
},
"Captain": {
"special_charter": "moon"
}
},
"minetype": "none"
}
Loading
Loading