1bc2404bae
revert cc
2020-07-29 01:47:14 -07:00
e4148fe4ad
Merge remote-tracking branch 'citadel/master' into 12742
2020-07-29 01:11:11 -07:00
5284fbbec0
various fixes to make the PR not conflict with clickdelays probably
2020-07-28 23:52:13 -04:00
785c2b6e0b
Merge pull request #12934 from dapnee/a-fan
...
Miscellaneous fixes to Kilo Station and a Fan for the Listening Outpost
2020-07-26 23:01:08 -07:00
e083689b4b
Merge pull request #12923 from EmeraldSundisk/snaxattack
...
Adds more toilets, among other things to Snow Taxi.
2020-07-26 23:00:16 -07:00
d9f9b2e974
Merge pull request #12916 from MrJWhit/meta-station-atmos-and-toxins-update
...
Metastation atmos and toxins map update
2020-07-26 22:57:36 -07:00
940d4c4d72
kilostation fixes
...
haha, why did this get through?
2020-07-26 19:30:55 -06:00
8fbdc6257c
Update listeningstation.dmm
...
it's a fan
2020-07-26 18:26:52 -06:00
29a3050209
Add files via upload
2020-07-26 11:30:24 -07:00
d14256e8a9
Minor map adjustments to meta
2020-07-26 01:10:56 -04:00
503d39e8bc
Update MetaStation.dmm
2020-07-26 00:51:58 -04:00
40b956c1ba
Update Snaxi.dmm
2020-07-25 19:31:21 -07:00
e2eb08fcba
probably gets travis to stop yelling about the new reebe
2020-07-25 17:43:49 -04:00
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
3c5aa67eef
Merge pull request #12867 from EmeraldSundisk/omega717
...
Expands OmegaStation's medical wing.
2020-07-23 10:29:29 -07:00
9392eb3bb1
Merge pull request #12866 from Sneakyrat6/snaxiTypo
...
Fixes Snaxi DMM Typos
2020-07-23 10:29:19 -07:00
29023f9522
Add files via upload
2020-07-22 16:49:40 -07:00
f422ffb998
Update OmegaStation.dmm
2020-07-22 15:24:20 -07:00
1a641231a9
Fixes Snaxi DMM Typos
2020-07-22 16:20:32 -05:00
f3efa19436
Merge remote-tracking branch 'citadel/master' into 12742
2020-07-21 11:25:26 -07:00
3c4b11f3f2
please
2020-07-21 11:20:45 -07:00
bcec131eff
Update OmegaStation.dmm
2020-07-20 22:06:00 -07:00
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
166ad02d6b
Update OmegaStation.dmm
2020-07-19 22:26:35 -07:00
214db57e95
minor Reebe edits
...
Basically just makes sure all the component decorations in Reebe can't be used for a varying amount of starter power
2020-07-19 02:09:43 -04:00
f9222485bf
Update OmegaStation.dmm
2020-07-18 22:56:27 -07:00
f8ad4d3186
Merge pull request #12761 from EmeraldSundisk/deltadive
...
A pool and lighting fixes for Delta Station.
2020-07-17 17:11:22 -07:00
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
3521a54c2b
Reebe as its own z is just easier to manage, so its back to being one
...
Sorry maxcappers and BoH bombers, your cheap tactics will no longer work if you manage to sneak into the void
2020-07-15 00:44:30 -04:00
4febb24dcf
Add files via upload
2020-07-13 08:38:22 -07:00
732a1ca438
Fixes linter and conflict shit
2020-07-13 16:35:12 +03:00
5f9364c5f8
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
2020-07-13 16:20:54 +03:00
d13eb1868c
Adds another light to pubby
2020-07-13 02:05:29 -04:00
4cd7670eaf
Update DeltaStation2.dmm
2020-07-12 21:03:09 -07:00
80b4c03c82
Initial changes to get this to github for public reviewing
...
-Removes the Reebe z level and puts it on the cc z level
-Replaces the Neovgre mech stepsound
-Moves spacial gateway into drivers so the cult isn't stuck stationside
-Adds the Belligerant scripture, which applies the Belligerant status effect to non-clankers in range
-Various other changes currently commented out for later work on them.
-removes the abductor teleport cameras from Reebe
-adds a Brass multitool, essentially just an advanced multitool with a special sprite.
-makes clockcult armor have 0 laser defense normally and 10 defense when the ark is almost done summoning Ratvar instead of -25 --> -15
-Makes spear recalling worded to support the addition of new weapons to summon
-Adds new structures for power generation and shuttle delaying
-Other changes I've probably forgotton, but are too lazy to scrounge through the code at 12:43 AM
2020-07-12 00:43:54 -04:00
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
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
1faa8915f8
gateway center
2020-07-09 23:28:45 -05:00
bf97828e5e
Add files via upload
2020-07-09 21:06:27 -07:00
4f17e7ab1d
Update CogStation.dmm
2020-07-09 18:34:29 -07:00
b22f73e27f
Update CogStation.dmm
2020-07-09 18:17:42 -07:00
e0428e946e
Update CogStation.dmm
2020-07-09 12:46:29 -07:00
9de8483bcf
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
2020-07-09 22:14:20 +03:00
af9348c443
Merge pull request #12708 from EmeraldSundisk/poolby
...
Adds a pool to PubbyStation.
2020-07-09 02:26:39 -07:00
886b196863
Lost decal
2020-07-08 13:49:10 -04:00
22505097ec
plz final update
2020-07-08 13:44:08 -04:00
bbc9b47eee
Update PubbyStation.dmm
2020-07-08 13:41:45 -04:00
27abb80953
Removing the ugly pubby monastery hallway
2020-07-08 13:34:31 -04:00
7dd37cad34
Kilo fix
2020-07-07 23:29:21 +03:00
33f56fd168
Merge pull request #12694 from Ghommie/Ghommie-cit833
...
mowing down experimental cloner copypasta.
2020-07-07 13:23:25 -05:00
silicons