shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
34,806 Commits 5 Branches 0 Tags
3264ece1508cb0fa7ac2b2bc8ac2a48fffa091ad
Commit Graph

1638 Commits

Author SHA1 Message Date
silicons
e51bee9649 Merge pull request #12607 from Detective-Google/cog-2 
cog fixes round 2
 2020-06-27 14:54:31 -07:00
silicons
7115df73f7 Merge pull request #12591 from MrJWhit/snow-snaxi-update 
Snow Snaxi update
 2020-06-27 14:53:52 -07:00
Detective Google
57fca41e20 aeugh2 2020-06-25 15:22:11 -05: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
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
Detective Google
5b0886a150 and that's all folks (for now) 2020-06-22 20:32:12 -05:00
Detective Google
a406927c95 euthanizes spacebattle, helps wildwest a little (it's still shit) 2020-06-22 20:31:14 -05:00
Detective Google
98756b3bc7 snowdin is wack 2020-06-22 20:24:19 -05:00
Detective Google
46805bc872 more progress 2020-06-22 20:11:18 -05:00
Detective Google
a8b6bb7957 step 2; de-looting the caves 2020-06-22 19:46:48 -05:00
Detective Google
dc81519380 whoops me forget to hit save first 2020-06-22 19:29:01 -05:00
Detective Google
d4dd1a162a loot-yeet #1; wizard academy 2020-06-22 19:28:47 -05:00
Detective Google
4e26916502 Merge remote-tracking branch 'upstream/master' into bald-bald-bald-bald-bald-bald-bald 2020-06-20 14:00:14 -05:00
kevinz000
118ac1a775 Merge pull request #12548 from timothyteakettle/more-events 
ports several tg events including fugitives
 2020-06-17 20:10:04 -07:00
Detective Google
898480af84 fixes some missing icon statesa on moonoutpost and UO45 2020-06-17 19:48:28 -05:00
Detective Google
0e1db216c8 Ports the reworked snowcabin and beach away missions by Jerry Derpinson (the baldy) 2020-06-17 19:33:14 -05: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
Timothy Teakettle
2d1d2eeda6 final fixes 2020-06-16 23:47:22 +01:00
Timothy Teakettle
779e15f3b5 map fixes 2020-06-16 17:16:31 +01:00
Timothy Teakettle
d10dfbec5e fix maps but it works 2020-06-16 16:23:53 +01:00
timothyteakettle
b59c8c1af6 fix maps 2020-06-16 02:44:11 +01:00
Timothy Teakettle
d7bce8aec0 ports some events 2020-06-15 20:22:40 +01: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
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
85186a9714 Porting updates related to material datums. (#12317) 
* Porting updates related to material datums.

* art_type

* oh oh
 2020-05-25 14:21:00 -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
EmeraldSundisk
da772b9cb7 Adds the "Space Diner" space ruin. (#12337) 
* Create spacediner.dmm

* Update spacediner.dmm

* Update spacediner.dmm

* Conversion.

* Adds the beacon and APC.
 2020-05-24 13:11:49 -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
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