shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,953 Commits 5 Branches 0 Tags
8b89832d76dc4e3d4f3e5ed38815b0eeeaeba2eb
Commit Graph

11953 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
LetterJay
8b89832d76 Merge pull request #4864 from Citadel-Station-13/upstream-merge-34463 
[MIRROR] Fixes duplicate reagents in chemistry macros
 2018-01-16 13:47:50 -06:00
CitadelStationBot
2e37263899 Automatic changelog generation for PR #4863 [ci skip] 2018-01-16 13:47:41 -06:00
LetterJay
f289433d08 Merge pull request #4863 from Citadel-Station-13/upstream-merge-34461 
[MIRROR] Fix heat-exchange manifold icons facing the wrong way
 2018-01-16 13:47:38 -06:00
LetterJay
4f85c676b2 Merge pull request #4862 from Citadel-Station-13/upstream-merge-34455 
[MIRROR] Fixes shuttle console negative auths needed
 2018-01-16 13:47:22 -06:00
LetterJay
2f2b98c4eb Merge pull request #4861 from Citadel-Station-13/upstream-merge-34460 
[MIRROR] Fixes ChangeTurf runtimes in late loaded templates.
 2018-01-16 13:47:10 -06:00
CitadelStationBot
f2d1bff04e Automatic changelog generation for PR #4860 [ci skip] 2018-01-16 13:46:54 -06:00
LetterJay
8debf46bed Merge pull request #4860 from Citadel-Station-13/upstream-merge-34199 
[MIRROR] Makes getFlatIcon slower. (Also more precise)
 2018-01-16 13:46:52 -06:00
CitadelStationBot
42a68f4e54 Automatic changelog generation for PR #4859 [ci skip] 2018-01-16 13:46:30 -06:00
LetterJay
bdcb7d2465 Merge pull request #4859 from Citadel-Station-13/upstream-merge-34471 
[MIRROR] No more air leaks from the asteroid shuttle
 2018-01-16 13:46:27 -06:00
CitadelStationBot
4fe2af7696 Fixes duplicate reagents in chemistry macros 2018-01-16 07:40:47 -06:00
Jordan Brown
292fb13612 Merge pull request #34463 from DaedalusGame/micro_fix 
Fixes duplicate reagents in chemistry macros
 2018-01-16 07:40:47 -06:00
CitadelStationBot
a4eed60ce0 Fix heat-exchange manifold icons facing the wrong way 2018-01-16 07:40:38 -06:00
Jordan Brown
4047738e03 Merge pull request #34461 from AutomaticFrenzy/patch/heat-exchange-manifold 
Fix heat-exchange manifold icons facing the wrong way
 2018-01-16 07:40:38 -06:00
CitadelStationBot
4e840a3333 Fixes shuttle console negative auths needed 2018-01-16 07:40:29 -06:00
kevinz000
47c74443da Fixes negative auth coutns 2018-01-16 07:40:29 -06:00
CitadelStationBot
d2b73ea318 Fixes ChangeTurf runtimes in late loaded templates. 2018-01-16 07:39:14 -06:00
Jordan Brown
7a3c222758 Merge pull request #34460 from AnturK/whyijustwastedhalfanhourlookingforatypo 
Fixes ChangeTurf runtimes in late loaded templates.
 2018-01-16 07:39:14 -06:00
CitadelStationBot
665ff70778 Makes getFlatIcon slower. (Also more precise) 2018-01-16 07:33:41 -06:00
AnturK
89766bdc4e Makes getFlatIcon slower. (Also more precise) (#34199) 
* getFlatIcon fixes and improvements. DO NOT TOUCH

* Fixes area blendings

* Stuff

* Drops the named arg
 2018-01-16 07:33:41 -06:00
CitadelStationBot
8fdd7144fd No more air leaks from the asteroid shuttle 2018-01-16 07:32:25 -06:00
Jordan Brown
ca154abed1 Merge pull request #34471 from Thunder12345/shuttlefix2 
No more air leaks from the asteroid shuttle
 2018-01-16 07:32:25 -06:00
CitadelStationBot
ade3ded854 Automatic changelog generation for PR #4826 [ci skip] 2018-01-16 05:03:08 -06:00
LetterJay
59b5956447 Merge pull request #4826 from deathride58/hopefullyfixesshit 
Hopefully fixes human tails/ears not saving, and fixes new/random characters having underwear
 2018-01-16 05:03:05 -06:00
CitadelStationBot
5f5347e296 Automatic changelog generation for PR #4855 [ci skip] 2018-01-16 03:53:57 -06:00
LetterJay
6a2a9ff6f5 Merge pull request #4855 from Citadel-Station-13/upstream-merge-34266 
[MIRROR] Goats eat plant people
 2018-01-16 03:53:55 -06:00
CitadelStationBot
aa41fd26e8 Automatic changelog generation for PR #4853 [ci skip] 2018-01-16 03:53:38 -06:00
LetterJay
3c281161b8 Merge pull request #4853 from Citadel-Station-13/upstream-merge-34385 
[MIRROR] Greyscale wirecutters
 2018-01-16 03:53:36 -06:00
CitadelStationBot
ee4ab7aeb7 Automatic changelog generation for PR #4852 [ci skip] 2018-01-16 03:53:15 -06:00
LetterJay
2e901c3ada Merge pull request #4852 from Citadel-Station-13/upstream-merge-34480 
[MIRROR] Adds a new bar sign - The Lightbulb
 2018-01-16 03:53:13 -06:00
LetterJay
5ffbaf5e16 Merge pull request #4851 from Citadel-Station-13/upstream-merge-34448 
[MIRROR] Lowers clockwork ark global sound loop volume
 2018-01-16 03:52:20 -06:00
CitadelStationBot
91ea2e99b9 Automatic changelog generation for PR #4850 [ci skip] 2018-01-16 03:52:08 -06:00
LetterJay
c850fd4899 Merge pull request #4850 from Citadel-Station-13/upstream-merge-34406 
[MIRROR] Adds some new tips for fighting the clockcult
 2018-01-16 03:52:06 -06:00
LetterJay
efb1239ef4 Merge pull request #4848 from Citadel-Station-13/upstream-merge-34441 
[MIRROR] Fixes hardsuits in templates
 2018-01-16 03:51:51 -06:00
LetterJay
38ea4d6bf8 Merge pull request #4847 from Citadel-Station-13/upstream-merge-34428 
[MIRROR] Fixes jaunters
 2018-01-16 03:51:40 -06:00
LetterJay
7b673a4262 Merge pull request #4846 from Citadel-Station-13/upstream-merge-34061 
[MIRROR] Fixes compiler errors in the preload_rsc external resource thingy
 2018-01-16 03:51:30 -06:00
CitadelStationBot
b26eef331c Goats eat plant people 2018-01-15 15:54:42 -06:00
oranges
c990906791 Merge pull request #34266 from KorPhaeron/goat 
Goats eat plant people
 2018-01-15 15:54:42 -06:00
CitadelStationBot
91c4238fcb Greyscale wirecutters 2018-01-15 15:16:47 -06:00
MoreRobustThanYou
053fe00021 Greyscale wirecutters (#34385) 
* Greyscale Wirecutters!

* WOOPS!

* Hopefully make the colors lighter.

* hexcodes

* Fixy fixy

* Add files via upload
 2018-01-15 15:16:47 -06:00
CitadelStationBot
107c890e77 Adds a new bar sign - The Lightbulb 2018-01-15 15:06:29 -06:00
Ashe Higgs
9a5b1da92c Adds the Lightbulb bar sign (#34480) 2018-01-15 15:06:28 -06:00
CitadelStationBot
3bf0b2169c Lowers clockwork ark global sound loop volume 2018-01-15 15:05:19 -06:00
kevinz000
c22c5fe25d Lowers ark volume 2018-01-15 15:05:19 -06:00
CitadelStationBot
df3b932f1b Adds some new tips for fighting the clockcult 2018-01-15 14:34:40 -06:00
Ashe Higgs
6668782ed6 Adds some new tips for fighting the clockcult (#34406) 
* Adds some new tips for fighting the clockcult

* Update tips.txt
 2018-01-15 14:34:40 -06:00
CitadelStationBot
49fe8266db Fixes hardsuits in templates 2018-01-15 12:36:24 -06:00
AnturK
105ff6a3bc Fixes hardsuits in templates 2018-01-15 12:36:23 -06:00
CitadelStationBot
c1fcaea82f Fixes jaunters 2018-01-15 12:05:46 -06:00
kevinz000
81bc49cafe Fixes Jaunters 2018-01-15 12:05:46 -06:00
CitadelStationBot
2c337dac81 Automatic changelog generation for PR #4845 [ci skip] 2018-01-15 09:40:47 -06:00