shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,934 Commits 5 Branches 0 Tags
4fe2af7696ccdcea0d152c7ff5c00a434af7cf40
Commit Graph

11934 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
deathride58
30af76a0a2 Merge pull request #4845 from Citadel-Station-13/upstream-merge-34325 
[MIRROR]  Makes the lavaland mining base have more correct baseturfs
 2018-01-15 15:40:45 +00:00
CitadelStationBot
72cc816253 Automatic changelog generation for PR #4844 [ci skip] 2018-01-15 09:40:25 -06:00
deathride58
f595c71b8f Merge pull request #4844 from Citadel-Station-13/upstream-merge-34354 
[MIRROR] Xenomorph maids (and Barmaids) clean on move
 2018-01-15 15:40:23 +00:00
CitadelStationBot
6095acc300 Automatic changelog generation for PR #4843 [ci skip] 2018-01-15 09:39:34 -06:00
deathride58
bd90207710 Merge pull request #4843 from Citadel-Station-13/upstream-merge-34309 
[MIRROR] Remakes the space syndicate listening post.
 2018-01-15 15:39:32 +00:00
CitadelStationBot
50be4bae07 Automatic changelog generation for PR #4842 [ci skip] 2018-01-15 09:39:07 -06:00
deathride58
aea0bb0394 Merge pull request #4842 from Citadel-Station-13/upstream-merge-34371 
[MIRROR] Fixes missing pipe colors in RPD and pipe painter
 2018-01-15 15:39:04 +00:00
CitadelStationBot
ef18182971 Automatic changelog generation for PR #4841 [ci skip] 2018-01-15 09:38:37 -06:00
deathride58
ffb48b7452 Merge pull request #4841 from Citadel-Station-13/upstream-merge-34349 
[MIRROR] Fix MMIs in mechs and firesuits being burned by ash storms
 2018-01-15 15:38:35 +00:00
deathride58
e866c71933 Merge pull request #4840 from Citadel-Station-13/upstream-merge-34326 
[MIRROR] Various deadchat messages are more informative and consistent
 2018-01-15 15:38:15 +00:00
CitadelStationBot
604be7eeb5 Fixes compiler errors in the preload_rsc external resource thingy 2018-01-15 09:33:07 -06:00
Kyle Spier-Swenson
32adfdae00 Fixes compiler errors in the preload_rsc external resource thingy (#34061) 
Fixes compiler errors in the preload_rsc external resource thingy
 2018-01-15 09:33:07 -06:00
CitadelStationBot
bc350e3429 Makes the lavaland mining base have more correct baseturfs 2018-01-15 08:43:08 -06:00
Emmett Gaines
a2bc36a791 makes the lavaland mining base have more correct baseturfs (#34325) 2018-01-15 08:43:08 -06:00
CitadelStationBot
f5cb666bb0 Xenomorph maids (and Barmaids) clean on move 2018-01-15 08:01:18 -06:00
coiax
c3d0e7d2b5 Xenomorph maids (and Barmaids) clean on move (#34354) 
🆑 coiax
add: A xenomorph maid (or barmaid) cleans the floor as they walk on it.
Lie down, and they'll clean your face.
/🆑

- Clearly a massive xenobiology buff by letting them create simple mob
janitors.
- Actually implemented so the Barmaid can clean up the Emergency Escape
Bar, but sure, let's buff the regular maid as well.
 2018-01-15 08:01:18 -06:00
CitadelStationBot
d840dc2b73 Remakes the space syndicate listening post. 2018-01-15 07:18:15 -06:00
WJohn
16596405e1 Remakes the space syndicate listening post. (#34309) 
* Remakes the space syndicate listening post. TGM in a second.

* TGM of the map

* Removes space suit from EVA.

* Removes bed and dirty var.
 2018-01-15 07:18:15 -06:00
CitadelStationBot
9ce55f500d Fixes missing pipe colors in RPD and pipe painter 2018-01-15 03:01:36 -06:00