cyberpresidentvanellope/Sandstorm-Station-13
1
0
Fork 0
mirror of https://github.com/Sandstorm-Station/Sandstorm-Station-13.git synced 2026-08-22 20:57:48 +01:00
Code Issues Packages Projects Releases Wiki Activity
38,600 Commits 8 Branches 0 Tags
machine-changes
Commit Graph
324 Commits
Author SHA1 Message Date
Enric Gabriel c10471fac9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-30 01:42:29 -03:00
EmeraldSundiskandGitHub b89e8bed9c Add files via upload 2020-08-26 16:05:19 -07:00
EmeraldSundisk da76209681 Update MetaStation.dmm 2020-08-26 15:28:24 -07:00
Enric Gabriel 78124ace3f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-23 12:54:24 -03:00
MrJWhit 9db6941dad Fuck 2020-08-23 00:48:58 -04:00
Enric Gabriel f759503b49 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-22 20:30:49 -03:00
MrJWhit 4829c51f3a Metatstation update 2020-08-20 00:31:52 -04:00
SandPootandGitHub fe8119c18c Code optimizations + clean-up (#45) 2020-08-14 02:01:54 -03:00
Enric Gabriel cea68c05f5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-12 13:37:19 -03:00
Michiyamenotehifunana b33fc8e3b3 Adds Opposums to all maps 
Except cogstation because it throws an error
 2020-08-09 16:47:17 +08:00
Enric Gabriel e4f7092490 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-05 22:52:22 -03:00
dapnee 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
Enric Gabriel 48f8a998d5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-07-27 10:33:25 -03:00
siliconsandGitHub 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
MrJWhit d14256e8a9 Minor map adjustments to meta 2020-07-26 01:10:56 -04:00
MrJWhit 503d39e8bc Update MetaStation.dmm 2020-07-26 00:51:58 -04:00
Enric Gabriel 7ef0a3b076 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-07-25 22:23:50 -03:00
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
Enric Gabriel f0904c6b10 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-07-21 01:19:25 -03: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
Enric GabrielandGitHub 6859279d3e CentCom Teleporters! (#25) 2020-07-20 01:20:49 -03:00
Cirno bd289d0edb more map changes... 2020-07-05 00:08:33 -03:00
Artur 6ee1eba56c Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-07-02 23:23:47 +03:00
Ghommie 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
Artur aff4e5f93f Linter fixes 2020-06-22 17:58:52 +03:00
Artur c41d2e78be Conflicts!!! 2020-06-22 17:39:24 +03:00
SmArtKarandGitHub 170a38a3a7 Porting sutures and meshes from /TG/ (#12532) 
* Porting sutures and meshes from /TG/

* Recipes fix
 2020-06-16 16:22:56 -07:00
Artur 882c11e0e5 This is every single onstation gateway r-r-ight? 2020-06-16 20:53:56 +03:00
Artur bc30fb7710 Hard resets _maps to master 2020-06-16 16:09:05 +03:00
Artur 19f215477e Merge remote-tracking branch 'upstream/master' into TGUI-3.0 2020-05-30 18:52:02 +03:00
Ghommie 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
GhomandGitHub 0a6b755eff Apotechary chem dispenser nerf. (#12292) 
* Apotechary chem dispenser nerf.

* Spelling and build_path.
 2020-05-24 13:20:32 -07:00
GhomandGitHub 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
Ghommie 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
Artur ffb2678eb0 Lets hope this fixes it 2020-05-22 22:52:41 +03:00
Artur 9d04b0835b Conflicts galore 2020-05-21 21:08:12 +03:00
GhomandGitHub 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
Ghommie 30ab79e09e Porting the twohanded component. 2020-05-17 18:16:53 +02:00
Ghommie fc5d5fb087 Moving buttons away from windows. 2020-05-14 00:23:47 +02:00
jjpark-kbandGitHub 1e0f30a446 [Map Edits] Minimal Piping/Device Fixes (#12239) 
* map fixes

* reverting delta fix for PR conflict
 2020-05-13 20:56:56 +02:00
Artur dabdf16eac Coonflict fiiixeeess 2020-05-13 12:56:17 +03:00
Artur 5b7d9a9008 Merge conflict fix 2020-05-13 12:37:18 +03:00
Ghommie 757706653d Map paths. 2020-05-12 21:01:34 +02:00
Ghommie 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
MrJWhitandGitHub 2ce118f851 MetaStation atmos update (#12099) 
* Finishes up meta station atmos

* Update MetaStation.dmm
 2020-05-04 05:05:27 +02:00
MrJWhitandGitHub 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
Artur 67e0b95407 Shuttle stuffs and gateway refactor port https://github.com/tgstation/tgstation/pull/49868/ 2020-04-23 12:36:42 +03:00
UristMcAstronautandGitHub c7b174676b Add files via upload 2020-04-14 16:15:31 +00:00
kappa-sama 94bcc6a64b removes these 2020-04-13 14:38:30 -04:00
kevinz000andGitHub 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