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

1622 Commits

Author SHA1 Message Date
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
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
jjpark-kb
cbc208375d [Map Fix] Button and Wall (#12285) 2020-05-16 22:29:43 +02:00
Trilbyspaceclone
b21fb97bda Some fixes, some addtions some harm - Ice box changes (#12147) 
* Some fixes, some addtions some harm

* Update icemoon_surface_engioutpost.dmm
 2020-05-15 07:54:25 -07:00
Detective Google
c4ca8db4de showers + insuls 2020-05-14 00:42:32 -05:00
Ghommie
29ce144e94 Delta. 2020-05-14 01:24:47 +02:00
Ghommie
fc5d5fb087 Moving buttons away from windows. 2020-05-14 00:23:47 +02:00
Detective Google
dc49df0a4d clean up 2020-05-13 15:03:41 -05:00
Detective Google
234ed8da8e service lathe go brr 2020-05-13 14:33:29 -05:00
MrJWhit
44bb989ff9 Delta station opening of atmos (#12237) 
* Opening up delta atmos

* Final fixes

* adjustment to recheck travis
 2020-05-13 21:00:12 +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
Detective Google
f5754a55ea armory cams 2020-05-13 03:15:41 -05:00
Detective Google
c613376e47 try 2 at nerfing these barricades 2020-05-13 03:10:38 -05:00
Detective Google
e79b1312eb gps for lower mining 2020-05-13 03:06:46 -05:00
Detective Google
676af007fe fan 2020-05-13 02:28:45 -05:00