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.

Sign up for GitHub

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

Oshan Laboratory map port #1111

Draft
wants to merge 32 commits into
base: master
Choose a base branch
from
+148,960 −19
Draft

Oshan Laboratory map port #1111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
7c08884
Oshan lab PR test (Don't touch)
LuisLeFish Mar 9, 2024
efdaf16
Small quick fixes.
LuisLeFish Mar 10, 2024
9cd159d
small important stuff
LuisLeFish Mar 10, 2024
e202967
Modularize alot of folders!
ariaworld Mar 11, 2024
34e7c38
Also these comments!
ariaworld Mar 11, 2024
b4494db
Remove non-modular chasm icons
ariaworld Mar 11, 2024
b8213a8
Update water stuff! <3
ariaworld Mar 11, 2024
1afe67e
Fixes a few mishaps with water atmos
ariaworld Mar 11, 2024
c742a5f
Fucking gas defines
ariaworld Mar 11, 2024
217d8f4
Forcefield fan (modular splurt icon)
ariaworld Mar 11, 2024
e31d1cc
Important things for oshan and floors
ariaworld Mar 12, 2024
f5015fc
Add oshan to map config
ariaworld Mar 12, 2024
044b2c5
Other important stuff for oshan!
ariaworld Mar 12, 2024
3abf467
Update gravity for oshan
ariaworld Mar 12, 2024
3012cef
Update oshan laboratory again
ariaworld Mar 12, 2024
b6ee7b4
Remove: has_gravity = TRUE from oshan
ariaworld Mar 12, 2024
ef1ee37
Update oshan laboratory map again!
ariaworld Mar 13, 2024
2178f4b
Update vectorcrafts
ariaworld Mar 13, 2024
d7af28b
remove bad comment
ariaworld Mar 13, 2024
63926c3
Revert a massive fuckup with modular areas.dmi
ariaworld Mar 13, 2024
745d04d
Alot of oshan fixes and updates
ariaworld Mar 14, 2024
ca86c2f
Update oshan again
ariaworld Mar 14, 2024
bba5ec4
Attempt in fixing oshan syndie turrets
ariaworld Mar 14, 2024
dc5117e
Fix: Oshan laboratory turret runtime
ariaworld Mar 15, 2024
2cb4696
Add SPLURT comment to mapping.dm
ariaworld Mar 15, 2024
1b6b32c
Tweak comment
ariaworld Mar 17, 2024
49212f3
Make shuttles added by splurt modular
ariaworld Mar 17, 2024
6717725
Convert oshan laboratory to tgm + fix bedsheets
ariaworld Mar 17, 2024
5fc716a
Fix: path of modular splurt slaveship shuttle
ariaworld Mar 17, 2024
8b62810
Certified Shuttle fail
LuisLeFish Mar 17, 2024
d9517cd
Update arrival_oshan.dmm
ariaworld Mar 18, 2024
0caf245
Trying to fix docking ports.
LuisLeFish Mar 24, 2024
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#include "map_files\SyndicateStation\SyndicateBoxStation.dmm"
#include "splurt_maps\map_files\Smexistation\Snaxi_Splurt.dmm"
#include "map_files\BoxedInStation\BoxedInStation.dmm"
#include "map_files\OshanLaboratory\oshanlaboratory.dmm"

#ifdef CIBUILDING
#include "templates.dm"
Expand Down
Loading