Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
232 commits
Select commit Hold shift + click to select a range
b6aa002
merge into main
MenacingManatee Feb 4, 2022
917b823
Revert "merge into main"
MenacingManatee Feb 5, 2022
bda57b1
Merge branch 'master' of https://github.com/yogstation13/Yogstation
MenacingManatee Feb 22, 2022
05e2b56
Merge branch 'master' of https://github.com/yogstation13/Yogstation
MenacingManatee Mar 6, 2022
e377cd2
Adds initial files for AsteroidStation
MenacingManatee Mar 10, 2022
fe66f54
Merge branch 'master' of https://github.com/yogstation13/Yogstation i…
MenacingManatee Mar 10, 2022
3b9eafd
Fixes air while mining issue
MenacingManatee Mar 10, 2022
9c1caba
Cleans up and decorates command
MenacingManatee Mar 10, 2022
fdcb9a8
Service and engineering framework
MenacingManatee Mar 11, 2022
9155397
Medbay layout
MenacingManatee Mar 11, 2022
0dcf585
Shifted around layout, started on science
MenacingManatee Mar 11, 2022
7b4837d
Fixes random templates in engine
MenacingManatee Mar 12, 2022
211b736
touches up science
MenacingManatee Mar 12, 2022
736f74c
Finalized layout
MenacingManatee Mar 13, 2022
8e3f0e9
Outlines locations for solars
MenacingManatee Mar 13, 2022
5f883d1
Tweaks maint
MenacingManatee Mar 13, 2022
3257450
Forgot vault and upload
MenacingManatee Mar 13, 2022
d7ba4db
Fixes breach in engineering
MenacingManatee Mar 13, 2022
5927881
Removes template from botany
MenacingManatee Mar 13, 2022
b53ebb5
All solar locations added
MenacingManatee Mar 15, 2022
569e2c5
Fixes breach and zoo
MenacingManatee Mar 15, 2022
fa0c0e6
Removes random shutters
MenacingManatee Mar 15, 2022
9dfd2ba
Improves xenobio and mini zoo
MenacingManatee Mar 16, 2022
2d4589f
Merge branch 'yogstation13:master' into manateeStation
MenacingManatee Mar 17, 2022
9e6da91
Boris!
MenacingManatee Mar 18, 2022
51dd441
Lights and power
MenacingManatee Mar 20, 2022
a0650e9
Lighting improvements
MenacingManatee Mar 20, 2022
37ce6e8
.
MenacingManatee Mar 20, 2022
9c8fa22
Everything should have power now
MenacingManatee Mar 20, 2022
65c905f
Tweaks after suggestions
MenacingManatee Mar 20, 2022
5b37419
.
MenacingManatee Mar 21, 2022
1d8ce01
Lot of work on sec
MenacingManatee Mar 23, 2022
cc77b7c
Fixes execution and other minor tweaks
MenacingManatee Mar 23, 2022
0a7039b
AI Core
MenacingManatee Mar 24, 2022
07a02df
Cargo
MenacingManatee Mar 24, 2022
ac95df1
Tweaks after testing
MenacingManatee Mar 24, 2022
2554a12
Russian bunker
MenacingManatee Mar 25, 2022
219cd4a
Replaces bar template, starts on engineering
MenacingManatee Mar 25, 2022
cdd3a96
Fills out medbay
MenacingManatee Mar 25, 2022
9e705eb
Some decorations in sci
MenacingManatee Mar 26, 2022
5ea3d0e
Tweaks based on feedback
MenacingManatee Mar 26, 2022
a663b4b
nerf russian ruin
MenacingManatee Mar 26, 2022
c094c1f
Starts on atmos
MenacingManatee Mar 26, 2022
d7c1fb9
Atmos completed - untested
MenacingManatee Mar 27, 2022
c5fbefb
Fixes mapping on all areas
MenacingManatee Mar 27, 2022
561f199
I didn't forget EVA you forgot EVA
MenacingManatee Mar 27, 2022
90a1dc3
Lights and power for EVA
MenacingManatee Mar 27, 2022
8876bc3
AI atmos
MenacingManatee Mar 27, 2022
903c2c2
Minor tweaks
MenacingManatee Mar 27, 2022
87c1bb5
Fixes russian bunker area tags
MenacingManatee Mar 27, 2022
e6107a2
Swaps nanites and rnd, gives rnd and xenobio a desk
MenacingManatee Mar 27, 2022
1bed382
All suggested changes
MenacingManatee Mar 27, 2022
e159b3b
Removes more pipes through walls
MenacingManatee Mar 27, 2022
c472b40
AI holopads
MenacingManatee Mar 27, 2022
c866abe
Fixes botany and brig phys issues pointed out by chubbygummibear
MenacingManatee Mar 28, 2022
66a36d4
Disposals
MenacingManatee Mar 28, 2022
b53ca81
Fixes all lighting
MenacingManatee Mar 28, 2022
63fc28d
Fire extinguishers
MenacingManatee Mar 28, 2022
b5b6f68
Light switches
MenacingManatee Mar 28, 2022
0c67535
Fire alarms
MenacingManatee Mar 28, 2022
6c5a8b9
Air alarms
MenacingManatee Mar 28, 2022
fac49c7
Security Cameras
MenacingManatee Mar 28, 2022
1b4702c
Misc minor tweaks
MenacingManatee Mar 28, 2022
d468be4
Directions signs
MenacingManatee Mar 28, 2022
97e0c90
Adds posters and signs
MenacingManatee Mar 28, 2022
f5e36f2
Lots of firelocks, fixed a few maint airlocks
MenacingManatee Mar 28, 2022
5a26e06
Intercomms
MenacingManatee Mar 28, 2022
1f60849
Decorates HoS office
MenacingManatee Mar 28, 2022
92f8184
Tweaks detective autopsy table
MenacingManatee Mar 28, 2022
6ff7fb2
Fixes all map errors
MenacingManatee Mar 28, 2022
b16720e
Nav beacons
MenacingManatee Mar 28, 2022
394d2bb
firelocks for flaps
MenacingManatee Mar 28, 2022
f8c2ab2
Fixes some 1 tile hallways and other weirdness
MenacingManatee Mar 28, 2022
343fbfd
Removed hidden items under rock, second rock type from station asteroid
MenacingManatee Mar 28, 2022
efa6927
Fixes one of the maint rooms
MenacingManatee Mar 28, 2022
9b31bc9
Fixes some rwalls
MenacingManatee Mar 29, 2022
9374850
Forgot to decorate the sci mass driver area
MenacingManatee Mar 29, 2022
362cd59
Maint firelocks and helpers
MenacingManatee Mar 29, 2022
861b5fb
glass in wall
MenacingManatee Mar 30, 2022
9e4deee
newscaster, request consoles
MenacingManatee Mar 31, 2022
4d6aefa
Bounty boards
MenacingManatee Mar 31, 2022
6a5ab7a
Minor tweaks and fixes
MenacingManatee Mar 31, 2022
ed11ebc
map area tweak
MenacingManatee Mar 31, 2022
3f794d8
Chem has a button
MenacingManatee Mar 31, 2022
c50c13a
Removed unsafe windows
MenacingManatee Mar 31, 2022
2838081
Shifts a couple of medbay rooms around
MenacingManatee Mar 31, 2022
a3bcd72
Fixed pipes and posters
MenacingManatee Mar 31, 2022
ba54837
makes map votable
MenacingManatee Mar 31, 2022
58c1e2b
removes accidental change
MenacingManatee Mar 31, 2022
7690316
Revert "removes accidental change"
MenacingManatee Mar 31, 2022
e89c75e
Actually removes accidental change
MenacingManatee Mar 31, 2022
7e3fc8d
wallgene
MenacingManatee Mar 31, 2022
9382a11
Moves incinerator somewhere safer
MenacingManatee Apr 1, 2022
9dace15
Minor tweaks
MenacingManatee Apr 1, 2022
d4ce945
Minor fixes
MenacingManatee Apr 1, 2022
c31e41c
Atmos shutters
MenacingManatee Apr 1, 2022
8c511cb
Merge branch 'master' of https://github.com/yogstation13/Yogstation
MenacingManatee Apr 1, 2022
5f1eb53
Merge branch 'master' of https://github.com/yogstation13/Yogstation
MenacingManatee Apr 2, 2022
0ca9b28
Piping fixes and other tweaks
MenacingManatee Apr 6, 2022
c3686b2
Bar shutters
MenacingManatee Apr 6, 2022
710970b
Edits post feedback
MenacingManatee Apr 29, 2022
067c5ee
Feedback 2: Electric boogaloo
MenacingManatee May 16, 2022
d5a5b34
Fixes mapping errors
MenacingManatee May 22, 2022
4a15e34
Merge branch 'master' of https://github.com/yogstation13/Yogstation
MenacingManatee May 22, 2022
6d713a4
Merge branch 'master' of https://github.com/MenacingManatee/Yogstatio…
MenacingManatee May 22, 2022
acf2df0
Should fix broken check
MenacingManatee May 22, 2022
6516b5a
Feedback 3: Tokyo Drift
MenacingManatee Jun 2, 2022
dac67cd
atmos
MenacingManatee Jun 2, 2022
94f638d
Every atmos zone should have a scrubber and air
MenacingManatee Jun 2, 2022
e413fcb
3 windows had wrong floor
MenacingManatee Jun 2, 2022
6752be8
Major shift in layout and positioning of cargo and command - WIP
MenacingManatee Jul 13, 2022
8aec11f
Improvements to piping
MenacingManatee Jul 15, 2022
e654b1a
Disposals fix
MenacingManatee Jul 15, 2022
fd474a8
Possibly ready for review
MenacingManatee Jul 16, 2022
eb298f8
Minor lighting and camera tweaks
MenacingManatee Jul 16, 2022
7914ce0
Exterior acces protection on a door
MenacingManatee Jul 16, 2022
79a7e48
Fixed random extra wall
MenacingManatee Jul 16, 2022
505b59c
ty bai
MenacingManatee Jul 16, 2022
a8fc8d6
Removed extra window in armory
MenacingManatee Jul 16, 2022
28a5b0f
tile color tweaks
MenacingManatee Jul 16, 2022
6f17275
Some improvements using feedback
MenacingManatee Jul 17, 2022
f2270de
Cargo shuttle no longer mercs a half dozen rocks
MenacingManatee Jul 17, 2022
955d677
Tweaks after a walk through
MenacingManatee Jul 19, 2022
9ef9d89
Merge branch 'master' of https://github.com/yogstation13/Yogstation
MenacingManatee Jul 19, 2022
86fe821
Revert "Merge branch 'master' of https://github.com/yogstation13/Yogs…
MenacingManatee Jul 19, 2022
d2f43fc
Merge branch 'master' of https://github.com/yogstation13/Yogstation
MenacingManatee Jul 19, 2022
36d41d3
Merge branch 'master' of https://github.com/MenacingManatee/Yogstatio…
MenacingManatee Jul 19, 2022
873376e
Ice fishing asteroid ruin
MenacingManatee Jul 19, 2022
7ff6f6d
No longer votable until it has been playtested
MenacingManatee Jul 19, 2022
e33a2d0
Remember Kilo ruin
MenacingManatee Jul 20, 2022
b822d13
Crashed shuttle asteroid ruin
MenacingManatee Jul 20, 2022
83b74e0
More feedback from bai
MenacingManatee Jul 20, 2022
2c85c86
AI Antechamber APC
MenacingManatee Jul 20, 2022
f4943eb
Missing maint door added
MenacingManatee Jul 20, 2022
56fdfb2
"Gym Rat" Maint ruin
MenacingManatee Jul 21, 2022
c09b0fd
Renames mice in gym rat ruin
MenacingManatee Jul 21, 2022
d1416b9
Minor tweaks
MenacingManatee Jul 21, 2022
d4dbdac
Moves an asteroid ruin
MenacingManatee Jul 21, 2022
2dd3093
Expansion to south maints and asteroid, with santa ruin
MenacingManatee Jul 22, 2022
8ef748a
Fixed medbay sec outpost
MenacingManatee Jul 22, 2022
43b9b93
Fixed QM windows & toxins test distance
MenacingManatee Jul 22, 2022
d79c9f3
Adds the random donkpockets
MenacingManatee Jul 22, 2022
31b51be
Medbay tweaks
MenacingManatee Jul 22, 2022
a7776c8
Removed a donksoft vendor
MenacingManatee Jul 22, 2022
e692e1e
discord nitpicks
MenacingManatee Jul 22, 2022
b6d8558
more discord suggestions
MenacingManatee Jul 22, 2022
c8bf4d2
Cleans up medbay disposals a bit
MenacingManatee Jul 22, 2022
f140e98
Fixed stuff overlapping walls
MenacingManatee Jul 22, 2022
384cdf8
gym rat tweak
MenacingManatee Jul 23, 2022
8a2a219
Wiring tweak
MenacingManatee Jul 23, 2022
91e19c5
cobwebs
MenacingManatee Jul 23, 2022
1a04cdd
Fixes typo in telepad
MenacingManatee Jul 24, 2022
581f5a2
Jamie feedback
MenacingManatee Jul 24, 2022
8fc6a39
arrivals touch up
MenacingManatee Jul 25, 2022
3532567
Update config/maps.txt
JamieD1 Jul 28, 2022
e984a44
hotfix - missed igniter in toxins, gives paramed compact pick
MenacingManatee Jul 29, 2022
9292624
Tweaks mineral spawn chance for asteroidstation
MenacingManatee Jul 29, 2022
5bb79ae
Start on hotfix 1
MenacingManatee Jul 29, 2022
f1507b1
hotfix 1 semifinal
MenacingManatee Jul 29, 2022
e3cf2d6
Add most suggestions
MenacingManatee Jul 29, 2022
ca25b23
misaligned cam
MenacingManatee Jul 29, 2022
777e5bf
more paintings
MenacingManatee Jul 29, 2022
2ad8352
science showers
MenacingManatee Jul 29, 2022
2be555b
science oxy closets
MenacingManatee Jul 29, 2022
d68f3ff
Cuts a little more space from the edges
MenacingManatee Jul 30, 2022
ba30237
This medbay upday brought to you by Vael
MenacingManatee Jul 30, 2022
eb46004
Extra cam in atmos
MenacingManatee Jul 30, 2022
f690c14
Medbay, sec, and a small part of civillian get small wire loops
MenacingManatee Jul 30, 2022
5745df3
progress on playtest fix 2
MenacingManatee Jul 30, 2022
ea49bb9
Playtest fix 2 final
MenacingManatee Jul 31, 2022
9c9ddab
Slightly shifts ice fishing ruin
MenacingManatee Jul 31, 2022
75d9136
atmos gas miners
MenacingManatee Jul 31, 2022
aa52828
Tweak to xmas ruin
MenacingManatee Jul 31, 2022
616af69
second tweak to xmas ruin
MenacingManatee Jul 31, 2022
688dbb6
Playtest fix 3
MenacingManatee Jul 31, 2022
43f3b18
Robotics changes
MenacingManatee Jul 31, 2022
ec8cf28
Moved vault and tools
MenacingManatee Jul 31, 2022
736a23c
area fix
MenacingManatee Jul 31, 2022
202f7ca
Minor tweaks
MenacingManatee Aug 1, 2022
b911348
Minor tweaks
MenacingManatee Aug 1, 2022
4589476
Fishing in bar beach
MenacingManatee Aug 1, 2022
46b0546
Tweaks to russian ruin
MenacingManatee Aug 1, 2022
a576ec5
Merge branch 'master' of https://github.com/yogstation13/Yogstation i…
MenacingManatee Aug 1, 2022
634ecfe
Fixes fishing in bar
MenacingManatee Aug 1, 2022
29a69f0
playtest fix 4
MenacingManatee Aug 1, 2022
863a249
Atmos tweak
MenacingManatee Aug 1, 2022
4347c60
Arcade
MenacingManatee Aug 1, 2022
265272f
Extra path to arcade
MenacingManatee Aug 1, 2022
c1f601d
A few extra maint cams
MenacingManatee Aug 1, 2022
448f7e9
misaligned cam in tool storage
MenacingManatee Aug 1, 2022
9cf5585
Escape shuttle won't merc rocks in any situation
MenacingManatee Aug 1, 2022
231e4af
Playtest fix 5
MenacingManatee Aug 2, 2022
446aa4a
Several more extinguishers
MenacingManatee Aug 2, 2022
d683e96
playtest fix 6
MenacingManatee Aug 3, 2022
fd89017
Adds some decals
MenacingManatee Aug 3, 2022
5a7d9b6
tweaks to russian ruin
MenacingManatee Aug 3, 2022
9ea10e1
Ups mineral spawn chance slightly
MenacingManatee Aug 3, 2022
760bafd
Extra button for clerk shutters
MenacingManatee Aug 3, 2022
cf217f0
Merge branch 'master' of https://github.com/yogstation13/Yogstation i…
MenacingManatee Aug 3, 2022
86de840
minor tweaks
MenacingManatee Aug 4, 2022
47fdd5b
Playtest fix 7
MenacingManatee Aug 4, 2022
8f9e805
minor tweaks
MenacingManatee Aug 4, 2022
07b777d
more engi decals
MenacingManatee Aug 4, 2022
2e86686
tweaks russian loot
MenacingManatee Aug 5, 2022
4634854
donkpocket->spawner
MenacingManatee Aug 5, 2022
848083e
Playtest fix 8
MenacingManatee Aug 6, 2022
3ac35ff
Roaches
MenacingManatee Aug 6, 2022
0530cb7
Playtest fix 9
MenacingManatee Aug 8, 2022
9eb8665
Decal and lighting tweaks
MenacingManatee Aug 8, 2022
4b44d8d
Makes some bridge stuff more accessible
MenacingManatee Aug 8, 2022
3bde2b8
Power tweaks
MenacingManatee Aug 9, 2022
1a4e7ac
admin has AI access
MenacingManatee Aug 9, 2022
b3c16e3
area tweak
MenacingManatee Aug 9, 2022
ba4d9d6
Tools for the tool god
MenacingManatee Aug 10, 2022
0652588
Backup power
MenacingManatee Aug 10, 2022
1a0098a
backup power decals
MenacingManatee Aug 10, 2022
d6f5140
backup power decals
MenacingManatee Aug 10, 2022
5c4f58a
lights and air for the backup power room
MenacingManatee Aug 10, 2022
2f9946c
Replaced backup power with backup SMES
MenacingManatee Aug 10, 2022
2475463
Cameras for backup SMES
MenacingManatee Aug 10, 2022
bcadda4
missing bridge tile
MenacingManatee Aug 10, 2022
054c914
decals
MenacingManatee Aug 10, 2022
96946b8
missed a few decals
MenacingManatee Aug 10, 2022
54e74ac
missing button
MenacingManatee Aug 11, 2022
c85f1be
chargers in meeting room
MenacingManatee Aug 11, 2022
91d7f97
heads break room vendors accessible
MenacingManatee Aug 11, 2022
5866e4f
Merge branch 'master' of https://github.com/yogstation13/Yogstation i…
MenacingManatee Aug 11, 2022
dcf8562
sayonara to quarter tile decals
MenacingManatee Aug 11, 2022
68d7c25
Command wire loop
MenacingManatee Aug 12, 2022
05c1b0b
Asteroid is votable in preparation for merge
MenacingManatee Aug 15, 2022
28f0b02
Lowers minplayers from 35 to 25
MenacingManatee Aug 23, 2022
93f389e
Update _maps/asteroidstation.json
JamieD1 Aug 29, 2022
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 _maps/_basemap.dm
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#ifndef LOWMEMORYMODE
#ifdef ALL_MAPS
#include "map_files\mining\Lavaland.dmm"
#include "map_files\AsteroidStation\AsteroidStation.dmm"
#include "map_files\mining\Icemoon.dmm"
#include "map_files\mining\IcemoonUnderground.dmm"
#include "map_files\debug\runtimestation.dmm"
Expand Down
1 change: 1 addition & 0 deletions _maps/asteroidstation.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#define FORCE_MAP "_maps/asteroidstation.json"
11 changes: 11 additions & 0 deletions _maps/asteroidstation.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"map_name": "[ALPHA] AsteroidStation",
"map_path": "map_files/AsteroidStation",
"map_file": "AsteroidStation.dmm",
"shuttles": {
"cargo": "cargo_box",
"ferry": "ferry_fancy",
"whiteship": "whiteship_box",
"emergency": "emergency_box"
}
}
Loading