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

Commit Graph

  • 0dcc630c4a ports some trait changes Timothy Teakettle 2020-04-02 21:15:04 +01:00
  • c5252e242a Merge remote-tracking branch 'Arturlang/Garlic' into Garlic Artur 2020-04-02 20:44:05 +03:00
  • 2cf7a1f6ba Merge remote-tracking branch 'origin/master' into Garlic Artur 2020-04-02 20:41:58 +03:00
  • 45d1917f0f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit655 Ghommie 2020-04-02 16:07:13 +02:00
  • 431722e34d Automatic changelog generation for PR #11719 [ci skip] CitadelStationBot 2020-04-02 08:18:43 -05:00
  • ede3379a87 Merge pull request #11719 from Ghommie/Ghommie-cit662 Putnam3145 2020-04-02 06:18:41 -07:00
  • 3948214380 Update handguns.dm Trilbyspaceclone 2020-04-02 09:18:37 -04:00
  • e50fe8b061 Removing a trademark from the game. Ghommie 2020-04-02 14:48:43 +02:00
  • 47f1c15fd8 Automatic changelog generation for PR #11708 [ci skip] CitadelStationBot 2020-04-02 07:25:37 -05:00
  • 4902d5ab4e makes sergal markings better (#11708) Seris02 2020-04-02 20:25:34 +08:00
  • 9b6cd54abf there's an extra space and it bugged me im sorry kiwedespars 2020-04-02 00:35:38 -07:00
  • eeccea989c purple nerf - light pink gets epi back kiwedespars 2020-04-02 00:34:44 -07:00
  • c3d9a4855f Fixed pH and purity issues Persi 2020-04-02 03:31:32 -04:00
  • d9e8db8a6c Update _status_effects.dm kiwedespars 2020-04-01 23:31:51 -07:00
  • 736ef2cb7c Merge pull request #11705 from Ghommie/Ghommie-cit659 Putnam3145 2020-04-01 23:16:29 -07:00
  • baf5150c51 fixes two runtimes kevinz000 2020-04-01 22:35:26 -07:00
  • e32d4f9713 Automatic changelog generation for PR #11701 [ci skip] CitadelStationBot 2020-04-01 22:54:35 -05:00
  • a9bfe00302 Merge pull request #11701 from Ghommie/Ghommie-cit657 Putnam3145 2020-04-01 20:54:32 -07:00
  • 53d0cb765f Automatic changelog generation for PR #11604 [ci skip] CitadelStationBot 2020-04-01 09:19:13 -05:00
  • 6f4281b4b8 Even More fixes to Lambda (#11604) dapnee 2020-04-01 08:19:10 -06:00
  • 519ebd5ed8 Porting the mutation conflict system, and resizing quantum realm fix. Ghommie 2020-04-01 15:29:35 +02:00
  • 881f8765f4 Stufffs Artur 2020-04-01 15:29:40 +03:00
  • 13c474f2af brawling just got mathematical? necromanceranne 2020-04-01 22:05:22 +11:00
  • e23bacdf6b Icons Artur 2020-04-01 13:03:31 +03:00
  • 65ec9f3723 Merge remote-tracking branch 'Citadel-Station-13/master' into skateboards_cool_again Artur 2020-04-01 13:03:06 +03:00
  • 4de14fbdf7 Finnishing touches Artur 2020-04-01 12:59:06 +03:00
  • dce23a40af God i wish i could auto merge icons Artur 2020-04-01 12:05:53 +03:00
  • f40f07b033 [READY]Skateboard overhaul (#45657) Artur 2020-04-01 12:05:27 +03:00
  • ca1f3d9a1e Added succ sound for the victim Artur 2020-04-01 11:45:11 +03:00
  • c13541b15c Automatic changelog generation for PR #11700 [ci skip] CitadelStationBot 2020-04-01 03:03:17 -05:00
  • 82c8710267 Merge pull request #11700 from kiwedespars/papermask kevinz000 2020-04-01 01:03:14 -07:00
  • 6e62ea5cb1 Quickfix for baaad problem Artur 2020-04-01 09:15:31 +03:00
  • 157ef93c0b I think everyone should be landing punches now. necromanceranne 2020-04-01 15:12:59 +11:00
  • 73c52c0c6e Accurate minefield. Ghommie 2020-04-01 05:19:29 +02:00
  • 04c8cb09a4 out of bounds coordinates sanity Ghommie 2020-04-01 04:41:21 +02:00
  • 736760ac06 Minesweeper oopsies etcetera. Ghommie 2020-04-01 04:39:36 +02:00
  • 99263f1957 Automatic changelog generation for PR #11698 [ci skip] CitadelStationBot 2020-03-31 20:04:31 -05:00
  • 37625adb69 Merge pull request #11698 from Ghommie/Ghommie-cit656 kevinz000 2020-03-31 18:04:28 -07:00
  • 9efc69d229 Automatic changelog generation for PR #11693 [ci skip] CitadelStationBot 2020-03-31 20:04:06 -05:00
  • d2709af670 Merge pull request #11693 from Trilbyspaceclone/patch-327 kevinz000 2020-03-31 18:04:03 -07:00
  • ade6bf363b Automatic changelog generation for PR #11692 [ci skip] CitadelStationBot 2020-03-31 20:03:51 -05:00
  • a2372bb213 Merge pull request #11692 from Seris02/AAAAAAAAAAA kevinz000 2020-03-31 18:03:49 -07:00
  • 3fdb681ff5 Merge pull request #11685 from Ghommie/Ghommie-ci654 kevinz000 2020-03-31 18:03:28 -07:00
  • aaecaefd31 Automatic changelog generation for PR #11683 [ci skip] CitadelStationBot 2020-03-31 20:03:02 -05:00
  • b5f1cbd3d0 Merge pull request #11683 from timothyteakettle/wrestling_holodeck kevinz000 2020-03-31 18:03:00 -07:00
  • 0c5fd95e56 Automatic changelog generation for PR #11682 [ci skip] CitadelStationBot 2020-03-31 20:02:27 -05:00
  • 6bbc2c0db8 Merge pull request #11682 from Putnam3145/fix-sabotage kevinz000 2020-03-31 18:02:24 -07:00
  • 5cb4a08f2a Automatic changelog generation for PR #11681 [ci skip] CitadelStationBot 2020-03-31 20:02:14 -05:00
  • b3642a3470 Merge pull request #11681 from PersianXerxes/medicalTGUINext kevinz000 2020-03-31 18:02:11 -07:00
  • 52242258eb Automatic changelog generation for PR #11669 [ci skip] CitadelStationBot 2020-03-31 20:00:05 -05:00
  • 234dd9c439 Merge pull request #11669 from Ghommie/Ghommie-cit651 kevinz000 2020-03-31 18:00:02 -07:00
  • 7a0912c2e6 Merge pull request #11689 from Citadel-Station-13/Ghommie-patch-1 kevinz000 2020-03-31 17:55:27 -07:00
  • 5f128447f5 Update guardian.dm Ghom 2020-04-01 02:21:50 +02:00
  • 5bae25c889 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit659 Ghommie 2020-04-01 00:49:13 +02:00
  • 8bb98f92ca It's past midnight, time for your runtimes flattening. Ghommie 2020-04-01 00:47:29 +02:00
  • a8759b048e smashes the tyranny of public mining Kraseo 2020-03-31 23:32:15 +02:00
  • 3e15f9f128 Automatic changelog generation for PR #11676 [ci skip] CitadelStationBot 2020-03-31 15:04:58 -05:00
  • 658701bf37 Various ghost role QoL; moving holding facility; removing energy net (#11676) Putnam3145 2020-03-31 13:04:55 -07:00
  • 4d53c3f6c0 updates vendors.. Artur 2020-03-31 21:00:50 +03:00
  • bf3cfb62d1 Cherry pick Artur 2020-03-31 20:52:10 +03:00
  • 7a5bb4804d Nice spacing Artur 2020-03-31 19:46:54 +03:00
  • 694abd0724 Fixes compile. I blame putnam. Artur 2020-03-31 19:44:01 +03:00
  • a903752ff9 Merge remote-tracking branch 'Citadel-Station-13/master' into Garlic Artur 2020-03-31 19:42:35 +03:00
  • 021ebcec66 Massive megafauna buff. Ghommie 2020-03-31 14:09:32 +02:00
  • 01b30b4ebb Automatic changelog generation for PR #11688 [ci skip] CitadelStationBot 2020-03-31 06:11:02 -05:00
  • e63dc08e66 More dynamic fixes, AKA if Ghommie keeps merging without telling me I will maybe get irate (#11688) Putnam3145 2020-03-31 04:10:59 -07:00
  • d825a10e58 makes the mask craftable kiwedespars 2020-03-31 01:51:14 -07:00
  • 83abe07cb7 cobbling together the actual item kiwedespars 2020-03-31 01:49:29 -07:00
  • 24d9045679 papermask sprites bigger edition kiwedespars 2020-03-31 01:47:43 -07:00
  • c9e1d480e9 Add files via upload kiwedespars 2020-03-31 01:20:53 -07:00
  • 993548ad0e Update emergency.dm Ghom 2020-03-31 04:18:35 +02:00
  • 29fc535da8 Update code/modules/cargo/packs/emergency.dm Trilbyspaceclone 2020-03-30 22:01:16 -04:00
  • 4582e9cdf5 Oh. Ghommie 2020-03-31 02:44:20 +02:00
  • e26b43d80b The banishment of the floating disembodied phallus. Ghommie 2020-03-31 02:40:28 +02:00
  • e2d02beedf refactors the code to be less awful timothyteakettle 2020-03-31 00:20:44 +01:00
  • abc4b5d331 Automatic changelog generation for PR #11677 [ci skip] CitadelStationBot 2020-03-30 16:50:38 -05:00
  • 2521aa4973 Merge pull request #11677 from actioninja/wooow-glow kevinz000 2020-03-30 14:50:36 -07:00
  • 994712193e Automatic changelog generation for PR #11691 [ci skip] CitadelStationBot 2020-03-30 16:24:54 -05:00
  • 6e140f003c cloners now give TRAIT_MUTATION_STASIS and prevent active genes from ticking while inside (#11691) kevinz000 2020-03-30 14:24:51 -07:00
  • 4eaf8882f3 Merge pull request #11670 from Citadel-Station-13/Ghommie-patch-2 Lin 2020-03-30 19:57:14 +00:00
  • 15ca26f263 Merge pull request #11684 from Ghommie/Ghommie-cit653 kevinz000 2020-03-30 11:29:41 -07:00
  • 21a42579c1 chucklefucks. Ghommie 2020-03-30 18:55:30 +02:00
  • 2bf6d888bd Ports "Obliterates item_color: new washing machine functionality edition" Ghommie 2020-03-30 18:31:26 +02:00
  • 43ca451b59 Automatic changelog generation for PR #11663 [ci skip] CitadelStationBot 2020-03-30 10:54:12 -05:00
  • 0f32cbaa31 28 days ago (#11663) Trilbyspaceclone 2020-03-30 11:54:09 -04:00
  • 08101604a5 Automatic changelog generation for PR #11668 [ci skip] CitadelStationBot 2020-03-30 10:52:34 -05:00
  • 2eda92ed73 yeah (#11668) kappa-sama 2020-03-30 11:52:31 -04:00
  • 41904dccaf Merge pull request #11690 from Citadel-Station-13/kevinz000-patch-1 Putnam3145 2020-03-30 03:04:04 -07:00
  • 5a10b1cc8f Imagine correcting nothing Trilbyspaceclone 2020-03-30 05:53:16 -04:00
  • 5095eee659 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into AAAAAAAAAAA Seris02 2020-03-30 17:37:47 +08:00
  • 63f033e46a FUCKING INFURIATING ME ALL THIS TIME Seris02 2020-03-30 17:30:08 +08:00
  • 877b7f699e Update syndicate_contract.dm kevinz000 2020-03-29 23:40:52 -07:00
  • b69b19eb53 runtimes kevinz000 2020-03-29 20:59:52 -07:00
  • 03d87f6bdc Merge remote-tracking branch 'citadel/master' into eldritch_affairs kevinz000 2020-03-29 20:44:49 -07:00
  • 02d32d17c2 Automatic changelog generation for PR #11660 [ci skip] CitadelStationBot 2020-03-29 22:42:45 -05:00
  • 0cee7c9675 Merge pull request #11660 from deathride58/fuckcontractors kevinz000 2020-03-29 20:42:43 -07:00
  • c1355c0df8 Automatic changelog generation for PR #11631 [ci skip] CitadelStationBot 2020-03-29 22:42:13 -05:00
  • 8847fd4210 Merge pull request #11631 from KathrinBailey/Kat'sBoxRework kevinz000 2020-03-29 20:42:11 -07:00
  • 1f2778a4b0 FUCK I FORGOT IT WAS A BUGGED ONE Ghom 2020-03-30 05:34:47 +02:00
  • c3faf94d8f WIP Ghommie 2020-03-30 05:29:39 +02:00