shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
41,098 Commits 5 Branches 0 Tags
a9170aae93f228551d83147677da8ee918db9b97
Commit Graph

332 Commits

Author SHA1 Message Date
MrJWhit d8f76a023b Tada 2021-01-23 03:44:55 -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
Blue Wildrose 2ab6a5cf96 Adds Colormates to every map except Snaxi 2021-01-12 06:26:13 -07: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
TripleShades 3bb244410c oops leftover decal 2021-01-05 22:13:57 -08:00
TripleShades 518da2ea06 Update MetaStation.dmm 2021-01-04 15:39:08 -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
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 c34656c5e8 The rest of the stuff 2020-12-15 13:51:04 -05:00
The0bserver d3b0ac882f HERE WE GOOOOOOOOOO! 
New maps, new meme.
 2020-11-20 03:05:44 -05:00
Ghommie f49f72338f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit841 2020-10-25 15:01:57 +01:00
Ghommie 90c4cb2022 Here I fix a few issues. 2020-10-25 14:50:42 +01:00
MrJWhit c860cc78df Giving science a space loop on every map (#13611) 
* Boxstation Fix

* DeltaStation and Boxstation Update

* Kilo fix and minor omegastation fix

* Lambda fixing

* Metastation update

* Second to last update

* Pubby and final touches
 2020-10-25 14:15:01 +01:00
Detective Google c4480afc09 Adds a bunch of RP clothes and ports the detvendor 2020-09-30 20:50:00 -05:00
EmeraldSundisk 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
MrJWhit 9db6941dad Fuck 2020-08-23 00:48:58 -04:00
MrJWhit 4829c51f3a Metatstation update 2020-08-20 00:31:52 -04:00
Michiyamenotehifunana b33fc8e3b3 Adds Opposums to all maps 
Except cogstation because it throws an error
 2020-08-09 16:47:17 +08: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
silicons 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
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
silicons 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
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
SmArtKar 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
Ghom 0a6b755eff Apotechary chem dispenser nerf. (#12292) 
* Apotechary chem dispenser nerf.

* Spelling and build_path.
 2020-05-24 13:20:32 -07:00
Ghom 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
Ghom 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-kb 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