Commit Graph

  • 30bf2312f3 seizure zerothebigboy 2022-10-18 23:37:40 -04:00
  • 2d5f5d6c52 Merge pull request #15833 from Hatterhat/cluwne-drop deathride58 2022-10-16 13:09:21 -04:00
  • ba8af5114e Merge pull request #15861 from shellspeed1/random-whiteship deathride58 2022-10-16 13:07:07 -04:00
  • fcb90142b3 Merge pull request #15818 from Putnam3145/quark-nerf-2-nerf-harder deathride58 2022-10-16 12:38:41 -04:00
  • 1c36a35d63 Merge pull request #15840 from Putnam3145/hard-cap-smatter-output deathride58 2022-10-16 12:34:37 -04:00
  • 06e418328b bump it up Putnam3145 2022-10-12 19:57:18 -07:00
  • 5bcd1fe2ae Updates DreamAnnotate to v2 deathride58 2022-10-12 21:49:46 -04:00
  • c3a4c48b86 Automatic changelog compile [ci skip] Changelogs 2022-10-13 01:04:40 +00:00
  • 50691d856d Automatic changelog generation for PR #15860 [ci skip] CitadelStationBot 2022-10-12 05:27:42 -05:00
  • f7937e54e0 Merge pull request #15860 from shellspeed1/public-bounties silicons 2022-10-12 03:27:37 -07:00
  • 90af3187e0 Automatic changelog generation for PR #15870 [ci skip] CitadelStationBot 2022-10-12 05:27:18 -05:00
  • 52d91c6d8e Merge pull request #15870 from Hatterhat/organ-recursiorgan silicons 2022-10-12 03:27:15 -07:00
  • 11b74b4000 was ignoring too-large gases, fixed Putnam3145 2022-10-11 22:25:54 -07:00
  • 4806433c50 please? ? ? ? Putnam3145 2022-10-11 20:22:17 -07:00
  • 95051e7b6e Hopefully this fixes planet atmos for good Putnam3145 2022-10-11 18:35:06 -07:00
  • 4e2406fdd4 i've just been retestmerging wrong wow. Putnam3145 2022-10-10 23:06:55 -07:00
  • 892d07975a just?? comment out?? this for now?? Putnam3145 2022-10-10 20:10:21 -07:00
  • 35b8108edb brain freeze head cheese Hatterhat 2022-10-10 21:44:25 -05:00
  • e264ab2c13 Hopefully fixes the planet atmos issue Putnam3145 2022-10-09 23:25:43 -07:00
  • 3b74564a4a well that's no good Putnam3145 2022-10-09 20:27:25 -07:00
  • b6196917bc Automatic changelog compile [ci skip] Changelogs 2022-10-10 01:05:49 +00:00
  • 5fc34292c0 fixes resting shellspeed1 2022-10-09 15:45:51 -07:00
  • 95a1107868 Automatic changelog generation for PR #15867 [ci skip] CitadelStationBot 2022-10-08 21:57:40 -05:00
  • d91100c0f2 Merge pull request #15867 from Hatterhat/fists silicons 2022-10-08 19:57:37 -07:00
  • 81d41ce289 Automatic changelog compile [ci skip] Changelogs 2022-10-09 01:01:20 +00:00
  • 3d59ea6283 Automatic changelog generation for PR #15857 [ci skip] CitadelStationBot 2022-10-08 17:39:22 -05:00
  • e4d687da0c Merge pull request #15857 from shellspeed1/premium-kas-for-borgs silicons 2022-10-08 15:39:19 -07:00
  • 1d3328e5fa Automatic changelog generation for PR #15868 [ci skip] CitadelStationBot 2022-10-08 17:38:01 -05:00
  • 83fcdda850 Merge pull request #15868 from KeRSedChaplain/clockbalance silicons 2022-10-08 15:37:58 -07:00
  • 1015987d12 driderman, driderman, does whatever a spider can Jerry Wester 2022-10-06 23:38:16 -06:00
  • a447d337a8 misc balance changes Dan-Neposh 2022-10-06 00:22:51 -04:00
  • 282cc819dc works on my machine Hatterhat 2022-10-04 20:10:09 -05:00
  • 38bd037b66 box that mf up Hatterhat 2022-10-04 14:14:04 -05:00
  • 3f04b95ba9 Merge pull request #15866 from Citadel-Station-13/revert-15824-why-is-it-like-this SandPoot 2022-10-02 12:46:32 -03:00
  • d3f05f7830 Revert "Allow AI, mime, clown to have the same name as LITERALLY ANY MOB IN THE WORLD(???)" silicons 2022-10-02 08:44:02 -07:00
  • 67f2dad1d7 stop stealing the furniture from my house Putnam3145 2022-09-28 12:41:56 -07:00
  • 17929ced89 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxmos-2 Putnam3145 2022-09-28 12:35:58 -07:00
  • 987fb89cc7 Merge pull request #15865 from Citadel-Station-13/revert-15858-auxmos-2 silicons 2022-09-28 05:32:31 -07:00
  • 93e8a69c4c Revert "Updates auxmos to 2.0.0" silicons 2022-09-28 01:05:10 -07:00
  • 60eb536dd2 A couple things (oy) Putnam3145 2022-09-27 21:46:44 -07:00
  • 54f61ba124 Automatic changelog compile [ci skip] Changelogs 2022-09-27 01:04:13 +00:00
  • 50207b1926 Automatic changelog generation for PR #15824 [ci skip] CitadelStationBot 2022-09-26 00:23:40 -05:00
  • 9d83e5da60 Merge pull request #15824 from Putnam3145/why-is-it-like-this Lin 2022-09-26 05:23:37 +00:00
  • 2b2aa28207 this is better VM_USER 2022-09-25 20:00:36 -07:00
  • dd26852438 Automatic changelog compile [ci skip] Changelogs 2022-09-24 01:02:04 +00:00
  • 142c07c51d Merge branch 'master' into premium-kas-for-borgs shellspeed1 2022-09-23 17:00:02 -07:00
  • c6d908f578 Update say.dm silicons 2022-09-23 16:27:24 -07:00
  • e70987eec0 Automatic changelog generation for PR #15848 [ci skip] CitadelStationBot 2022-09-23 18:27:05 -05:00
  • a8ef986ce5 Merge pull request #15848 from shellspeed1/full-auto-port-from-tg-Credit-to-Fikou silicons 2022-09-23 16:27:03 -07:00
  • b6de25b080 Automatic changelog generation for PR #15854 [ci skip] CitadelStationBot 2022-09-23 18:26:57 -05:00
  • b0703d1bd9 Merge pull request #15854 from shellspeed1/borg-radio-improvements silicons 2022-09-23 16:26:54 -07:00
  • 32e4a466dc Automatic changelog generation for PR #15856 [ci skip] CitadelStationBot 2022-09-23 18:24:38 -05:00
  • 96384ac667 Merge pull request #15856 from shellspeed1/borg-mining-ID-fix-and-premium-KA-return silicons 2022-09-23 16:24:36 -07:00
  • 354a3af63c Automatic changelog generation for PR #15853 [ci skip] CitadelStationBot 2022-09-23 18:21:22 -05:00
  • fbf7a2de90 Merge pull request #15853 from shellspeed1/posialert-console silicons 2022-09-23 16:21:19 -07:00
  • 5f4f9cbbf9 Automatic changelog generation for PR #15832 [ci skip] CitadelStationBot 2022-09-23 18:21:11 -05:00
  • c2f1e24223 Merge pull request #15832 from Putnam3145/from-ghost-check silicons 2022-09-23 16:21:08 -07:00
  • 0e52fe2c09 Automatic changelog generation for PR #15843 [ci skip] CitadelStationBot 2022-09-23 18:21:02 -05:00
  • 27231ce663 Merge pull request #15843 from zeroisthebiggay/cumb silicons 2022-09-23 16:20:59 -07:00
  • ef38bc5522 Merge pull request #15858 from Putnam3145/auxmos-2 silicons 2022-09-23 16:20:31 -07:00
  • 899c924301 Update text.dm silicons 2022-09-23 16:19:03 -07:00
  • a1fc1e0377 Merge pull request #15855 from shellspeed1/borg-pda-addition silicons 2022-09-23 16:16:03 -07:00
  • c5a5c7e8f6 Automatic changelog compile [ci skip] Changelogs 2022-09-23 01:02:34 +00:00
  • dfddbc23c3 ports https://github.com/tgstation/tgstation/pull/53603 Credit to TiviPlus shellspeed1 2022-09-22 01:10:08 -07:00
  • c881767842 Automatic changelog generation for PR #15852 [ci skip] CitadelStationBot 2022-09-21 23:32:15 -05:00
  • 8c5b9f3307 Merge pull request #15852 from shellspeed1/a-few-speech-verbs Lin 2022-09-22 04:32:12 +00:00
  • 1ac44f22c8 i am wont to make the worst mistakes Putnam3145 2022-09-21 17:55:34 -07:00
  • 223307aaa8 i need to reimplement this joy Putnam3145 2022-09-21 17:43:37 -07:00
  • 17f513eae4 Fixes clicking in the object menu but at what cost shellspeed1 2022-09-20 23:08:24 -07:00
  • de4d468472 lets not have bounty cubes worth a bunch more than they should be. port of https://github.com/tgstation/tgstation/pull/56914 Credit to cacogen. shellspeed1 2022-09-20 20:55:38 -07:00
  • a55b2c4ff3 ports https://github.com/tgstation/tgstation/pull/56375. Credit to cacogen. shellspeed1 2022-09-20 20:05:59 -07:00
  • 44536ad7ab Fixes a runtime which bricked the pad plus fixing sprites. Also ports https://github.com/tgstation/tgstation/pull/55533 credit to cacogen. shellspeed1 2022-09-20 16:57:49 -07:00
  • e3a3462b85 bounty bugfix shellspeed1 2022-09-20 13:37:14 -07:00
  • 4aad87092d Merge branch 'master' into a-few-speech-verbs shellspeed1 2022-09-19 14:06:50 -07:00
  • c7a44a9690 even more maps. shellspeed1 2022-09-18 23:26:02 -07:00
  • 9759bd48e0 another one shellspeed1 2022-09-18 23:19:33 -07:00
  • c71dc547cd why do we have so many coin presses? shellspeed1 2022-09-18 23:14:21 -07:00
  • 4bade2b1c6 merge conflict fix shellspeed1 2022-09-18 23:10:00 -07:00
  • 95a775edf1 woopsie I forgot map stuff shellspeed1 2022-09-18 23:04:29 -07:00
  • 40dc7d57c3 port of https://github.com/tgstation/tgstation/pull/55762, credit to ArcaneMusic. shellspeed1 2022-09-18 22:40:07 -07:00
  • aa7252ffd6 port of 418c58a9c3 to make pad deconstructible. shellspeed1 2022-09-18 22:13:44 -07:00
  • cdb1fbb1e2 port of https://github.com/tgstation/tgstation/pull/54029/files# Aka this is where we get bounty cubes and remove the public bounty console. Credit to ArcaneMusic. shellspeed1 2022-09-18 21:55:10 -07:00
  • b4f886d999 port of https://github.com/tgstation/tgstation/pull/49111 aka sales taggers, credit to ArcaneMusic shellspeed1 2022-09-18 20:55:22 -07:00
  • 5ed2033f51 help me! i'm Putnam3145 2022-09-18 19:02:03 -07:00
  • e5c562b4bc Automatic changelog compile [ci skip] Changelogs 2022-09-19 00:59:16 +00:00
  • dafe4477e5 at least it looks good on my resume Putnam3145 2022-09-18 16:45:08 -07:00
  • eb6a86f37f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxmos-2 Putnam3145 2022-09-18 16:41:24 -07:00
  • fa9bbfaedf Revert "Update auxmos to 2.0.0" (#15859) Putnam3145 2022-09-18 16:40:45 -07:00
  • d95f5729cc wow i forgot some extremely important updates haha Putnam3145 2022-09-18 16:27:48 -07:00
  • 3b82e20a31 Automatic changelog generation for PR #15826 [ci skip] CitadelStationBot 2022-09-18 00:45:01 -05:00
  • a0bc2c1e09 Merge pull request #15826 from Putnam3145/auxmos-2 Lin 2022-09-18 05:44:58 +00:00
  • 4ddd0e76cc Update flavor_misc.dm shellspeed1 2022-09-17 19:57:26 -07:00
  • 3dace329be adds public bounty consoles without inflation, also removes the mint shellspeed1 2022-09-17 19:27:40 -07:00
  • 2d90e0ab33 readds the premium ka but for borgs shellspeed1 2022-09-17 19:03:03 -07:00
  • 96789fc978 Automatic changelog compile [ci skip] Changelogs 2022-09-18 01:01:27 +00:00
  • 8ad8c53b91 Automatic changelog generation for PR #15850 [ci skip] CitadelStationBot 2022-09-17 18:13:44 -05:00
  • 07484bb09f Merge pull request #15850 from Putnam3145/bastion-bourbon-shitcode Lin 2022-09-17 23:13:41 +00:00
  • 952d09a63f Automatic changelog generation for PR #15834 [ci skip] CitadelStationBot 2022-09-17 15:47:27 -05:00
  • 1f0ad3e68c its a lil janky but we take those (#15834) Hatterhat 2022-09-17 15:47:24 -05:00
  • ff2555afc6 Automatic changelog generation for PR #15845 [ci skip] CitadelStationBot 2022-09-17 15:44:32 -05:00