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

Aegis7 #128

Merged
merged 134 commits into from
Sep 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
134 commits
Select commit Hold shift + click to select a range
4b9a28d
Aegis7, rig changes, shuttles
blackwolf602 Aug 27, 2023
51ada60
Fixes to aegis bridge doors and ladders
blackwolf602 Aug 27, 2023
0f0ecd8
shuttles
DTraitor Aug 29, 2023
3a4d298
Merge branch 'DS-13-Dev-Team:master' into Aegis7
blackwolf602 Aug 30, 2023
35fbddd
Merge pull request #5 from DTraitor/aeg
blackwolf602 Aug 30, 2023
d7dd641
Aegis, sec vendor, sec equipment, job lockers
blackwolf602 Aug 30, 2023
671df02
map changes
blackwolf602 Aug 30, 2023
c2a5878
shuttle and telephone fixes
blackwolf602 Aug 30, 2023
f44aee0
map changes
blackwolf602 Aug 30, 2023
41d8fca
screenshot fix
blackwolf602 Aug 31, 2023
b25a6bc
locker and map fix
blackwolf602 Aug 31, 2023
e4f1fd8
fixed map duplicate cables
blackwolf602 Aug 31, 2023
cb7895b
fix lower cable
blackwolf602 Aug 31, 2023
1b596a6
fixed multiple tiles on lower
blackwolf602 Aug 31, 2023
ba0b26c
Merge branch 'DS-13-Dev-Team:master' into Aegis7
blackwolf602 Aug 31, 2023
fba59df
fixed dup panels
blackwolf602 Aug 31, 2023
7d6c74d
fixing flooring
blackwolf602 Aug 31, 2023
f29fc0b
fixing dup cable on middle
blackwolf602 Aug 31, 2023
3c5fe4b
plating under walls fixed
blackwolf602 Aug 31, 2023
df74f1a
plating fix
blackwolf602 Aug 31, 2023
9a5564d
removed some duplicate apc
blackwolf602 Aug 31, 2023
0958eb0
fixes to ids and dup apc removed
blackwolf602 Aug 31, 2023
ce07674
fix to error causing mapdiffbot2 to break
blackwolf602 Aug 31, 2023
a528328
fix to tcom power and dup apcs
blackwolf602 Aug 31, 2023
d1bc45a
Fix to tcom area and apcs
blackwolf602 Aug 31, 2023
20d94d8
hide z level cables
blackwolf602 Aug 31, 2023
03e785e
fix to flooring, wiring, tcoms for z level
blackwolf602 Sep 1, 2023
ec72c8a
fixes to map
blackwolf602 Sep 1, 2023
3e1294a
fixes to aegis
blackwolf602 Sep 1, 2023
ec708cd
fix to stairs
blackwolf602 Sep 2, 2023
68b8824
add books
blackwolf602 Sep 2, 2023
caf9789
fix to high
blackwolf602 Sep 2, 2023
2370a40
fixes to the engine
blackwolf602 Sep 2, 2023
dcdd844
Few more fixes to aegis and drones. add rats
blackwolf602 Sep 2, 2023
3f4ea4a
removal of some stone
blackwolf602 Sep 2, 2023
898ccec
fixing to some area for the mines
blackwolf602 Sep 2, 2023
3ccd5fd
captain restroom id fixed
blackwolf602 Sep 2, 2023
572a978
adds captain safe and removes bridge laser
blackwolf602 Sep 2, 2023
8b30696
adds missing tile to the high
blackwolf602 Sep 2, 2023
9306222
two more missing tiles
blackwolf602 Sep 2, 2023
3921586
removes telephones from dorms, fix lighting
blackwolf602 Sep 2, 2023
0cc2772
cable to smes room
blackwolf602 Sep 2, 2023
abeb39d
fixes to the map
blackwolf602 Sep 2, 2023
5741c9f
add missing button
blackwolf602 Sep 2, 2023
601c32d
add windoor to disposal
blackwolf602 Sep 2, 2023
2b9cba2
remove windoor for cargobot
blackwolf602 Sep 2, 2023
7eba3ab
adds dead space names to job
blackwolf602 Sep 2, 2023
544134a
replaces all spawning storage with civ rig
blackwolf602 Sep 2, 2023
6428e2f
add invinicble rock around sm exhuast
blackwolf602 Sep 2, 2023
fd7fc15
naming fix to the security rig
blackwolf602 Sep 2, 2023
39fdf64
unneeded icon removed
blackwolf602 Sep 2, 2023
4b25deb
add pcsi commander rig to their office
blackwolf602 Sep 2, 2023
afd4957
update screenshots
blackwolf602 Sep 2, 2023
f26eb24
ladder to disposal
blackwolf602 Sep 2, 2023
2b98e04
fix id req to checkpoint
blackwolf602 Sep 2, 2023
049a90d
removes cable from engineer
blackwolf602 Sep 2, 2023
9d4ad39
proper display case
blackwolf602 Sep 2, 2023
7530a83
rework the det office
blackwolf602 Sep 2, 2023
96a322a
Merge branch 'DS-13-Dev-Team:master' into Aegis7
blackwolf602 Sep 2, 2023
ee83777
Merge branch 'DS-13-Dev-Team:master' into Aegis7
blackwolf602 Sep 2, 2023
437944a
new computer sprites and changes to maps
blackwolf602 Sep 2, 2023
917c350
Merge remote-tracking branch 'rook/Aegis7' into tgm
DTraitor Sep 2, 2023
60b3622
Revert "new computer sprites and changes to maps"
blackwolf602 Sep 2, 2023
98ff2fe
paths
DTraitor Sep 2, 2023
72f98fc
Merge pull request #7 from DTraitor/tgm
blackwolf602 Sep 2, 2023
02e4dc6
s
DTraitor Sep 2, 2023
a4769fa
Merge pull request #9 from DTraitor/tgm
blackwolf602 Sep 2, 2023
46d6a70
changed det flooring
blackwolf602 Sep 2, 2023
938d552
Merge branch 'Aegis7' of https://github.com/blackwolf602/DS13-2.0-too…
blackwolf602 Sep 2, 2023
4f7ead1
removed a fire alarm
blackwolf602 Sep 3, 2023
3efb4de
remove the bots from lower cargo
blackwolf602 Sep 3, 2023
3573e1f
update to the smes room
blackwolf602 Sep 3, 2023
da6aae8
remove defib mounts
blackwolf602 Sep 3, 2023
9591af4
fix to the smes pipes
blackwolf602 Sep 3, 2023
5d6add0
fixes railings
blackwolf602 Sep 3, 2023
85c6822
removed railings
blackwolf602 Sep 3, 2023
6e0c76b
New Computer sprites
blackwolf602 Sep 3, 2023
d17f723
map changes
blackwolf602 Sep 3, 2023
8c5446e
nAME THE FOX SAMMY
blackwolf602 Sep 3, 2023
8a1ee5b
changes to armory, fix sec helmet
blackwolf602 Sep 5, 2023
c8d8c95
revamps aegis medbay and fixes
blackwolf602 Sep 6, 2023
3366186
fixes to that fix
blackwolf602 Sep 6, 2023
46e51ac
adds missing disposal pipes and lighting
blackwolf602 Sep 6, 2023
b78ee5e
added lines to to medical
blackwolf602 Sep 6, 2023
65f1a83
aegis changes, mineral change to stop suffocating
blackwolf602 Sep 6, 2023
872c85c
fixes to aegis
blackwolf602 Sep 6, 2023
7d88283
adds kapu cat
blackwolf602 Sep 6, 2023
5b8e00a
removed rigs from display, moved a mouse
blackwolf602 Sep 7, 2023
5ea5cbf
moved around the clothing area in dorms
blackwolf602 Sep 7, 2023
e012c3c
aegis rocks
blackwolf602 Sep 7, 2023
ec8fe17
makes miners not suffocate, fixes dorms buttons
blackwolf602 Sep 7, 2023
b534438
removed extra light from freezer
blackwolf602 Sep 7, 2023
a19cda0
update to lower
blackwolf602 Sep 8, 2023
bf88351
Merge branch 'DS-13-Dev-Team:master' into Aegis7
blackwolf602 Sep 8, 2023
3a6d3cd
adds slug and a hog
blackwolf602 Sep 8, 2023
e9cda5b
moved some signs
blackwolf602 Sep 8, 2023
58b1ff1
adds slugs and hog
blackwolf602 Sep 8, 2023
1c875b0
moves some decals
blackwolf602 Sep 8, 2023
1be30fc
adds firing pins to the armory
blackwolf602 Sep 8, 2023
8d92261
maint loot spawner fix by Francinum
blackwolf602 Sep 8, 2023
96abfca
gives engineering rig radiation shielding
blackwolf602 Sep 8, 2023
a44d175
fixes limit on the legacy rig
blackwolf602 Sep 8, 2023
507df2d
untouches the seeker
blackwolf602 Sep 8, 2023
0e80915
adds jukebox
blackwolf602 Sep 8, 2023
6a0039e
fixes to rigs
blackwolf602 Sep 8, 2023
2b58167
fixes to the chaplain
blackwolf602 Sep 8, 2023
b12089d
missed code to fix random maints
blackwolf602 Sep 8, 2023
6cfd0d1
removes antag loot from places
blackwolf602 Sep 8, 2023
04508d1
ADDS SIGN AND POSSIBLY NO RADSTORM
blackwolf602 Sep 8, 2023
df05b6a
adds shower to medbay
blackwolf602 Sep 8, 2023
f9c81ec
medbottle fixes by kapu
blackwolf602 Sep 8, 2023
70c9e21
adds light bult to the gift shop
blackwolf602 Sep 8, 2023
bef79f6
adds lights to the hall
blackwolf602 Sep 8, 2023
50d7715
adds space to the cooling area
blackwolf602 Sep 9, 2023
79b7423
adds fire doors near engineering
blackwolf602 Sep 9, 2023
8638b1a
adds crowbar around the map
blackwolf602 Sep 9, 2023
6496daf
reemoved an air thing
blackwolf602 Sep 9, 2023
7642120
Merge branch 'Aegis7' of https://github.com/blackwolf602/DS13-2.0-too…
blackwolf602 Sep 11, 2023
3283b1f
abandoned robotics and fix intergration test maybe
blackwolf602 Sep 11, 2023
411436b
replaced random tile with rocks
blackwolf602 Sep 11, 2023
ee6720b
disable most event that don't fit in line with ds
blackwolf602 Sep 11, 2023
240d627
adds fireaxe
blackwolf602 Sep 11, 2023
74f11ba
map and computer sprites by Elliot
blackwolf602 Sep 11, 2023
d458749
Francinum the lizard
blackwolf602 Sep 11, 2023
098b0aa
francium told me to
blackwolf602 Sep 12, 2023
c4e7655
fix to the engineer naming
blackwolf602 Sep 12, 2023
0c3cf34
anchors decals
blackwolf602 Sep 12, 2023
90c160e
fixed duplicate apc
blackwolf602 Sep 12, 2023
e09841e
removed missed space tiles
blackwolf602 Sep 12, 2023
79c2d2d
warden rig added (missed)
blackwolf602 Sep 12, 2023
7e914ea
WIP atmos
blackwolf602 Sep 13, 2023
94fd96a
remove some marker spawn
blackwolf602 Sep 13, 2023
64f15bf
double cable moment
blackwolf602 Sep 13, 2023
ad6c03f
fix to rat?
blackwolf602 Sep 13, 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
91 changes: 91 additions & 0 deletions _maps/aegis.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
{
"allow_custom_shuttles": false,
"version": 1,
"map_name": "Aegis VII",
"map_path": "map_files/AegisVII",
"map_file": [
"AegisVII_Low.dmm",
"AegisVII_Middle.dmm",
"AegisVII_High.dmm"
],
"space_ruin_levels": 0,
"space_empty_levels": 0,
"planetary": 1,
"shuttles": {
"cargo": "cargo_aegis",
"emergency": "emergency_aegis1"
},
"traits": [
{
"Up": 1,
"Linkage": null,
"Gravity": true,
"Lava Ruins": true,
"Baseturf": "/turf/open/misc/asteroid",
"Weather_Ashstorm": null,
"No Parallax": true
},
{
"Down": -1,
"Up": 1,
"Linkage": null,
"Gravity": true,
"Lava Ruins": true,
"Baseturf": "/turf/open/openspace",
"Weather_Ashstorm": null,
"No Parallax": true
},
{
"Down": -1,
"Linkage": null,
"Gravity": true,
"Lava Ruins": true,
"Baseturf": "/turf/open/openspace",
"Weather_Ashstorm": null,
"No Parallax": true
}
],
"minetype": "none",
"blacklist_file": "lavaruinblacklist.txt",
"job_changes": {
"assistant": {
"total_positions": 0
},
"atmospheric_technician": {
"total_positions": 0
},
"ai": {
"total_positions": 0
},
"clown": {
"total_positions": 0
},
"geneticist": {
"total_positions": 0
},
"curator": {
"total_positions": 0
},
"mime": {
"total_positions": 0
},
"prisoner": {
"total_positions": 0
},
"lawyer": {
"total_positions": 0
},
"roboticist": {
"total_positions": 0
},
"virologist": {
"total_positions": 0
},
"cook":{
"additional_cqc_areas": ["/area/station/service/bar", "/area/station/service/kitchen/coldroom", "/area/station/commons/lounge"]
},
"captain": {
"special_charter": "Aegis"
}
}
}
Loading
Loading