9db6941dad
Fuck
2020-08-23 00:48:58 -04:00
4829c51f3a
Metatstation update
2020-08-20 00:31:52 -04:00
b33fc8e3b3
Adds Opposums to all maps
...
Except cogstation because it throws an error
2020-08-09 16:47:17 +08:00
7cd5217871
AI Open
...
What if Engies didn't have to ask the AI to open the way to tcomms so they could fix it?
2020-08-04 19:00:44 -06: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
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
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
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
bd289d0edb
more map changes...
2020-07-05 00:08:33 -03:00
6ee1eba56c
Merge remote-tracking branch 'origin/master' into TGUI-3.0
2020-07-02 23:23:47 +03:00
de77b7139c
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765
2020-06-23 00:13:14 +02:00
aff4e5f93f
Linter fixes
2020-06-22 17:58:52 +03:00
c41d2e78be
Conflicts!!!
2020-06-22 17:39:24 +03:00
170a38a3a7
Porting sutures and meshes from /TG/ ( #12532 )
...
* Porting sutures and meshes from /TG/
* Recipes fix
2020-06-16 16:22:56 -07:00
882c11e0e5
This is every single onstation gateway r-r-ight?
2020-06-16 20:53:56 +03:00
bc30fb7710
Hard resets _maps to master
2020-06-16 16:09:05 +03:00
19f215477e
Merge remote-tracking branch 'upstream/master' into TGUI-3.0
2020-05-30 18:52:02 +03:00
1bca74465f
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765
2020-05-30 03:29:02 +02:00
0a6b755eff
Apotechary chem dispenser nerf. ( #12292 )
...
* Apotechary chem dispenser nerf.
* Spelling and build_path.
2020-05-24 13:20:32 -07:00
ab5d65a454
Porting the BEPIS research machinery. ( #12277 )
...
* Initial B.E.P.I.S port.
* All nodes but sticky tape are in. Sweet.
* Mapping the BEPIS :DDD
* ah
* deers.
2020-05-24 13:05:15 -07:00
a84e7bcecc
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765
2020-05-24 04:00:51 +02:00
ffb2678eb0
Lets hope this fixes it
2020-05-22 22:52:41 +03:00
9d04b0835b
Conflicts galore
2020-05-21 21:08:12 +03:00
9eccef2836
Porting "Personal interaction messages to simple animals" and more. ( #12268 )
...
* Porting "Personal interaction messages to simple animals" and more.
* Travis check.
* doc
* whoopsie.
* )
2020-05-18 04:46:57 -07:00
30ab79e09e
Porting the twohanded component.
2020-05-17 18:16:53 +02:00
fc5d5fb087
Moving buttons away from windows.
2020-05-14 00:23:47 +02:00
1e0f30a446
[Map Edits] Minimal Piping/Device Fixes ( #12239 )
...
* map fixes
* reverting delta fix for PR conflict
2020-05-13 20:56:56 +02:00
dabdf16eac
Coonflict fiiixeeess
2020-05-13 12:56:17 +03:00
5b7d9a9008
Merge conflict fix
2020-05-13 12:37:18 +03:00
757706653d
Map paths.
2020-05-12 21:01:34 +02:00
7fb96ab0cf
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685
2020-05-12 20:06:59 +02:00
2ce118f851
MetaStation atmos update ( #12099 )
...
* Finishes up meta station atmos
* Update MetaStation.dmm
2020-05-04 05:05:27 +02:00
6b4747d5fe
Meta station atmos opening up ( #12047 )
...
* Spawning area fix.
Part one of many
* Finishing up atmos
* Haha final fixes
* Security camera update
* Haha whoops, thanks lilly
2020-05-01 21:26:36 +02:00
67e0b95407
Shuttle stuffs and gateway refactor port https://github.com/tgstation/tgstation/pull/49868/
2020-04-23 12:36:42 +03:00
c7b174676b
Add files via upload
2020-04-14 16:15:31 +00:00
94bcc6a64b
removes these
2020-04-13 14:38:30 -04:00
b8548f521b
Merge pull request #11746 from Trilbyspaceclone/found_and_hidden
...
Atomic PR 1 or 2 - Toilet Mapping!
2020-04-09 02:11:43 -07:00
8b2132317b
Ports a rewritten version of BAYSTRUMENTS ( #11680 )
...
* bay instruments
* k
* AAA
* remove that
* changes
* Update _instrument_key.dm
* safety nets
* @ghommie fixed
* volume
* Update item.dm
* Update item.dm
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com >
2020-04-07 15:21:50 +02:00
cb187dd944
corrections?
2020-04-07 07:36:20 -04:00
a6e07e5427
Merge branch 'master' into found_and_hidden
2020-04-07 03:37:09 -04:00
70859170c7
basically i fucking hate map merge conflicts
2020-04-04 16:32:45 +02:00
62509ab4a9
the mapping side
2020-04-04 10:16:43 -04:00
f735a2319a
it ( #11721 )
...
yeah
2020-04-04 00:47:18 +02:00
a8759b048e
smashes the tyranny of public mining
2020-03-31 23:32:15 +02:00
52138696d0
PROTO KINETIC dream CRUSHER
...
oh yeah give me all the shutters daddy
2020-03-26 13:08:37 +00:00
ea7c1058b5
Merge pull request #11524 from Ghommie/Ghommie-cit627
...
More or less ports "Clothing /under repath"
2020-03-23 10:40:31 -07:00
80baf85300
Bumbles, the Humble Bumblebee finally finalized the contract to move into his new home in Hydroponics ( #11543 )
...
* Maps Bumbles in for once
* Hopefully fixes merge conflicts?
2020-03-22 13:13:40 +01:00
043de9dcd2
Removes the roundstart syringe guns on each map, replacing them with medidart guns. ( #11560 )
...
* nukes roundstart syringe guns for roundstart dart guns.
* fixes the delta and meta maint syringes to have an identical change.
* brings lambda up to date with master.
2020-03-22 13:11:37 +01:00
86898cc451
Force pushed updates
2020-03-22 01:43:19 +01:00
MrJWhit