shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
35,146 Commits 5 Branches 0 Tags
c1a985d15418ec00a460560d878ea076c2a21ed0
Commit Graph

1140 Commits

Author SHA1 Message Date
EmeraldSundisk
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
Ghom
8666f83848 Merge pull request #12620 from EmeraldSundisk/omegasec2 
Gives Omega Station genpop.
 2020-07-01 19:52:44 +02: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
silicons
e51bee9649 Merge pull request #12607 from Detective-Google/cog-2 
cog fixes round 2
 2020-06-27 14:54:31 -07:00
EmeraldSundisk
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
Detective Google
42ae6233db aeugh 2020-06-25 15:18:11 -05:00
Detective Google
5d99f68d8c stinky panda goes in the box 2020-06-25 14:57:41 -05:00
Detective Google
f33586a4b5 coggers 2020-06-25 14:41:03 -05:00
EmeraldSundisk
71576d79ee Update OmegaStation.dmm 2020-06-24 15:01:58 -07:00
MrJWhit
922abf5994 Just doing it myself 2020-06-24 01:30:30 -04:00
MrJWhit
5b91340e47 Update Snaxi.dmm 2020-06-24 01:18:12 -04:00
MrJWhit
ca93891014 AAAAAAAAAAAAAAAAAAAAAAAAAH 2020-06-23 23:39:15 -04:00
Ghommie
265acb6876 travis check. 2020-06-23 15:38:04 +02: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
EmeraldSundisk
7f6e8f8670 Update OmegaStation.dmm 2020-06-21 00:30:30 -07:00
kevinz000
fbf09e84c4 Merge pull request #12531 from Detective-Google/o7-icebox 
Takes icebox out back and old yellers it.
 2020-06-16 23:36:41 -07:00
kevinz000
ba162eb90a Merge pull request #12530 from Detective-Google/no-more-100%-chance-combat-upgrade 
Ashwalker den no longer spawns with a Malf upgrade and illegal tech
 2020-06-16 23:32:48 -07:00
kevinz000
bd9ce04471 some cog touchups (#12538) 2020-06-16 23:32:14 -07:00
Detective-Google
9d956e7c1c a couple little snaxi fixes (#12539) 
* a couple little snaxi fixes

* way too much blasma

* asd

* adadadada

* a

* bepis

* patrol beacons

* aaaaa
 2020-06-16 23:32:04 -07: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
Detective Google
6ec28cd914 some cog touchups 2020-06-14 16:26:19 -05:00
Detective Google
6b6c5c6ecd don't go gently into the night, sweet prince. 2020-06-13 22:25:18 -05:00
Detective Google
fa5bae14f1 no 100% chance doomsday :^) 2020-06-13 22:14:23 -05:00
EmeraldSundisk
6512866c06 Initial OmegaStation Security overhaul. (#12499) 
* Update OmegaStation.dmm

* Update OmegaStation.dmm

* Update OmegaStation.dmm

* Add files via upload
 2020-06-11 05:44:01 -07:00
Trilbyspaceclone
f42994c79b Toxin tweaks! Just storage (#12363) 
* Toxin tweaks

* bepis readd

* paintings

* Update DeltaStation2.dmm

* Fixed
 2020-06-09 05:34:22 -07:00
EmeraldSundisk
1d990d317e Minimally invasive update to Omega Station. (#12434) 
* Update OmegaStation.dmm

* Update OmegaStation.dmm

* Add files via upload
 2020-06-04 15:44:12 -07:00
Ghom
1c3bfa623f Merge pull request #12175 from Detective-Google/snaxi2 
Adds a New map, Snow Taxi (A vgstation13 map port)
 2020-06-02 23:48:50 +02:00
EmeraldSundisk
2ac1ada029 Add files via upload 2020-05-31 19:52:00 -07: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
EmeraldSundisk
29108e6cd6 Update CogStation.dmm 2020-05-28 19:59:41 -07:00
MrJWhit
55a58ba76c Fixes pipe to turbine (#12346) 2020-05-28 00:37:36 -07:00
KathrinBailey
778db1d9f5 Fixes missing shutters (#12359) 2020-05-26 03:52:23 -07: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
293e3fea28 Removing that maint dorm carbin beside the disposal room, and excess wardrobe. (#12308) 2020-05-24 13:12:18 -07:00
Ghom
6756b564b7 Removing that one keg. (#12333) 2020-05-24 13:07:53 -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
Detective Google
d03d20d570 Merge remote-tracking branch 'upstream/master' into snaxi2 2020-05-22 13:52:56 -05:00
Detective Google
ddc9118b46 adds disposals courtesy of friend 2020-05-22 13:52:44 -05:00
MrJWhit
861734d119 Updates icebox atmos to box atmos (#12299) 2020-05-20 18:47:54 -07:00
Ghom
3ac61c0704 Porting tg painting code. (#12305) 
* Porting tg painting code.

* yes.
 2020-05-20 18:45:36 -07:00
Ghom
ed90c59d65 Removal of """silk""" (#12221) 
* Removal of """silk"""

* AAA

* Ashwalkers now start with durathread seeds
 2020-05-19 23:43:46 -07: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
jjpark-kb
cbc208375d [Map Fix] Button and Wall (#12285) 2020-05-16 22:29:43 +02:00