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,823 Commits 55 Branches 0 Tags
30755bfeb98afd3d271ffd4af5f1b298131abd6a
Commit Graph

1969 Commits

Author SHA1 Message Date
silicons
30755bfeb9 Merge pull request #14078 from MrJWhit/metastation-toxins-fix-2-electric-bogaloo 
Gives metastation toxins storage a scrubber 'n vent
 2021-01-20 15:21:55 -07:00
Putnam3145
f7f9185073 Merge pull request #13826 from LetterN/semi-sync 
/tg/ ""hardsync"" part one of many*
 2021-01-19 17:22:05 -08:00
silicons
dedb0cb62e Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-19 04:24:42 -07:00
MrJWhit
4f49dab040 Update Mining_Station_Public_01.dmm 2021-01-18 01:57:05 -05:00
MrJWhit
0c45aab261 Update MetaStation.dmm 2021-01-17 04:45:55 -05:00
MrJWhit
5f5c7667df Update MetaStation.dmm 2021-01-17 03:48:41 -05:00
MrJWhit
68f8258f82 Teehee oops 2021-01-15 09:52:39 -05:00
MrJWhit
02abd90e1f Update PubbyStation.dmm 2021-01-15 09:45:32 -05:00
silicons
ea07ad6e48 Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-13 15:41:28 -07:00
DeltaFire
6bdca6b8e4 Merge pull request #14033 from BlueWildrose/colormateys 
Adds Color Mates to every station (except Snaxi)
 2021-01-13 18:39:40 +01:00
Hatterhat
cb40ad4764 atomization is cowardice actually 2021-01-12 16:08:17 -06:00
Blue Wildrose
5436db5f3b Add a color mate to the ghost cafe as well, yeah 2021-01-12 13:55:42 -07:00
Blue Wildrose
32aa851062 somethings up with the HoS pet carp on Kilo, fixing that 2021-01-12 06:54:06 -07:00
Blue Wildrose
8111757e5b oops messed something up with kilo 2021-01-12 06:49:31 -07:00
Blue Wildrose
2ab6a5cf96 Adds Colormates to every map except Snaxi 2021-01-12 06:26:13 -07:00
silicons
ddad368d6a Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-08 00:33:57 -08:00
MrJWhit
cb7d81a8e1 Update MetaStation.dmm 2021-01-08 02:41:45 -05:00
MrJWhit
8108109965 Fixes a mistake on metastation 2021-01-06 18:04:40 -05:00
MrJWhit
abffac67b2 Port'n 2021-01-06 03:16:08 -05:00
silicons
e4e029a061 Merge pull request #13961 from MrJWhit/snipping-the-ai-thread 
Fuck it, I'll just fix a whole bunch of stuff on cogstation
 2021-01-05 23:40:07 -07:00
silicons
e6aac9d4fb Merge pull request #13970 from TripleShades/fixies-oops 
Meta Surgery Fixies
 2021-01-05 23:39:53 -07:00
TripleShades
3bb244410c oops leftover decal 2021-01-05 22:13:57 -08:00
MrJWhit
98520dc519 Update CogStation.dmm 2021-01-05 19:38:30 -05:00
MrJWhit
ab856c75bb Update CogStation.dmm 2021-01-05 19:25:44 -05:00
MrJWhit
f88957986f Update BoxStation.dmm 2021-01-05 16:21:37 -05:00
MrJWhit
1a49d9738a Update CogStation.dmm 2021-01-05 00:54:34 -05:00
MrJWhit
3fd72b9ec2 Update BoxStation.dmm 2021-01-04 20:33:36 -05:00
TripleShades
518da2ea06 Update MetaStation.dmm 2021-01-04 15:39:08 -08:00
MrJWhit
27b5c3957f Snip snip 2021-01-04 01:26:14 -05:00
silicons
a0d58cd18d Merge pull request #13954 from EmeraldSundisk/coglocks 
Cog and firelocks.
 2021-01-03 20:19:46 -07:00
EmeraldSundisk
3e813c1ecc Add files via upload 2021-01-03 00:16:02 -08:00
TripleShades
79db7e0db5 Changed out lightswitch for extinguisher on Recovery Room outer wall; Replaced wall with Clean Hands poster with a drape; Added Nanomeds to surgery 2021-01-02 16:00:49 -08:00
EmeraldSundisk
5961d09298 Update CogStation.dmm 2021-01-01 23:08:21 -08:00
TripleShades
bf8c87f373 Update MetaStation.dmm 
fixes surgery apc being rotated incorrectly, moves wheelchair out of storage for public access
 2021-01-01 15:49:57 -08:00
TripleShades
c57a5520fa Update MetaStation.dmm 2021-01-01 14:59:01 -08:00
MrJWhit
d0aaf0abfc touchups for sec box 2020-12-30 21:00:46 -05:00
EmeraldSundisk
ab260dcdec Add files via upload 2020-12-29 12:30:09 -08:00
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
Letter N
d82def21b8 linter shoo 2020-12-29 12:32:10 +08:00
Letter N
f28363ae56 code quality 2020-12-29 11:12:56 +08: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