cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-09 16:07:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
40,620 Commits 55 Branches 0 Tags
eb20501cc03d8eb61eb13a96a7f612b5461913cb
Commit Graph

1961 Commits

Author SHA1 Message Date
Chiirno
35896e92ec Paramedic office added and operating room remodeled 2020-12-22 21:50:22 -04:00
silicons
ea21151462 LF 2020-12-20 18:55:45 -07:00
MrJWhit
9f7d87759d Update BoxStation.dmm 2020-12-15 13:55:30 -05:00
MrJWhit
c34656c5e8 The rest of the stuff 2020-12-15 13:51:04 -05:00
MrJWhit
68cf6a845c Boxstation fixes 2020-12-15 13:35:41 -05:00
silicons
a85c49399d Merge pull request #13746 from keronshb/boxchanges 
Reworks Northwest Box Station Maint and adds a bridge between Atmos and the Turbine
 2020-12-13 23:09:54 -07:00
silicons
7a95e464a7 Update hilbertshotel.dmm 2020-12-13 18:55:23 -07:00
silicons
c2727ca278 Merge pull request #13743 from Linzolle/thunderdome 
thunderdome entertainment monitors fix + stuff
 2020-12-12 01:55:53 -07:00
EmeraldSundisk
2a35a23509 Add files via upload 2020-12-10 13:35:47 -08:00
keronshb
d94c9a5d43 Fixes the paper 
oops should've caught this
 2020-12-10 15:26:34 -05:00
keronshb
bb78b98d6c Box Maint (+1) changes 
Changes the northwest box maint and adds a bridge between atmos and the turbine.
 2020-12-09 23:02:51 -05:00
EmeraldSundisk
c15f946104 Update DeltaStation2.dmm 2020-12-09 10:35:45 -08:00
Linzolle
0ddc053a8b what if mapmerge worked 2020-12-08 17:35:21 -06:00
Linzolle
3e951d334c fix entertainment monitors 2020-12-08 17:21:14 -06:00
silicons
750f81920b Merge pull request #13717 from TheObserver-sys/shuttlefix 
Mining and Monastery Shuttle Fixes
 2020-12-03 16:34:00 -07:00
The0bserver
4559a153c3 Map Tweak 2020-11-27 16:51:55 -05:00
MrJWhit
00337392c7 Sneaky opposum 2020-11-26 00:58:48 -05:00
silicons
75d807df4e Merge pull request #13694 from TheObserver-sys/PublicMiningRevival 
Local Assistant man can now bash rock again!*
 2020-11-21 18:25:13 -07:00
The0bserver
5e9e984fd0 a few more crumbs we missed. Travis might be happy now. 2020-11-20 18:45:32 -05:00
The0bserver
902cb94ee7 Whoo, we almost forgot this one. 2020-11-20 05:19:54 -05:00
The0bserver
56b6a42bb8 Tweaks, making sure code is right. Pain is infinite. 
Tin
 2020-11-20 03:54:28 -05:00
The0bserver
d3b0ac882f HERE WE GOOOOOOOOOO! 
New maps, new meme.
 2020-11-20 03:05:44 -05:00
Putnam3145
9d300ade35 Merge pull request #13677 from silicons/newlines 
Adds missing EOF newlines
 2020-11-18 17:50:38 -08:00
The0bserver
6d1ace27f7 Initial Commit: Mapping is painful 2020-11-18 00:38:35 -05:00
EmeraldSundisk
330da48518 Add files via upload 2020-11-14 15:38:33 -08:00
EmeraldSundisk
00398cb45a Add files via upload 2020-11-14 15:14:53 -08:00
EmeraldSundisk
993ac9b52d Add files via upload 2020-11-14 13:32:34 -08:00
EmeraldSundisk
81c9bfecdc Update CogStation.dmm 2020-11-14 10:37:05 -08:00
silicons
803bff4e5f funny 2020-11-12 23:34:42 -07:00
silicons
446feeb8f8 Merge pull request #13653 from MrJWhit/kilo-fixes 
A few fixes to kilo
 2020-11-07 00:32:23 -07:00
silicons
2b273addf1 Merge pull request #13618 from Vynzill/mappinghell 
new jungle gateway map
 2020-11-07 00:19:11 -07:00
MrJWhit
be9e5acc19 A few fixes to kilo 2020-11-01 21:02:18 -05:00
zeroisthebiggay
44eb62b388 a (#13647) 2020-11-01 22:00:20 +01:00
silicons
453d5081a7 Merge pull request #13628 from MrJWhit/messing-with-boxstations-maint 
Adjusting Boxstation's Southeast Maint (three new rooms)
 2020-10-28 07:54:04 -07:00
silicons
0307884eab Merge pull request #13627 from Ghommie/Ghommie-cit841 
Here I fix a few issues.
 2020-10-28 07:53:22 -07:00
silicons
2827893950 Merge pull request #13612 from MrJWhit/hermit-expansion 
Space Hermit map buff
 2020-10-28 07:47:24 -07:00
MrJWhit
5806ea8f50 Even cooler.jpg 2020-10-26 20:39:20 -04:00
MrJWhit
5da37ddeb2 Minor fix 2020-10-26 18:57:06 -04:00
MrJWhit
65f82daa44 Update BoxStation.dmm 2020-10-25 17:59:53 -04:00
MrJWhit
1e65afda9d Update BoxStation.dmm 2020-10-25 17:58:00 -04:00
MrJWhit
c540bcd0f2 Secret botany 2020-10-25 17:54:02 -04:00
MrJWhit
33cfcc72be Making box maint cooler, bot party room and maint rage cage part 1 2020-10-25 14:31:43 -04:00
Ghommie
f49f72338f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit841 2020-10-25 15:01:57 +01:00
Ghommie
90c4cb2022 Here I fix a few issues. 2020-10-25 14:50:42 +01:00
MrJWhit
c860cc78df Giving science a space loop on every map (#13611) 
* Boxstation Fix

* DeltaStation and Boxstation Update

* Kilo fix and minor omegastation fix

* Lambda fixing

* Metastation update

* Second to last update

* Pubby and final touches
 2020-10-25 14:15:01 +01:00
Vynzill
ff6850b9b0 jungle gateway map 2020-10-23 15:11:27 -05:00
MrJWhit
65fa7e72bf Removing fire locker and adding a maint spawner instead 2020-10-22 18:52:16 -04:00
MrJWhit
504447f3ae Space Hermit buff 2020-10-22 15:23:33 -04:00
Vynzill
5f75151c51 junglemap 2020-10-21 17:00:28 -05:00
Detective Google
8167f047f9 Update snow_taxi.dmm 2020-10-17 19:29:13 -05:00