shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,844 Commits 5 Branches 0 Tags
244d721595ea8c510bace0cfea3f855ec2e99776
Commit Graph
12844 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
LetterJayandGitHub 244d721595 Merge pull request #5152 from Citadel-Station-13/upstream-merge-35050 
[MIRROR] Fixes CODEOWNERS conflict
 2018-01-28 15:17:26 -06:00
LetterJayandGitHub 25e933f63f Update CODEOWNERS 2018-01-28 15:17:16 -06:00
CitadelStationBot de93392863 Automatic changelog generation for PR #5151 [ci skip] 2018-01-28 15:16:54 -06:00
LetterJayandGitHub b690ac4af1 Merge pull request #5151 from Citadel-Station-13/upstream-merge-35018 
[MIRROR] Rice (pudding) is no longer a salad.
 2018-01-28 15:16:52 -06:00
LetterJayandGitHub a05921f657 Merge pull request #5150 from Citadel-Station-13/upstream-merge-34982 
[MIRROR] Makes lighting corner optimization a little more sane
 2018-01-28 15:16:39 -06:00
LetterJayandGitHub cc5c6ec9a3 Merge pull request #5149 from Citadel-Station-13/upstream-merge-34996 
[MIRROR] Fixes held_mob release runtime
 2018-01-28 15:16:28 -06:00
LetterJayandGitHub bc4758d20e Merge pull request #5148 from Citadel-Station-13/upstream-merge-35016 
[MIRROR] Fixes possible issue with set_labels
 2018-01-28 15:16:15 -06:00
CitadelStationBot 002cdc17fe Automatic changelog generation for PR #5147 [ci skip] 2018-01-28 15:16:08 -06:00
LetterJayandGitHub 2fb11b13b7 Merge pull request #5147 from Citadel-Station-13/upstream-merge-34994 
[MIRROR] Fixes species.after_equip_job() running before a player's joining species is finalized
 2018-01-28 15:16:06 -06:00
LetterJayandGitHub 898aead882 Merge pull request #5146 from Citadel-Station-13/upstream-merge-35010 
[MIRROR] Shifts caution decals by 6 pixels.
 2018-01-28 15:15:25 -06:00
LeoandCitadelStationBot 2e424d70a5 Fixes CODEOWNERS conflict 2018-01-28 13:33:11 -06:00
CitadelStationBot b967511ac8 Rice (pudding) is no longer a salad. 2018-01-28 11:34:14 -06:00
vuonojenmustaturskaandCitadelStationBot f005e65ab0 Merge pull request #35018 from DaxDupont/rice-pudding 
Rice (pudding) is no longer a salad.
 2018-01-28 11:34:14 -06:00
CitadelStationBot 9b8ac04a32 Makes lighting corner optimization a little more sane 2018-01-28 10:34:04 -06:00
Jordan BrownandCitadelStationBot 307e028811 Merge pull request #34982 from vuonojenmustaturska/lightingdeopt 
Makes lighting corner optimization a little more sane
 2018-01-28 10:34:04 -06:00
CitadelStationBot f187e87e11 Fixes held_mob release runtime 2018-01-28 10:22:41 -06:00
LeoandCitadelStationBot 13d9ea5a1c Merge pull request #34996 from ShizCalev/held_mob-runtime 
Fixes held_mob release runtime
 2018-01-28 10:22:41 -06:00
LeoandCitadelStationBot 7bd7f3392e Fixes possible issue with set_labels 2018-01-28 10:21:28 -06:00
CitadelStationBot 8c353f9ca2 Fixes species.after_equip_job() running before a player's joining species is finalized 2018-01-28 08:16:23 -06:00
vuonojenmustaturskaandCitadelStationBot 6c855bfcee fix lizard jobs (#34994) 2018-01-28 08:16:23 -06:00
CitadelStationBot a398fbc706 Shifts caution decals by 6 pixels. 2018-01-28 07:48:42 -06:00
vuonojenmustaturskaandCitadelStationBot ee6bc3d45f Merge pull request #35010 from WJohn/caution_decal_shift 
Shifts caution decals by 6 pixels.
 2018-01-28 07:48:42 -06:00
LetterJayandGitHub a8b4b1eb29 Merge pull request #5136 from Citadel-Station-13/upstream-merge-34984 
[MIRROR] LAVA_IS_SMALLER
 2018-01-28 04:02:30 -06:00
CitadelStationBot 94b40ec2de Automatic changelog generation for PR #5144 [ci skip] 2018-01-28 04:02:15 -06:00
LetterJayandGitHub b0c5941cd6 Merge pull request #5144 from Citadel-Station-13/upstream-merge-34957 
[MIRROR] Morgue and Crematorium Resprite
 2018-01-28 04:02:13 -06:00
CitadelStationBot 9ce30f036f Automatic changelog generation for PR #5145 [ci skip] 2018-01-28 04:02:03 -06:00
LetterJayandGitHub 5964f97877 Merge pull request #5145 from Citadel-Station-13/upstream-merge-34940 
[MIRROR] Syndicate comms agents have Codespeak training
 2018-01-28 04:02:01 -06:00
CitadelStationBot ff5bbc7a4c Automatic changelog generation for PR #5143 [ci skip] 2018-01-28 04:01:22 -06:00
LetterJayandGitHub 2d4065e15c Merge pull request #5143 from Citadel-Station-13/upstream-merge-34866 
[MIRROR] Fixes the eminence getting spammed by blessed tiles.
 2018-01-28 04:01:20 -06:00
LetterJayandGitHub 335bcfaff1 Merge pull request #5142 from Citadel-Station-13/upstream-merge-35031 
[MIRROR] Stops titlescreen chef spam
 2018-01-28 04:00:03 -06:00
CitadelStationBot 8e5dcb5554 Automatic changelog generation for PR #5140 [ci skip] 2018-01-28 03:59:36 -06:00
LetterJayandGitHub 5bd9112959 Merge pull request #5140 from Citadel-Station-13/upstream-merge-34974 
[MIRROR] New Ore Box Sprite
 2018-01-28 03:59:34 -06:00
LetterJayandGitHub 3f3ef78428 Merge pull request #5139 from Citadel-Station-13/upstream-merge-35034 
[MIRROR] Revert "Power Cell explosions are now log"
 2018-01-28 03:59:21 -06:00
CitadelStationBot efa713c49b Automatic changelog generation for PR #5138 [ci skip] 2018-01-28 03:59:12 -06:00
LetterJayandGitHub 157295d1f6 Merge pull request #5138 from Citadel-Station-13/upstream-merge-34972 
[MIRROR] [Ready] Rebalances Chameleon Kits for lowpop
 2018-01-28 03:59:10 -06:00
CitadelStationBot 5638bbd8cc Automatic changelog generation for PR #5132 [ci skip] 2018-01-28 03:58:41 -06:00
LetterJayandGitHub c86b256eee Merge pull request #5132 from Citadel-Station-13/upstream-merge-34791 
[MIRROR] Mobs start with a random nutrition amount
 2018-01-28 03:58:38 -06:00
CitadelStationBot a58886d623 Syndicate comms agents have Codespeak training 2018-01-27 23:22:06 -06:00
Jack EdgeandCitadelStationBot b1b9f5cbee Syndicate comms agents have Codespeak training 
🆑 coiax
add: Nanotrasen Security Division has reported that syndicate comms agents,
both on lavaland and in space, have had training in "Codespeak", a top
secret language for stealthy communication.
/🆑

Why? So they can secret talk with traitors that actually buy Codespeak
books.
 2018-01-27 23:22:06 -06:00
CitadelStationBot 88d806bc8b Morgue and Crematorium Resprite 2018-01-27 23:21:58 -06:00
JittaiandCitadelStationBot 7dbcf48c5f Morgue and Crematorium Resprite (#34957) 
* REDO

* Touch ups to Crema-tray, removes displays (for now)

* Smaller Less Contrast Screens + Traffic Stop style Lights

* ok last 1 I swear
 2018-01-27 23:21:58 -06:00
CitadelStationBot 2b03dd5f0f Fixes the eminence getting spammed by blessed tiles. 2018-01-27 23:21:49 -06:00
Dax DupontandCitadelStationBot 643e58714e Fixes the eminence getting spammed by blessed tiles. (#34866) 
* Fixes the eminence getting spammed by blessed tiles.

* Forgot to commit this

* world time meme
 2018-01-27 23:21:48 -06:00
CitadelStationBot f8e6a88b3c Stops titlescreen chef spam 2018-01-27 23:21:39 -06:00
orangesandCitadelStationBot 38f0f17fb7 Merge pull request #35031 from KorPhaeron/imthecook 
Stops titlescreen chef spam
 2018-01-27 23:21:39 -06:00
CitadelStationBot 74a474ee80 New Ore Box Sprite 2018-01-27 23:21:23 -06:00
uraniummeltdownandCitadelStationBot 504a1d1ba9 new ore box sprite 2018-01-27 23:21:23 -06:00
CitadelStationBot 3db277d170 Revert "Power Cell explosions are now log" 2018-01-27 23:21:15 -06:00
vuonojenmustaturskaandCitadelStationBot cbfe2c997b Revert "Power Cell explosions are now log" 2018-01-27 23:21:15 -06:00
CitadelStationBot 51064f9896 [Ready] Rebalances Chameleon Kits for lowpop 2018-01-27 23:21:06 -06:00