shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
42,805 Commits 5 Branches 0 Tags
b0940456f5fd7629f8d15a15d94de4a38b3dccb5
Commit Graph

9531 Commits

Author SHA1 Message Date
Ghommie a9335aa946 Fixes a long lasting runtime with filter data sorting. 2019-12-08 13:21:29 +01:00
Hatterhat 6ff7083bfb the one where i buff a 4 tc item, give trilby a (You), and squash my commits 2019-12-08 01:29:08 -06:00
Lin a91139c470 Merge pull request #10068 from Ghommie/Ghommie-cit433 
Ports "Makes the windup toolbox more similar to His Grace".
 2019-12-07 21:52:10 +00:00
Lin 24e4673c2b Merge pull request #10057 from Ghommie/Ghommie-cit431 
fixes on_mob eyes overlays not updating properly in certain cases.
 2019-12-07 21:49:18 +00:00
TrilbySpaceClone 67d3d19cb9 correctiosn 
and movement
 2019-12-07 13:43:34 -05:00
TrilbySpaceClone e5c8f7bf06 Merge branch 'master' into glassware 2019-12-07 12:50:32 -05:00
Artur 4711eb0987 Merge remote-tracking branch 'upstream/master' into Bloodsuckers 2019-12-07 15:53:11 +02:00
Useroth 28ddfd29b6 Merge branch 'master' into new-tg-plants 2019-12-07 14:25:38 +01:00
Ghommie 95cc84e69e Fixes a few holo barriers' transparency. 2019-12-07 12:13:33 +01:00
Ghommie a82e0b9ee5 Buffs clown ops by removing their clumsiness and adding a new trait to be used in place of several clown role checks. 2019-12-07 09:45:38 +01:00
TrilbySpaceClone 025a7cd79a more ports 
https://github.com/tgstation/tgstation/pull/46924
https://github.com/tgstation/tgstation/pull/48050
 2019-12-07 03:04:02 -05:00
TrilbySpaceClone c4450579ac Why does breakfast have a timer? 
https://github.com/tgstation/tgstation/pull/44419
https://github.com/tgstation/tgstation/pull/46220
https://github.com/tgstation/tgstation/pull/44914
https://github.com/tgstation/tgstation/pull/46933
https://github.com/tgstation/tgstation/pull/48153
https://github.com/tgstation/tgstation/pull/46898
 2019-12-07 01:53:55 -05:00
Useroth 5f56d40f58 Incorporated the bamboo grammar fixes. 2019-12-07 06:41:24 +01:00
Ghommie 7cc332960b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit329 2019-12-07 05:30:07 +01:00
Ghommie e0caf6007b Fixes space hermit asteroid rocks unintendedly spawning airless asteroid turf when mined, save for the perimeter... 2019-12-07 04:02:33 +01:00
kevinz000 2d9c6e64c5 Update launchpad_control.dm 2019-12-06 19:55:54 -07:00
Artur 19ab4a5f70 Review fixes and tweaks 2019-12-07 00:43:02 +02:00
Ghommie 723690bab0 Demodularize defib disks and projectiles icons. 2019-12-06 23:07:50 +01:00
Ghommie 542c9007ee Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-12-06 20:09:35 +01:00
Ghommie 72c093d14e Merge branch 'Ghommie-cit265' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit435 2019-12-06 19:05:50 +01:00
Ghommie 91e628c73d Ports timestop and sepia extracts improvements/tweaks. 2019-12-06 19:01:42 +01:00
Useroth 1158c03ed7 Added bamboo. 2019-12-06 19:00:10 +01:00
Ghommie 99f694c94a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit433 2019-12-06 15:31:40 +01:00
Ghommie 622b3e5608 ddddddd 2019-12-06 15:31:05 +01:00
Sishen 8da7d1a021 b 2019-12-06 06:38:48 -07:00
Winter Flare 8bd6c58bcd Merge branch 'master' into cargocleanupv2boogaloo 2019-12-06 01:27:44 -05:00
Winter Flare b860c6e0bb Merge branch 'master' into cargocleanupv2boogaloo 2019-12-06 01:14:44 -05:00
Putnam3145 4e022af46f Merge pull request #10056 from Ghommie/Ghommie-cit430 
Ports "Slightly improves visible and audible messages."
 2019-12-05 21:16:47 -08:00
kevinz000 8cb6ff10b8 Merge pull request #10034 from Ghommie/Ghommie-cit420 
Fixes the incongruent bone satchel description.
 2019-12-05 22:00:38 -07:00
kevinz000 e16b61b865 Merge pull request #10043 from Arturlang/patch-1 
PDA cartridges and their contents can no longer be contaminated
 2019-12-05 21:58:33 -07:00
kevinz000 b8bb0f2924 Merge pull request #10048 from Ghommie/Ghommie-cit426 
Demodularize moodlets.
 2019-12-05 21:56:29 -07:00
kevinz000 6a305dfe4f Merge pull request #9955 from Ghommie/Ghommie-cit394 
Updating supply pods code.
 2019-12-05 21:54:42 -07:00
Putnam3145 6b2d3b116d Merge branch 'master' into Ghommie-cit430 2019-12-05 20:53:14 -08:00
kevinz000 a65588009c Merge pull request #10038 from Trilbyspaceclone/patch-240 
Makes trash carts craftable with plastic
 2019-12-05 21:51:30 -07:00
kevinz000 13f43eb783 Merge pull request #10045 from Trilbyspaceclone/patch-241 
Makes wallets hold more stuff
 2019-12-05 21:49:50 -07:00
kevinz000 b932841adf Merge pull request #9975 from Ghommie/Ghommie-cit404 
Merging, tweaking or otherwise removing a few of the stupidest cargo packs.
 2019-12-05 21:47:29 -07:00
kevinz000 5048995a58 Merge pull request #9993 from Ghommie/Ghommie-cit412 
Ports tgstation loom changes, and durathred golems.
 2019-12-05 21:44:25 -07:00
kevinz000 e2f9a68c2c Merge pull request #10049 from Useroth/new-tg-plants 
Colored fairy grass, because fuck your eyes.
 2019-12-05 21:43:24 -07:00
kevinz000 d217a9f445 Merge pull request #10032 from Ghommie/Ghommie-cit418 
Porting some return type annotations and bad keyword fixes.
 2019-12-05 21:33:12 -07:00
kevinz000 70d305611c Merge pull request #10042 from Ghommie/Ghommie-cit422 
fixes sofa overlays doing nothing, because their layer wasn't properly set.
 2019-12-05 21:28:24 -07:00
kevinz000 29497320c1 Merge pull request #10025 from Linzolle/butchering 
refactor butchering component
 2019-12-05 21:19:57 -07:00
Ghommie d3d1116094 null = n_color, no. 2019-12-06 03:59:51 +01:00
Ghommie 2528714035 I have no liability about glowing robotic eyes not automatically updating right here. 2019-12-06 03:56:48 +01:00
Ghommie 9ca7bb759c Ports "Slightly improves visible and audible messages." 2019-12-06 02:02:12 +01:00
Useroth 2e84c30e59 Tiny touch-ups 2019-12-05 16:29:50 +01:00
Artur 82d1497ddc Fixes bad buds and toxin healing 2019-12-05 17:29:00 +02:00
Ghommie 33fee5bd37 Witty remark included. 2019-12-05 02:12:34 +01:00
Ghommie a7d2fac0e9 "Why does it tell me it's "out of range", but not to you, X-ray man?" 2019-12-05 01:55:21 +01:00
Useroth b9ce4a8622 Oopsie 2019-12-05 01:49:55 +01:00
Useroth 950b884da5 Adds colored fairygrass. 2019-12-05 01:47:42 +01:00