Commit Graph
1197 Commits
Author SHA1 Message Date
dapnee 6f0860d1d3 What if Meta Arrivals Weren't An Eye Sore?
Whack of you to assume this is kosher to make arrivals look like shit like that.
2020-07-23 16:36:54 -06:00
siliconsandGitHub 3c5aa67eef Merge pull request #12867 from EmeraldSundisk/omega717
Expands OmegaStation's medical wing.
2020-07-23 10:29:29 -07:00
siliconsandGitHub 9392eb3bb1 Merge pull request #12866 from Sneakyrat6/snaxiTypo
Fixes Snaxi DMM Typos
2020-07-23 10:29:19 -07:00
EmeraldSundiskandGitHub 29023f9522 Add files via upload 2020-07-22 16:49:40 -07:00
EmeraldSundisk f422ffb998 Update OmegaStation.dmm 2020-07-22 15:24:20 -07:00
Sneakyrat6 1a641231a9 Fixes Snaxi DMM Typos 2020-07-22 16:20:32 -05:00
EmeraldSundisk bcec131eff Update OmegaStation.dmm 2020-07-20 22:06:00 -07:00
siliconsandGitHub 267186a5d3 Merge pull request #12646 from Chiirno/emi
[READY] Alt-click cigarette pack functionality added to pill bottles.
2020-07-20 16:15:38 -07:00
EmeraldSundisk 166ad02d6b Update OmegaStation.dmm 2020-07-19 22:26:35 -07:00
EmeraldSundisk f9222485bf Update OmegaStation.dmm 2020-07-18 22:56:27 -07:00
siliconsandGitHub f8ad4d3186 Merge pull request #12761 from EmeraldSundisk/deltadive
A pool and lighting fixes for Delta Station.
2020-07-17 17:11:22 -07:00
siliconsandGitHub b22848b3f7 Merge pull request #12758 from MrJWhit/pubby-extra-light
Adds another light to pubby next to the kitchen
2020-07-17 17:09:25 -07:00
EmeraldSundiskandGitHub 4febb24dcf Add files via upload 2020-07-13 08:38:22 -07:00
Artur 732a1ca438 Fixes linter and conflict shit 2020-07-13 16:35:12 +03:00
Artur 5f9364c5f8 Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 2020-07-13 16:20:54 +03:00
MrJWhit d13eb1868c Adds another light to pubby 2020-07-13 02:05:29 -04:00
EmeraldSundisk 4cd7670eaf Update DeltaStation2.dmm 2020-07-12 21:03:09 -07:00
siliconsandGitHub f5974ab531 Merge pull request #12713 from MrJWhit/popping-the-monastery-tunnel
Popping the north monastery tunnel on Pubby
2020-07-11 00:48:22 -07:00
siliconsandGitHub e4612a7c32 Merge pull request #12726 from Detective-Google/lambda
lambda now has a center gateway and (should) works
2020-07-11 00:46:50 -07:00
Detective Google 1faa8915f8 gateway center 2020-07-09 23:28:45 -05:00
EmeraldSundiskandGitHub bf97828e5e Add files via upload 2020-07-09 21:06:27 -07:00
EmeraldSundisk 4f17e7ab1d Update CogStation.dmm 2020-07-09 18:34:29 -07:00
EmeraldSundisk b22f73e27f Update CogStation.dmm 2020-07-09 18:17:42 -07:00
EmeraldSundisk e0428e946e Update CogStation.dmm 2020-07-09 12:46:29 -07:00
Artur 9de8483bcf Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 2020-07-09 22:14:20 +03:00
MrJWhit 886b196863 Lost decal 2020-07-08 13:49:10 -04:00
MrJWhit 22505097ec plz final update 2020-07-08 13:44:08 -04:00
MrJWhit bbc9b47eee Update PubbyStation.dmm 2020-07-08 13:41:45 -04:00
MrJWhit 27abb80953 Removing the ugly pubby monastery hallway 2020-07-08 13:34:31 -04:00
Artur 7dd37cad34 Kilo fix 2020-07-07 23:29:21 +03:00
Artur f230e2bb06 fIXES KILO 2020-07-07 20:29:21 +03:00
EmeraldSundiskandGitHub e0a0d0bed8 Add files via upload 2020-07-07 09:05:31 -07:00
Artur 2158278a6f Fixes cog 2020-07-07 18:44:54 +03:00
Artur 280d3de6c3 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-07-07 18:37:45 +03:00
EmeraldSundisk 96f48c8237 Update PubbyStation.dmm 2020-07-07 00:01:25 -07:00
EmeraldSundiskandGitHub 672f86a318 Add files via upload 2020-07-05 09:39:53 -07:00
EmeraldSundisk 75b2a7dad5 Update CogStation.dmm 2020-07-05 09:18:26 -07:00
EmeraldSundisk d9f269280b Update CogStation.dmm 2020-07-04 23:45:08 -07:00
EmeraldSundisk 45a14f16d4 Revert "?"
This reverts commit c6b5bac0d8.
2020-07-04 21:39:23 -07:00
EmeraldSundisk c6b5bac0d8 ? 2020-07-04 21:33:29 -07:00
Cirno bd289d0edb more map changes... 2020-07-05 00:08:33 -03:00
Cirno 020da9fa07 i hope this works 2020-07-04 15:47:38 -03:00
Artur b1a45b2b0d what the fuck ma-[ps 2020-07-04 16:34:29 +03:00
Artur 6ee1eba56c Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-07-02 23:23:47 +03:00
GhomandGitHub 8666f83848 Merge pull request #12620 from EmeraldSundisk/omegasec2
Gives Omega Station genpop.
2020-07-01 19:52:44 +02:00
Artur 20245f7319 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-06-30 02:30:29 +03:00
Ghommie 9dc4b99620 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-06-30 00:49:06 +02:00
siliconsandGitHub e51bee9649 Merge pull request #12607 from Detective-Google/cog-2
cog fixes round 2
2020-06-27 14:54:31 -07:00
EmeraldSundiskandGitHub 2926f8dab1 Add files via upload 2020-06-26 16:40:01 -07:00
EmeraldSundisk 37f2242eec Update OmegaStation.dmm 2020-06-26 15:08:21 -07:00