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-10 09:54:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
40,155 Commits 55 Branches 0 Tags
6c5c342bb82d4a842e872355545bb5ccdff9eabb
Commit Graph

1930 Commits

Author SHA1 Message Date
EmeraldSundisk
6c5c342bb8 Update CogStation.dmm 2020-12-29 12:20:25 -08:00
silicons
a7ed197675 Merge pull request #13884 from Hatterhat/are-you-fucking-kidding-me 
":n hey miners don't forget the dock silver" the PR - also includes a box whiteship tinyfan fix
 2020-12-29 01:28:39 -07:00
silicons
da25c48b2c Merge pull request #13855 from Chiirno/paramedBoxOffice 
Paramed office on box + Surgery remodel
 2020-12-29 01:27:49 -07:00
Chiirno
1df5aefcd9 re-added replacement lights to Starboard Emergency Storage 2020-12-28 05:49:17 -04:00
Chiirno
782e6037c5 added a holopad to kitchen and hydroponics. 2020-12-28 02:28:36 -04:00
Hatterhat
a8f1960c5b disregard the branch name 2020-12-27 01:14:12 -06:00
Chiirno
81fe7f4230 returned access to Starboard Emergency Storage 2020-12-27 03:01:29 -04:00
Chiirno
6beb47ef6d re-removed bedsheet on morgue tray 2020-12-27 02:46:00 -04:00
Blue Wildrose
6d89c9f7b6 I learned about mapmerger 2020-12-26 16:39:20 -07:00
Chiirno
6508f76fcf removed toxins mixing chamber zone and replaced it with toxins mixing lab zone 2020-12-26 18:56:14 -04:00
Chiirno
269182f6ec added al light switch to surgery 2020-12-26 18:53:55 -04:00
Blue Wildrose
cac5e6dad6 A Pubby Christmas 2020-12-25 20:59:10 -07:00
Chiirno
cb4780739a added one more paramed spawn in office, for a total of three 2020-12-23 22:44:33 -04:00
Chiirno
4d85410327 bleached surgical storage, shrunk office and expanded emergency storage. Minor rearrangements of wallmounts wires and misc objects. 2020-12-23 21:14:46 -04:00
Chiirno
3dc96ce0d2 moved consoles around so they are adjacent to the surgery tables 2020-12-23 03:54:58 -04:00
Chiirno
08b40e3483 added quotation marks to an airlocks name 2020-12-23 02:11:42 -04:00
Chiirno
bbbe99e99d switched the air cannister and the heater in Starboard Emergency Storage 2020-12-23 01:59:07 -04:00
Chiirno
739574731f removed the second air alarm in surgery 2020-12-23 01:46:12 -04:00
Chiirno
a267e61cbd solidified paramed morgue airlock, moved surgery fridge, and rearranged some of the wall mountings. 2020-12-23 00:56:28 -04:00
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