shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit Graph

  • c3f0d0b9c8 fixes some bullshit assery zeroisthebiggay 2021-02-10 20:40:39 -05:00
  • a2a8ab12c6 Merge branch 'ninjasarecum' of https://github.com/zeroisthebiggay/Citadel-Station-13 into ninjasarecum zerothebigboy 2021-02-10 20:01:09 -05:00
  • 41530110a2 LINTER keronshb 2021-02-10 20:00:17 -05:00
  • ec8029b0cc a couple more fixes zerothebigboy 2021-02-10 20:00:04 -05:00
  • bbcc0a5a0d fixes travis error hopefully dzahlus 2021-02-11 01:57:56 +01:00
  • cabcc94969 Automatic changelog compile [ci skip] Changelogs 2021-02-11 00:14:09 +00:00
  • 53ea83ba45 Automatic changelog compile [ci skip] Changelogs 2021-02-11 00:02:14 +00:00
  • 969ac7e5e4 now no longer wrong zeroisthebiggay 2021-02-10 19:01:08 -05:00
  • 00d7b0c9c9 Merge branch 'ninjasarecum' of https://github.com/zeroisthebiggay/Citadel-Station-13 into ninjasarecum zerothebigboy 2021-02-10 18:57:05 -05:00
  • de2e410c6f a bit more stuff zerothebigboy 2021-02-10 18:55:56 -05:00
  • d858c420aa Update preferences_savefile.dm Timothy Teakettle 2021-02-10 23:18:53 +00:00
  • 73020eba35 information here is wrong zeroisthebiggay 2021-02-10 14:27:14 -05:00
  • 87eb447c10 some final touch ups zerothebigboy 2021-02-10 14:22:04 -05:00
  • 5769cc106b Update good.dm TyrianTyrell 2021-02-10 13:56:56 -05:00
  • e530e8d103 god i hate this zeroisthebiggay 2021-02-10 13:05:21 -05:00
  • daa96f03df whoever merged their dumb fucking jacket pr and caused me merge conflicts is getting fucking KILLED zerothebigboy 2021-02-10 13:01:12 -05:00
  • d98b87bbe0 Merge branch 'ninjasarecum' of https://github.com/zeroisthebiggay/Citadel-Station-13 into ninjasarecum zerothebigboy 2021-02-10 12:55:54 -05:00
  • 058369a56d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum zerothebigboy 2021-02-10 12:55:45 -05:00
  • 2645f0f953 back down to fifteen zeroisthebiggay 2021-02-10 11:08:03 -05:00
  • bf52001de3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Citadel-Station-13-master dzahlus 2021-02-10 16:56:55 +01:00
  • e5562f6cb6 Bump marked from 1.1.1 to 2.0.0 in /tgui dependabot[bot] 2021-02-10 09:12:51 +00:00
  • 13e0131cf8 Automatic changelog generation for PR #14211 [ci skip] CitadelStationBot 2021-02-10 03:09:54 -06:00
  • c8cf061773 Merge pull request #14211 from timothyteakettle/better-logging silicons 2021-02-10 02:09:50 -07:00
  • c9d917b22d Merge pull request #14201 from dzahlus/flechette-buff silicons 2021-02-10 02:09:38 -07:00
  • 3b38c6af10 Automatic changelog generation for PR #14202 [ci skip] CitadelStationBot 2021-02-10 03:09:32 -06:00
  • 4b089f3514 Merge pull request #14202 from DeltaFire15/robo-vendor silicons 2021-02-10 02:09:29 -07:00
  • 7260843691 Automatic changelog generation for PR #14203 [ci skip] CitadelStationBot 2021-02-10 03:09:23 -06:00
  • 74a7c1e9fb Merge pull request #14203 from zeroisthebiggay/patch-4 silicons 2021-02-10 02:09:20 -07:00
  • fb76225a40 Automatic changelog generation for PR #14204 [ci skip] CitadelStationBot 2021-02-10 03:09:12 -06:00
  • f0f9a865e6 Merge pull request #14204 from keronshb/powersinkobj-removal silicons 2021-02-10 02:09:09 -07:00
  • 5045aff802 Automatic changelog generation for PR #14205 [ci skip] CitadelStationBot 2021-02-10 03:09:00 -06:00
  • e8da810cd3 Merge pull request #14205 from keronshb/warpimplant-adjustment silicons 2021-02-10 02:08:57 -07:00
  • 9d0313b447 Automatic changelog generation for PR #14208 [ci skip] CitadelStationBot 2021-02-10 03:08:00 -06:00
  • ca906eb683 Merge pull request #14208 from dzahlus/grenadelaunch.ogg silicons 2021-02-10 02:07:57 -07:00
  • ac2c1e6c1f Automatic changelog generation for PR #14216 [ci skip] CitadelStationBot 2021-02-10 03:07:52 -06:00
  • 7c27de3735 Merge pull request #14216 from timothyteakettle/blood-fixes silicons 2021-02-10 02:07:49 -07:00
  • ca3f48972c Automatic changelog generation for PR #14215 [ci skip] CitadelStationBot 2021-02-10 03:07:40 -06:00
  • ec2ae053ce Merge pull request #14215 from Putnam3145/readied-only silicons 2021-02-10 02:07:37 -07:00
  • 7bc503d66c Automatic changelog generation for PR #14214 [ci skip] CitadelStationBot 2021-02-10 03:07:29 -06:00
  • c82f0a4f5b Merge pull request #14214 from Adelphon/gclothing silicons 2021-02-10 02:07:27 -07:00
  • 2979563374 Merge branch 'ninjasarecum' of https://github.com/zeroisthebiggay/Citadel-Station-13 into ninjasarecum zerothebigboy 2021-02-10 00:13:51 -05:00
  • a93e089d2a two hours for aesthetics zerothebigboy 2021-02-10 00:12:27 -05:00
  • dba9fd7134 Update DeltaStation2.dmm MrJWhit 2021-02-10 00:04:44 -05:00
  • fc88f27c85 what atvs? Hatterhat 2021-02-09 22:40:00 -06:00
  • aa8b5210c7 i hope this works zeroisthebiggay 2021-02-09 20:35:30 -05:00
  • db5b35f1cc newline zeroisthebiggay 2021-02-09 18:57:50 -05:00
  • 097666a71a un zerothebigboy 2021-02-09 18:49:45 -05:00
  • 7d60d27a6f fun zerothebigboy 2021-02-09 17:31:24 -05:00
  • 94b507dbf3 Update BoxStation.dmm MrJWhit 2021-02-09 16:31:58 -05:00
  • 5c54bf39e7 Merge pull request #14217 from timothyteakettle/why silicons 2021-02-09 02:51:44 -07:00
  • 09fdb5f83a Update apc_control.dm Timothy Teakettle 2021-02-09 09:48:17 +00:00
  • 5ebdb6deec yes Timothy Teakettle 2021-02-09 09:37:17 +00:00
  • 834e4730b3 not existing Letter N 2021-02-09 15:44:49 +08:00
  • 7a6ed7f500 Added a config to disallow unreadied players from voting on modes/storytellers Putnam 2021-02-08 22:59:49 -08:00
  • 28d1f93b1c Clothing PR Adelphon 2021-02-09 00:41:11 -05:00
  • 69e4f7ff84 Automatic changelog compile [ci skip] Changelogs 2021-02-09 00:13:10 +00:00
  • 1fd6c7abe2 Automatic changelog compile [ci skip] Changelogs 2021-02-09 00:02:19 +00:00
  • 85886f563f f zerothebigboy 2021-02-08 16:59:54 -05:00
  • 7778ddaf96 Merge pull request #14195 from Citadel-Station-13/choker Lin 2021-02-08 13:56:44 -06:00
  • e433c0b172 Update living.dm Timothy Teakettle 2021-02-08 17:04:55 +00:00
  • 3d97c1fb89 log fix Timothy Teakettle 2021-02-08 17:00:26 +00:00
  • b7e9169257 Update human.dm Timothy Teakettle 2021-02-08 16:44:02 +00:00
  • b3ab2722f0 fug dzahlus 2021-02-08 14:48:53 +01:00
  • 6dabe348fa fixes oversights dzahlus 2021-02-08 14:43:33 +01:00
  • c7f265e9ee Revert "sound fixes" dzahlus 2021-02-08 14:37:34 +01:00
  • cae5a8463e sound fixes dzahlus 2021-02-08 14:37:10 +01:00
  • e73235c92d Merge pull request #6 from Citadel-Station-13/master dzahlus 2021-02-08 14:20:06 +01:00
  • e5fea58776 Update good.dm TyrianTyrell 2021-02-08 07:32:22 -05:00
  • b7b8be6f39 Update language.dm TyrianTyrell 2021-02-08 07:27:47 -05:00
  • f87aa0ac5b toast. And DiscoFox™️ Letter N 2021-02-08 18:46:05 +08:00
  • b1ce9a9618 Update vocal_cords.dm silicons 2021-02-08 03:09:19 -07:00
  • 0895789217 Update vocal_cords.dm silicons 2021-02-08 03:06:54 -07:00
  • b139723a52 Automatic changelog generation for PR #14200 [ci skip] CitadelStationBot 2021-02-08 04:03:18 -06:00
  • 2fdc52828b Merge pull request #14200 from TyrianTyrell/master silicons 2021-02-08 03:03:15 -07:00
  • 2791e9ad83 Automatic changelog generation for PR #14199 [ci skip] CitadelStationBot 2021-02-08 04:03:02 -06:00
  • 45fecf2b4e Merge pull request #14199 from MrJWhit/boxstation-dorms-fix silicons 2021-02-08 03:02:58 -07:00
  • e1e9c1d628 Automatic changelog generation for PR #14194 [ci skip] CitadelStationBot 2021-02-08 04:02:43 -06:00
  • 70155a8fb2 Merge pull request #14194 from Chiirno/WaddlersRiseUp silicons 2021-02-08 03:02:40 -07:00
  • 6563980c7e Automatic changelog generation for PR #14196 [ci skip] CitadelStationBot 2021-02-08 04:02:34 -06:00
  • a3187e8216 Merge pull request #14196 from timothyteakettle/sentient-virus silicons 2021-02-08 03:02:31 -07:00
  • 38827122e9 Adjusts warp implant to 30 second delay keronshb 2021-02-07 23:50:42 -05:00
  • 952d2e1e60 Removes the power sink objective keronshb 2021-02-07 23:41:27 -05:00
  • 0c0ff44c23 pog zeroisthebiggay 2021-02-07 22:01:57 -05:00
  • e46652eb39 Merge remote-tracking branch 'upstream/master' keronshb 2021-02-07 20:19:08 -05:00
  • a5f32f30fa Automatic changelog compile [ci skip] Changelogs 2021-02-08 00:02:21 +00:00
  • d482d387ee whoops DeltaFire 2021-02-07 18:24:18 +01:00
  • 7da856ebef remove bleed dzahlus 2021-02-07 17:09:35 +01:00
  • 601305426f wounds now work dzahlus 2021-02-07 17:08:06 +01:00
  • 08c041e294 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Citadel-Station-13-master dzahlus 2021-02-07 16:51:08 +01:00
  • 7fff6a75c0 Update tongue.dm TyrianTyrell 2021-02-07 04:29:19 -05:00
  • 936abbd9f0 Automatic changelog compile [ci skip] Changelogs 2021-02-07 00:13:52 +00:00
  • c7f6c037f5 Boxstation disposals update MrJWhit 2021-02-06 16:31:30 -05:00
  • 1dd9ec4fd0 Automatic changelog generation for PR #14189 [ci skip] CitadelStationBot 2021-02-06 12:42:39 -06:00
  • cf4a5f3388 Merge pull request #14189 from dzahlus/diversify-sound silicons 2021-02-06 11:42:36 -07:00
  • 874de99056 Automatic changelog generation for PR #14179 [ci skip] CitadelStationBot 2021-02-06 12:42:27 -06:00
  • 86066450f3 Merge pull request #14179 from TyrianTyrell/master silicons 2021-02-06 11:42:24 -07:00
  • 2d4e0c6b5b Automatic changelog generation for PR #13966 [ci skip] CitadelStationBot 2021-02-06 12:41:12 -06:00
  • 08356ee7f7 Merge pull request #13966 from Thalpy/Dispencer-UI-change silicons 2021-02-06 11:41:08 -07:00
  • 2ebbef4a63 Merge pull request #14197 from timothyteakettle/sanitize-your-text deathride58 2021-02-06 13:02:16 -05:00
  • a9170aae93 Update priority_announce.dm timothyteakettle 2021-02-06 17:42:37 +00:00