shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
48,445 Commits 5 Branches 0 Tags
master
Commit Graph
2532 Commits
Author SHA1 Message Date
timothyteakettle b59c8c1af6 fix maps 2020-06-16 02:44:11 +01:00
Artur 5df0cbfc40 Manual mapedit 2020-06-16 02:29:05 +03:00
Artur ae7aea43b2 Annoying map shjit 2020-06-16 01:37:25 +03:00
Artur ceba739231 Cooonflicts 2020-06-16 01:23:42 +03: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
TrilbySpaceClone 6a008d2944 Kevs requests 2020-06-14 06:03:13 -04: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
EmeraldSundiskandGitHub 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
TrilbyspacecloneandGitHub f42994c79b Toxin tweaks! Just storage (#12363) 
* Toxin tweaks

* bepis readd

* paintings

* Update DeltaStation2.dmm

* Fixed
 2020-06-09 05:34:22 -07:00
Artur b6dc41b852 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-06-09 11:07:39 +03:00
Artur 094a1b6f62 More vr sleeper work and map fix 2020-06-09 11:06:16 +03:00
EmeraldSundiskandGitHub 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
TrilbySpaceClone b62ef0f4e8 right... 2020-06-02 19:44:47 -04:00
GhomandGitHub 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
TrilbySpaceClone dee7fc67eb Update lavaland_surface_sloth.dmm 2020-06-01 19:50:44 -04:00
EmeraldSundiskandGitHub 2ac1ada029 Add files via upload 2020-05-31 19:52:00 -07:00
TrilbySpaceClone fa71523cdf even better founten! 2020-05-30 22:09:06 -04:00
TrilbySpaceClone 48e9e54466 much better looking! 2020-05-30 21:07:14 -04: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
EmeraldSundisk 29108e6cd6 Update CogStation.dmm 2020-05-28 19:59:41 -07:00
MrJWhitandGitHub 55a58ba76c Fixes pipe to turbine (#12346) 2020-05-28 00:37:36 -07:00
KathrinBaileyandGitHub 778db1d9f5 Fixes missing shutters (#12359) 2020-05-26 03:52:23 -07:00
GhomandGitHub 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
GhomandGitHub 0a6b755eff Apotechary chem dispenser nerf. (#12292) 
* Apotechary chem dispenser nerf.

* Spelling and build_path.
 2020-05-24 13:20:32 -07:00
GhomandGitHub 293e3fea28 Removing that maint dorm carbin beside the disposal room, and excess wardrobe. (#12308) 2020-05-24 13:12:18 -07:00
EmeraldSundiskandGitHub 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
GhomandGitHub 6756b564b7 Removing that one keg. (#12333) 2020-05-24 13:07:53 -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
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
Artur 9d04b0835b Conflicts galore 2020-05-21 21:08:12 +03:00
MrJWhitandGitHub 861734d119 Updates icebox atmos to box atmos (#12299) 2020-05-20 18:47:54 -07:00
GhomandGitHub 3ac61c0704 Porting tg painting code. (#12305) 
* Porting tg painting code.

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

* AAA

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