Commit Graph

  • 775948eed3 Merge pull request #11866 from Citadel-Station-13/kevinz000-patch-6 Ghom 2020-04-18 05:34:58 +02:00
  • d26ba86660 Update shields.dm Trilbyspaceclone 2020-04-17 23:30:58 -04:00
  • 425fc0c736 fix ripley icon Linzolle 2020-04-17 21:55:43 -05:00
  • d90e490bae Aaand updated with master Putnam 2020-04-17 18:57:36 -07:00
  • 33039f9962 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into vore-optimization Putnam 2020-04-17 18:56:26 -07:00
  • 2659459233 web-editor played me a good prank. Ghom 2020-04-18 03:48:57 +02:00
  • 9c4d10a19c Update code/datums/radiation_wave.dm Ghom 2020-04-18 03:48:03 +02:00
  • c8ce60c856 Added back some vore default modes. Putnam 2020-04-17 18:46:09 -07:00
  • 96b64009d0 Oh, nullspace. Ghommie 2020-04-18 03:44:49 +02:00
  • 3188ef3475 Whops Ghom 2020-04-18 03:32:54 +02:00
  • cf505f900a Update atoms.dm Ghom 2020-04-18 03:29:45 +02:00
  • cbc02a8f0b fixes a divide-by-zero whoops Putnam 2020-04-17 18:28:15 -07:00
  • ac662a46c1 Extra support for bussed/lateloaded holodeck maps. Ghommie 2020-04-18 03:15:05 +02:00
  • 2676d663d6 Revert "Makes so turning in place updates riders when riding someone's back" Ghom 2020-04-18 03:09:49 +02:00
  • 523672b6a5 fix for my relatively minuscule backend refactor for holodeck. Ghommie 2020-04-18 02:32:10 +02:00
  • 0e55de55a7 Automatic changelog generation for PR #11871 [ci skip] CitadelStationBot 2020-04-17 19:07:31 -05:00
  • 6da088f4ea Merge pull request #11871 from kappa-sama/patch-20 Ghom 2020-04-18 02:07:28 +02:00
  • 662f98cab7 Automatic changelog generation for PR #11900 [ci skip] CitadelStationBot 2020-04-17 18:36:53 -05:00
  • 3ecbf2dc46 Merge pull request #11900 from kappa-sama/patch-22 Ghom 2020-04-18 01:36:50 +02:00
  • 7756a80beb Merge branch 'master' into shields! Trilbyspaceclone 2020-04-17 19:32:39 -04:00
  • 7a47debe9e Merge branch 'master' into Ghommie-patch-1 Ghom 2020-04-18 01:27:00 +02:00
  • 77af88da8c Automatic changelog generation for PR #11882 [ci skip] CitadelStationBot 2020-04-17 18:20:06 -05:00
  • 86d531890f Merge pull request #11882 from Putnam3145/fix-deleting-objectives Ghom 2020-04-18 01:20:02 +02:00
  • e19f9c5c3e revert kappa-sama 2020-04-17 19:19:00 -04:00
  • 9d139bf584 Automatic changelog generation for PR #11820 [ci skip] CitadelStationBot 2020-04-17 15:45:44 -05:00
  • 7cc7d6884a Merge pull request #11820 from kevinz000/shield_bashing Lin 2020-04-17 20:45:40 +00:00
  • 87a6bd013c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 Ghommie 2020-04-17 21:57:21 +02:00
  • 3dab97b62f I set amount instead of max_amount to INFINITY, that's why it hanged. Ghommie 2020-04-17 21:52:08 +02:00
  • 1608bd2548 Update shields.dm kevinz000 2020-04-17 11:57:18 -07:00
  • 6a0af190ea I'm a bit busy handling multiple issues. Ghom 2020-04-17 20:47:02 +02:00
  • be0409a94a Update toggles.dm Ghom 2020-04-17 19:58:57 +02:00
  • 383014bad3 Merge branch 'master' into trek_tmp Anonymous 2020-04-17 19:40:17 +03:00
  • 7581d1d5cf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit686 Ghommie 2020-04-17 18:37:25 +02:00
  • 6e8f58d945 Merge pull request #11893 from Citadel-Station-13/Ghommie-patch-3 Putnam3145 2020-04-17 09:36:53 -07:00
  • c5c75c0870 Fixing some more mistakes I did to clothing. Ghommie 2020-04-17 18:32:11 +02:00
  • d8422d4f93 Tweaks up TMP-era uniform a little bit more Anonymous 2020-04-17 19:28:06 +03:00
  • 761b3907e3 Makes vore noises, enlargement opt-in Putnam 2020-04-17 09:10:08 -07:00
  • 0f7bc55755 le sigh Trilbyspaceclone 2020-04-17 10:25:48 -04:00
  • 8d4782290c Update shields.dm Trilbyspaceclone 2020-04-17 10:25:20 -04:00
  • cd25a7c145 Merge branch 'master' into food-quality Timothy Teakettle 2020-04-17 15:03:44 +01:00
  • eafc69aa65 Reviewer suggestion, reduces paralyze Artur 2020-04-17 16:22:15 +03:00
  • 9d312d7fef small refactor to some stuff Timothy Teakettle 2020-04-17 13:59:48 +01:00
  • 181f147f20 Automatic changelog generation for PR #11863 [ci skip] CitadelStationBot 2020-04-17 07:51:50 -05:00
  • 5b86c334f9 Merge pull request #11863 from Trilbyspaceclone/patch-342 kevinz000 2020-04-17 05:51:47 -07:00
  • d073717113 Automatic changelog generation for PR #11774 [ci skip] CitadelStationBot 2020-04-17 07:51:29 -05:00
  • 7756682362 Merge pull request #11774 from Trilbyspaceclone/tools_andstuff kevinz000 2020-04-17 05:51:26 -07:00
  • 09f459a369 Merge pull request #11730 from Ghommie/Ghommie-cit667 kevinz000 2020-04-17 05:49:09 -07:00
  • 00f549bb0d Automatic changelog generation for PR #11869 [ci skip] CitadelStationBot 2020-04-17 07:43:52 -05:00
  • 3c4c67b6c5 Merge pull request #11869 from necromanceranne/pawnch_updaties kevinz000 2020-04-17 05:43:49 -07:00
  • 0be6467267 Automatic changelog generation for PR #11870 [ci skip] CitadelStationBot 2020-04-17 07:42:20 -05:00
  • 6a92c47d31 Merge pull request #11870 from Trilbyspaceclone/patch-343 kevinz000 2020-04-17 05:42:17 -07:00
  • 4f02c6f3c5 Merge pull request #11875 from Ghommie/Ghommie-cit683 kevinz000 2020-04-17 05:40:50 -07:00
  • 359790f5af Merge pull request #11876 from Citadel-Station-13/Ghommie-patch-2 kevinz000 2020-04-17 05:40:32 -07:00
  • 92c8ccaa8a Automatic changelog generation for PR #11880 [ci skip] CitadelStationBot 2020-04-17 07:39:57 -05:00
  • d1d3c1f773 Merge pull request #11880 from NopemanMcHalt/benohybrid-screem kevinz000 2020-04-17 05:39:54 -07:00
  • 68f14b3a57 Automatic changelog generation for PR #11857 [ci skip] CitadelStationBot 2020-04-17 07:20:56 -05:00
  • e84e6bface Merge pull request #11857 from Trilbyspaceclone/race_drinks kevinz000 2020-04-17 05:20:53 -07:00
  • 57fb1c1a17 Automatic changelog generation for PR #11852 [ci skip] CitadelStationBot 2020-04-17 07:16:08 -05:00
  • 61f833b953 Merge pull request #11852 from Ghommie/Ghommie-cit681 kevinz000 2020-04-17 05:16:04 -07:00
  • 6abece11cd Automatic changelog generation for PR #11849 [ci skip] CitadelStationBot 2020-04-17 07:09:40 -05:00
  • 038cb5c911 Merge pull request #11849 from Ghommie/Ghommie-cit680 kevinz000 2020-04-17 05:09:37 -07:00
  • dcd112c379 Hm yes maybe no ratting out would be nice DeltaFire 2020-04-17 13:34:34 +02:00
  • 4f6e849af4 Fixes pre-tmp trek suit on-mob icons Anonymous 2020-04-17 14:04:47 +03:00
  • e30bd1f8ea FIXES IT FINALLY OHHHH MY FUCKING GOD WHY IT WAS SO SIMPLE BUT SO HIDDEN FUCK Seris02 2020-04-17 17:17:50 +08:00
  • ef5f34d58e Tweaks collar part of sprite Anonymous 2020-04-17 10:54:39 +03:00
  • d61c0dc155 KHAAAAAAAAAAN!! Anonymous 2020-04-17 10:53:43 +03:00
  • 18388fee12 Automatic changelog generation for PR #11877 [ci skip] CitadelStationBot 2020-04-17 01:55:17 -05:00
  • 044d360d20 Merge pull request #11877 from Detective-Google/lambda-fixes Ghom 2020-04-17 08:55:14 +02:00
  • 5ff909db1f Automatic changelog generation for PR #11886 [ci skip] CitadelStationBot 2020-04-17 01:53:23 -05:00
  • d2a811a8d8 Merge pull request #11886 from jjpark-kb/youtoolfix Ghom 2020-04-17 08:53:20 +02:00
  • 0fb1286042 Update guardian.dm Ghom 2020-04-17 08:47:05 +02:00
  • 121b9f0d92 Update ui.dm kevinz000 2020-04-16 22:57:27 -07:00
  • ad8c0c2687 Update storage.dm kevinz000 2020-04-16 22:55:01 -07:00
  • 4c6f1b622b Porting Goofconomy & co. Ghommie 2020-04-17 07:48:11 +02:00
  • 4a38b2870a fix youtool jjpark-kb 2020-04-17 01:02:52 -04:00
  • 21f7a6032d this kappa-sama 2020-04-17 00:50:42 -04:00
  • a4cc54781f implements isfood helper timothyteakettle 2020-04-17 01:45:15 +01:00
  • aa6d6883e3 remove a random 'r' Timothy Teakettle 2020-04-17 01:34:46 +01:00
  • f821d33f44 change clamp to CLAMP Timothy Teakettle 2020-04-17 01:32:42 +01:00
  • 874e57a516 Makes dynamic voting not the default Putnam 2020-04-16 16:14:22 -07:00
  • 78527739e3 moves a tiny fan away from the very angry ball of lightning Detective Google 2020-04-16 17:21:25 -05:00
  • 6f4a3fc179 wine to jello Trilbyspaceclone 2020-04-16 17:51:03 -04:00
  • 16b02495ae fixes the exe- valid room not being wired to the grid Detective Google 2020-04-16 16:21:43 -05:00
  • 19328b8710 Automatic changelog generation for PR #11844 [ci skip] CitadelStationBot 2020-04-16 12:08:13 -05:00
  • e511deabcf Merge pull request #11844 from Arturlang/crafting_fixes Ghom 2020-04-16 19:08:09 +02:00
  • 6c55480787 Automatic changelog generation for PR #11734 [ci skip] CitadelStationBot 2020-04-16 12:06:52 -05:00
  • 10bc1229f9 Merge pull request #11734 from Trilbyspaceclone/patch-329 Ghom 2020-04-16 19:06:48 +02:00
  • 19f79f8843 Merge pull request #11611 from monster860/patch-2 Ghom 2020-04-16 19:06:10 +02:00
  • eb48e00bcb Merge pull request #11805 from kevinz000/damage_procs_lite Ghom 2020-04-16 19:05:34 +02:00
  • 30617f62f1 Automatic changelog generation for PR #11839 [ci skip] CitadelStationBot 2020-04-16 12:04:19 -05:00
  • bceca18626 Merge pull request #11839 from Citadel-Station-13/kevinz000-patch-1 Ghom 2020-04-16 19:04:16 +02:00
  • 2200c690f7 configs Ghommie 2020-04-16 18:44:05 +02:00
  • 87dd2681ca The locate isn't necessary Putnam 2020-04-16 08:30:55 -07:00
  • d60174f585 Merge pull request #11881 from Ghommie/Ghommie-cit684 Putnam3145 2020-04-16 08:29:10 -07:00
  • 13def914b6 Update phobia.json Ghom 2020-04-16 17:18:11 +02:00
  • 368d801940 Makes objectives clean theirselves up properly. Putnam 2020-04-16 08:17:48 -07:00
  • 894579b068 indention Ghom 2020-04-16 17:17:15 +02:00
  • 109a69d301 Removed that one infamous ss13 slur the code. Ghommie 2020-04-16 16:58:36 +02:00
  • 747672eb50 Update update_icons.dm Ghom 2020-04-16 16:44:07 +02:00
  • 42b67d9240 PR is ready. Ghommie 2020-04-16 16:33:04 +02:00