Commit Graph

  • fbf137b7e2 Delete emoji_32.dmi silicons 2020-07-13 16:39:01 -07:00
  • cc3b496669 Add files via upload silicons 2020-07-13 16:37:31 -07:00
  • 73d4ea3201 Delete emoji_32.dmi silicons 2020-07-13 16:35:50 -07:00
  • 800d93470f Merge remote-tracking branch 'upstream/master' DeltaFire 2020-07-14 00:40:26 +02:00
  • 8f1e191500 stealthy cogging DeltaFire 2020-07-14 00:39:21 +02:00
  • b738482521 Automatic changelog generation for PR #12764 [ci skip] CitadelStationBot 2020-07-13 17:01:24 -05:00
  • bca162e2ab Merge pull request #12764 from timothyteakettle/money-bags silicons 2020-07-13 15:01:20 -07:00
  • 5b3050f692 b zerothebigboy 2020-07-13 17:01:41 -04:00
  • 4c0248835f b zerothebigboy 2020-07-13 17:01:23 -04:00
  • 8de062adbb fix Timothy Teakettle 2020-07-13 19:46:51 +01:00
  • 85f8491003 b zerothebigboy 2020-07-13 14:45:18 -04:00
  • 3ccd994080 a zerothebigboy 2020-07-13 13:52:56 -04:00
  • 004c00325f Merge pull request #12747 from Citadel-Station-13/silicons-patch-24 Lin 2020-07-13 12:22:58 -05:00
  • 2be790e8d7 Merge pull request #12736 from Citadel-Station-13/silicons-patch-21 Lin 2020-07-13 11:51:10 -05:00
  • ac0692cc17 Automatic changelog generation for PR #12706 [ci skip] CitadelStationBot 2020-07-13 11:50:06 -05:00
  • 55c4e40fbb Merge pull request #12706 from silicons/records Lin 2020-07-13 11:50:02 -05:00
  • e143b69aa6 Merge pull request #12741 from Hatterhat/vog-but-with-less-line-changes Lin 2020-07-13 11:31:25 -05:00
  • b28b06db10 Automatic changelog generation for PR #12737 [ci skip] CitadelStationBot 2020-07-13 11:29:27 -05:00
  • ba4a77fc30 Merge pull request #12737 from Citadel-Station-13/silicons-patch-22 Lin 2020-07-13 11:29:23 -05:00
  • b486f15fc3 Automatic changelog generation for PR #12746 [ci skip] CitadelStationBot 2020-07-13 11:28:56 -05:00
  • 1b3112528c Merge pull request #12746 from silicons/react Lin 2020-07-13 11:28:52 -05:00
  • 20d272816a Add files via upload EmeraldSundisk 2020-07-13 08:58:08 -07:00
  • 4febb24dcf Add files via upload EmeraldSundisk 2020-07-13 08:38:22 -07:00
  • 732a1ca438 Fixes linter and conflict shit Artur 2020-07-13 16:35:12 +03:00
  • 5f9364c5f8 Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 Artur 2020-07-13 16:20:54 +03:00
  • d1b3990875 Fixed scanner export Artur 2020-07-13 16:20:21 +03:00
  • b4fdef8210 Paramedic jumpsuit Sonic121x 2020-07-13 20:36:55 +08:00
  • b128a21309 Paramedic jump suit adjust Sonic121x 2020-07-13 20:33:59 +08:00
  • 15470de825 Don't DragON me, mister! Strazyplus 2020-07-13 07:01:48 -04:00
  • 7d2404a56a Merge pull request #6 from Citadel-Station-13/master YakumoChen 2020-07-13 05:42:01 -04:00
  • 072b4b673f set hierophant friendly fire to on by default YakumoChen 2020-07-13 09:40:58 +00:00
  • d13eb1868c Adds another light to pubby MrJWhit 2020-07-13 02:05:29 -04:00
  • 4cd7670eaf Update DeltaStation2.dmm EmeraldSundisk 2020-07-12 21:03:09 -07:00
  • d7f5de97da Oops. Winter Flare 2020-07-12 22:34:32 -04:00
  • 20cc3cad55 re-add bitesize. Winter Flare 2020-07-12 22:15:06 -04:00
  • 351d1748fc Updates some comments. Winter Flare 2020-07-12 22:05:08 -04:00
  • 0a9c3f7015 Automatic changelog compile [ci skip] Changelogs 2020-07-13 00:10:10 +00:00
  • 1a67201921 Adds new icon for Bluespace Jar Ragolution 2020-07-12 20:03:50 -04:00
  • c92d88d794 Nuggie Box Shift Winter Flare 2020-07-12 19:56:17 -04:00
  • cb8725d08d ok maybe it is TheSpaghetti 2020-07-12 17:20:08 -04:00
  • 29628dd82a cows Timothy Teakettle 2020-07-12 21:40:16 +01:00
  • c0687886e4 using initial is better practice Timothy Teakettle 2020-07-12 21:38:09 +01:00
  • 62bf98de17 Automatic changelog generation for PR #12752 [ci skip] CitadelStationBot 2020-07-12 14:36:08 -05:00
  • 68dcc1f846 Merge pull request #12752 from Linzolle/vore-man-bad silicons 2020-07-12 12:36:05 -07:00
  • 8f578da614 PLS NO PREF BREAK Linzolle 2020-07-12 14:32:19 -05:00
  • a3531383d3 "monophobia = new" isn't needed TheSpaghetti 2020-07-12 15:29:32 -04:00
  • 75c962ef7b handle removal Timothy Teakettle 2020-07-12 20:18:49 +01:00
  • c3d490a803 very cool Timothy Teakettle 2020-07-12 20:15:57 +01:00
  • 0200c4ca1f Fixed the double period. TheSpaghetti 2020-07-12 13:13:25 -04:00
  • d8aa20b4e9 Adds monophobia quirk TheSpaghetti 2020-07-12 13:11:06 -04:00
  • c6ea2981f4 oop DeltaFire 2020-07-12 18:57:47 +02:00
  • 0b0fbc1272 Updates stable gateways DeltaFire 2020-07-12 18:36:59 +02:00
  • 0705130448 small edgecase Timothy Teakettle 2020-07-12 17:31:37 +01:00
  • fbbb5f7ea8 Merge pull request #12678 from Ghommie/Ghommie-cit831 silicons 2020-07-12 08:23:29 -07:00
  • 11144e8580 Merge pull request #12743 from LetterN/patch-2 silicons 2020-07-12 08:22:49 -07:00
  • 6bf209d9a5 Update output.dm silicons 2020-07-12 06:56:48 -07:00
  • d9a7e860dd Update output.dm silicons 2020-07-12 06:13:19 -07:00
  • b94c1ab709 Update output.dm silicons 2020-07-12 06:10:26 -07:00
  • 047a36c973 fix silicons 2020-07-12 05:37:07 -07:00
  • 72c5c2234e ok silicons 2020-07-12 05:15:55 -07:00
  • c2e4ff8bb8 we don't have title0 Letter N 2020-07-12 20:06:12 +08:00
  • 6f663f0747 tweak of drakemechs that you will never notice Strazyplus 2020-07-12 07:59:29 -04:00
  • 92a6d673ba Drakes are dragons too Strazyplus 2020-07-12 07:32:09 -04:00
  • 51f1d86c80 Create license.txt Letter N 2020-07-12 13:25:14 +08:00
  • 2253c51382 was lowercase Letter N 2020-07-12 13:22:46 +08:00
  • 8867a039c5 Legal© Shenanigans™ Letter N 2020-07-12 13:21:16 +08:00
  • 2eb353d195 More License detail tweaks. Strazyplus 2020-07-12 00:56:43 -04:00
  • 80b4c03c82 Initial changes to get this to github for public reviewing Keate Senior 2020-07-12 00:43:54 -04:00
  • 582be67063 Lawyer-drake when? Strazyplus 2020-07-12 00:42:46 -04:00
  • b63b4ca412 Automatic changelog generation for PR #12693 [ci skip] CitadelStationBot 2020-07-11 23:28:15 -05:00
  • f99a0564de Merge pull request #12693 from Owai-Seek/trashbag-7-4-20 silicons 2020-07-11 21:28:12 -07:00
  • f7b476bc64 Update preferences.dm silicons 2020-07-11 21:23:06 -07:00
  • eb0e0b6cbd i may not test my shit but at least i can have less line changes motherfucker Hatterhat 2020-07-11 23:18:17 -05:00
  • 47921b2ae6 Removed unused sleeper_override Strazyplus 2020-07-11 23:16:42 -04:00
  • c9cb29ceea Who feeding the chunkydrakes Strazyplus 2020-07-11 22:57:37 -04:00
  • 3e5f981825 speed 4 for embeds timothyteakettle 2020-07-12 03:17:50 +01:00
  • 9de192fb99 Caution crushing hazard Strazyplus 2020-07-11 21:43:36 -04:00
  • 13fe156a8b Dragon online! Strazyplus 2020-07-11 21:32:34 -04:00
  • fbb9fe2d9c better fork timothyteakettle 2020-07-12 02:14:50 +01:00
  • 8e31e3c534 a tonne of fixes timothyteakettle 2020-07-12 01:56:24 +01:00
  • 3f5ff75038 Automatic changelog compile [ci skip] Changelogs 2020-07-12 00:10:43 +00:00
  • cff2e3d680 never set max amount to 0 timothyteakettle 2020-07-12 00:58:34 +01:00
  • ab01a69c1f bugfix timothyteakettle 2020-07-12 00:53:31 +01:00
  • a2f71b06ee Merge branch 'pr/12735' into DRAKEBORGS Strazyplus 2020-07-11 19:48:39 -04:00
  • 8712dd6de4 bugfixes timothyteakettle 2020-07-12 00:31:45 +01:00
  • c1592ad162 more rewards Timothy Teakettle 2020-07-11 23:27:29 +01:00
  • 4b30198354 Update reagents.dm silicons 2020-07-11 15:15:30 -07:00
  • 62df48b2f0 Update robot_upgrades.dm silicons 2020-07-11 15:11:53 -07:00
  • b735b3c8d7 Automatic changelog generation for PR #12624 [ci skip] CitadelStationBot 2020-07-11 16:40:41 -05:00
  • 955d9fa0cc Merge pull request #12624 from Citadel-Station-13/policy Lin 2020-07-11 16:40:38 -05:00
  • a3a2692e19 Automatic changelog generation for PR #12594 [ci skip] CitadelStationBot 2020-07-11 16:00:43 -05:00
  • e87653f781 Merge pull request #12594 from Citadel-Station-13/silicons-patch-3 Lin 2020-07-11 16:00:39 -05:00
  • a75dd1d8f3 Merge pull request #12729 from Citadel-Station-13/silicons-patch-20 Lin 2020-07-11 15:47:03 -05:00
  • c9c8285603 Merge pull request #12723 from silicons/atmos_555 Lin 2020-07-11 15:44:19 -05:00
  • 902dfeca4d Merge pull request #50 from Citadel-Station-13/master EmeraldSundisk 2020-07-11 09:21:22 -07:00
  • de8ac9896a sigh silicons 2020-07-11 07:13:56 -07:00
  • 6fbe083e13 ok silicons 2020-07-11 07:03:41 -07:00
  • ea98bdeca6 done BlackMajor 2020-07-11 23:52:23 +12:00
  • 98e727ec03 ok silicons 2020-07-11 00:55:23 -07:00
  • f244165a14 Automatic changelog generation for PR #12722 [ci skip] CitadelStationBot 2020-07-11 02:49:32 -05:00