Commit Graph

  • 0d63fc9cf4 Update shuttles.dm silicons 2020-12-12 19:02:56 -07:00
  • 3e613c90e4 Automatic changelog generation for PR #13713 [ci skip] CitadelStationBot 2020-12-12 19:53:16 -06:00
  • 66403e3a9e Merge pull request #13713 from timothyteakettle/alt-click-gas-mask silicons 2020-12-12 18:53:13 -07:00
  • da936155cd undo config change timothyteakettle 2020-12-13 01:17:30 +00:00
  • 76b291c0b5 action timothyteakettle 2020-12-13 01:16:25 +00:00
  • 7dfb097bcc close enough Timothy Teakettle 2020-12-12 23:48:21 +00:00
  • 0d95172bef Merge pull request #13749 from Citadel-Station-13/silicons-patch-7 Lin 2020-12-12 20:00:41 +00:00
  • 07d8e72125 fix silicons 2020-12-12 11:19:45 -07:00
  • 24c09edd03 stuff silicons 2020-12-12 11:12:37 -07:00
  • ab9d26285c Update dna.dm silicons 2020-12-12 10:13:17 -07:00
  • abf950ee17 Update dna.dm silicons 2020-12-12 02:49:27 -07:00
  • 054afa25bf revert maps (again) silicons 2020-12-12 01:58:31 -07:00
  • 4b20d26d2b Merge remote-tracking branch 'citadel/master' into colormates silicons 2020-12-12 01:56:37 -07:00
  • 1619e826f9 Revert "removes map changes" silicons 2020-12-12 01:56:15 -07:00
  • 0f6ee3ea86 Automatic changelog generation for PR #13743 [ci skip] CitadelStationBot 2020-12-12 02:55:56 -06:00
  • c2727ca278 Merge pull request #13743 from Linzolle/thunderdome silicons 2020-12-12 01:55:53 -07:00
  • 0407d48f3d Automatic changelog generation for PR #13750 [ci skip] CitadelStationBot 2020-12-12 02:55:38 -06:00
  • 79cd6819f0 Merge pull request #13750 from EmeraldSundisk/deltacargo-129 silicons 2020-12-12 01:55:35 -07:00
  • 5225999bea Automatic changelog generation for PR #13737 [ci skip] CitadelStationBot 2020-12-12 02:52:19 -06:00
  • fab40166d3 Merge pull request #13737 from qwertyquerty/flash silicons 2020-12-12 01:52:17 -07:00
  • c00fb31da8 Update dna.dm silicons 2020-12-12 01:47:23 -07:00
  • a82cceda52 Merge branch 'master' of https://github.com/Putnam3145/Citadel-Station-13 Putnam 2020-12-11 22:22:23 -08:00
  • eb957c1ede Updated to latest auxmos ver, aoao Putnam 2020-12-11 19:12:32 -08:00
  • 47febac72a Automatic changelog generation for PR #13617 [ci skip] CitadelStationBot 2020-12-11 20:11:59 -06:00
  • f0e51d666c Merge pull request #13617 from timothyteakettle/loadout-json Putnam3145 2020-12-11 18:11:56 -08:00
  • 3a017d1173 it works timothyteakettle 2020-12-12 01:49:50 +00:00
  • d38115bba7 removes map changes silicons 2020-12-11 17:34:26 -07:00
  • 60f9e97ce5 test silicons 2020-12-11 17:31:27 -07:00
  • 45a7c68da1 wow silicons 2020-12-11 15:05:00 -07:00
  • 401d11fbc7 Automatic changelog generation for PR #13747 [ci skip] CitadelStationBot 2020-12-11 15:38:22 -06:00
  • e1bf6b94f9 Merge pull request #13747 from MrJWhit/thicc-fuel-tanks DeltaFire 2020-12-11 22:38:18 +01:00
  • 99f50addc7 wip Timothy Teakettle 2020-12-11 20:35:37 +00:00
  • 45b22b2855 final touches Timothy Teakettle 2020-12-11 19:41:56 +00:00
  • c6c25e5fa3 recompile silicons 2020-12-11 10:35:02 -07:00
  • 512e4cb696 Automatic changelog generation for PR #13739 [ci skip] CitadelStationBot 2020-12-11 10:59:09 -06:00
  • c1fee8e5c4 Merge pull request #13739 from timothyteakettle/tongue-and-eyes Lin 2020-12-11 16:59:05 +00:00
  • 1ec90799d6 Automatic changelog generation for PR #13734 [ci skip] CitadelStationBot 2020-12-11 10:58:10 -06:00
  • 4077537d45 Merge pull request #13734 from keronshb/Blobreflect-fix Lin 2020-12-11 16:58:07 +00:00
  • d10c9db8b2 Update reagent_dispenser.dm MrJWhit 2020-12-11 10:31:42 -05:00
  • 3f4702a99c done silicons 2020-12-11 05:52:09 -07:00
  • e27c843296 fixes silicons 2020-12-11 05:35:57 -07:00
  • 90608e8cfd ok silicons 2020-12-11 05:21:27 -07:00
  • c70d7a24e0 fixes silicons 2020-12-11 05:14:38 -07:00
  • 317f33b4e5 fixes silicons 2020-12-11 05:14:23 -07:00
  • 13391d2af6 fix silicons 2020-12-11 05:09:29 -07:00
  • 599a1f0419 fix silicons 2020-12-11 05:06:44 -07:00
  • 76e7caad33 colormates silicons 2020-12-11 04:54:30 -07:00
  • e252e073a1 Update stamina_combat.dm silicons 2020-12-11 03:06:29 -07:00
  • 1153f30b63 Update carbon.dm silicons 2020-12-11 02:26:52 -07:00
  • 34f2a94d1b Update combat.dm silicons 2020-12-11 02:23:26 -07:00
  • 3891095a21 Update say.dm silicons 2020-12-11 01:58:39 -07:00
  • d1003c206a debug timothyteakettle 2020-12-11 01:57:09 +00:00
  • 6cc917bc07 Automatic changelog generation for PR #13745 [ci skip] CitadelStationBot 2020-12-10 17:42:34 -06:00
  • bece5971b8 Merge pull request #13745 from Arturlang/soulstone_references DeltaFire 2020-12-11 00:42:30 +01:00
  • 62b5430985 yes Timothy Teakettle 2020-12-10 21:53:20 +00:00
  • 2a35a23509 Add files via upload EmeraldSundisk 2020-12-10 13:35:47 -08:00
  • 8af8063e73 Update input.dm silicons 2020-12-10 13:39:22 -07:00
  • 07b56e1542 Adds new line keronshb 2020-12-10 15:29:13 -05:00
  • d94c9a5d43 Fixes the paper keronshb 2020-12-10 15:26:34 -05:00
  • d1277ad7b2 Updated auxmos (see desc) Putnam 2020-12-10 12:03:28 -08:00
  • 477330197c Huh we already had this MrJWhit 2020-12-10 01:14:43 -05:00
  • 71343bf130 Automatic changelog generation for PR #13738 [ci skip] CitadelStationBot 2020-12-09 22:47:49 -06:00
  • a4e6df8f9a Merge pull request #13738 from DeltaFire15/heretic-tweaks silicons 2020-12-09 21:47:46 -07:00
  • aa6bcd3859 Automatic changelog generation for PR #13704 [ci skip] CitadelStationBot 2020-12-09 22:47:09 -06:00
  • 821c3becc3 Merge pull request #13704 from Putnam3145/make-emotes-local silicons 2020-12-09 21:47:06 -07:00
  • a508e0e4da Merge pull request #13732 from Citadel-Station-13/tgs-dmapi-update silicons 2020-12-09 21:45:46 -07:00
  • bb78b98d6c Box Maint (+1) changes keronshb 2020-12-09 23:02:51 -05:00
  • 5b74596d72 Update TGS DMAPI tgstation-server 2020-12-10 00:47:22 +00:00
  • c15f946104 Update DeltaStation2.dmm EmeraldSundisk 2020-12-09 10:35:45 -08:00
  • 9f4a7a47b9 Merge pull request #68 from Citadel-Station-13/master EmeraldSundisk 2020-12-09 10:06:17 -08:00
  • 73542f6688 Update new_player.dm timothyteakettle 2020-12-09 17:49:52 +00:00
  • 2a199bdbec Automatic changelog generation for PR #13740 [ci skip] CitadelStationBot 2020-12-09 10:58:10 -06:00
  • 16e7d8baf0 Merge pull request #13740 from Linzolle/nitpick DeltaFire 2020-12-09 17:58:06 +01:00
  • ef13b07dd4 Forgot this Artur 2020-12-09 17:56:28 +02:00
  • 827920dba7 Paranoid ramblings Artur 2020-12-09 17:54:44 +02:00
  • 6da9d9e070 Merge remote-tracking branch 'Upstream/master' The0bserver 2020-12-09 04:20:19 -05:00
  • 264b72f91d better verification timothyteakettle 2020-12-09 02:01:37 +00:00
  • 0ddc053a8b what if mapmerge worked Linzolle 2020-12-08 17:35:21 -06:00
  • 3e951d334c fix entertainment monitors Linzolle 2020-12-08 17:21:14 -06:00
  • d3ad092869 new proc Timothy Teakettle 2020-12-08 22:23:58 +00:00
  • 132a3c9526 color non polychromic items Timothy Teakettle 2020-12-08 19:29:34 +00:00
  • a2834b8ebc Automatic changelog generation for PR #13741 [ci skip] CitadelStationBot 2020-12-08 11:51:37 -06:00
  • b9c326388c Merge pull request #13741 from DeltaFire15/critical-objective-fix silicons 2020-12-08 10:51:33 -07:00
  • 69a1d6e603 oop DeltaFire 2020-12-08 16:32:34 +01:00
  • 86661a4fe0 aaaaaaaaaaaaaa DeltaFire 2020-12-08 16:30:09 +01:00
  • ad200fbb71 a stupid nitpick Linzolle 2020-12-07 17:52:07 -06:00
  • be5bccd847 Automatic changelog generation for PR #13736 [ci skip] CitadelStationBot 2020-12-07 17:18:38 -06:00
  • e38543ae48 Merge pull request #13736 from DeltaFire15/abductor-surgery-robotstuff Lin 2020-12-07 23:18:35 +00:00
  • 43df7462d5 copy from old species timothyteakettle 2020-12-07 23:03:28 +00:00
  • 3f05ea0e69 Merge branch 'master' of https://github.com/keronshb/Citadel-Station-13 keronshb 2020-12-07 17:43:34 -05:00
  • 8846e69c42 ANOTHER ONE Timothy Teakettle 2020-12-07 21:34:52 +00:00
  • ac9e383638 WOOPS ONE MORE DEBUG MESSAGE Timothy Teakettle 2020-12-07 21:28:17 +00:00
  • b186ec96ad rune invisible to sillycones. DeltaFire 2020-12-07 22:19:30 +01:00
  • 73d3234882 buncha changes DeltaFire 2020-12-07 22:15:04 +01:00
  • 33e4486c53 Merge remote-tracking branch 'upstream/master' into heretic-tweaks DeltaFire 2020-12-07 21:18:11 +01:00
  • ff29b7ee14 e DeltaFire 2020-12-07 21:16:40 +01:00
  • 81eaa8a2b9 woops timothyteakettle 2020-12-06 23:51:03 +00:00
  • 16b98adb9f no more debug timothyteakettle 2020-12-06 23:40:00 +00:00
  • a84f1648f4 Update preferences_savefile.dm timothyteakettle 2020-12-06 22:57:57 +00:00
  • e413fcb091 more fixes Timothy Teakettle 2020-12-06 22:14:35 +00:00