Commit Graph

  • 9fc169a3ae Merge pull request #13432 from SiliconMain/patch-6 silicons 2020-09-27 00:33:14 -07:00
  • 0f3e6ca942 Automatic changelog generation for PR #13427 [ci skip] CitadelStationBot 2020-09-27 02:18:16 -05:00
  • 511dfa84c0 Merge pull request #13427 from Trilbyspaceclone/booze silicons 2020-09-27 00:18:12 -07:00
  • 14765f085d Automatic changelog generation for PR #13424 [ci skip] CitadelStationBot 2020-09-27 02:16:48 -05:00
  • 987cfc7582 Merge pull request #13424 from Putnam3145/fix-cryo-objective-bull silicons 2020-09-27 00:16:45 -07:00
  • 0a986f6efd Automatic changelog generation for PR #13421 [ci skip] CitadelStationBot 2020-09-27 02:15:44 -05:00
  • 2b5a166425 Merge pull request #13421 from raspy-on-osu/teg-finale silicons 2020-09-27 00:15:41 -07:00
  • 29c69a44b9 Automatic changelog generation for PR #13420 [ci skip] CitadelStationBot 2020-09-27 02:13:56 -05:00
  • e699f32a3b Merge pull request #13420 from thakyZ/lightreplacer-change silicons 2020-09-27 00:13:50 -07:00
  • ee34de4cb1 Automatic changelog generation for PR #13419 [ci skip] CitadelStationBot 2020-09-27 02:11:33 -05:00
  • c17929e889 Merge pull request #13419 from Degirin2120/09/22/20_engi_hazard_jumpsuits silicons 2020-09-27 00:11:30 -07:00
  • 98b5bec342 Automatic changelog generation for PR #13415 [ci skip] CitadelStationBot 2020-09-27 02:11:02 -05:00
  • 441d8de7aa Merge pull request #13415 from Tupinambis/moresprite silicons 2020-09-27 00:10:58 -07:00
  • fd8acadf36 Automatic changelog generation for PR #13414 [ci skip] CitadelStationBot 2020-09-27 02:10:30 -05:00
  • c6d7bc886f Merge pull request #13414 from Putnam3145/its-2-seconds-yall silicons 2020-09-27 00:10:26 -07:00
  • e38f8b95b0 Automatic changelog generation for PR #13413 [ci skip] CitadelStationBot 2020-09-27 02:10:15 -05:00
  • f66c60884d Merge pull request #13413 from Putnam3145/fix-fuid-too-fast silicons 2020-09-27 00:10:12 -07:00
  • 58c7606ddf Automatic changelog generation for PR #13412 [ci skip] CitadelStationBot 2020-09-27 02:09:59 -05:00
  • e602284bcb Merge pull request #13412 from Putnam3145/supermatter-bad silicons 2020-09-27 00:09:56 -07:00
  • 0613951a17 Automatic changelog generation for PR #13411 [ci skip] CitadelStationBot 2020-09-27 02:09:21 -05:00
  • 9c53bd24c6 Merge pull request #13411 from Tupinambis/sprite silicons 2020-09-27 00:09:18 -07:00
  • 5670ad1f99 Automatic changelog generation for PR #13397 [ci skip] CitadelStationBot 2020-09-27 02:03:46 -05:00
  • 1092eacc6e Merge pull request #13397 from ArchieBeepBoop/microfans silicons 2020-09-27 00:03:43 -07:00
  • f9c7e1757f Automatic changelog generation for PR #13286 [ci skip] CitadelStationBot 2020-09-27 02:01:03 -05:00
  • 00ab73d0a3 Merge pull request #13286 from timothyteakettle/heterochromia silicons 2020-09-27 00:01:00 -07:00
  • 32a3ae406d Update gas_mixture.dm silicons 2020-09-26 23:58:32 -07:00
  • 87ac8d06c7 Fixes a spelling error in a variable Tupinambis 2020-09-27 00:59:50 -05:00
  • 61abfb6720 cargo cult math smh Putnam 2020-09-26 22:04:20 -07:00
  • 37dfbf8f33 Updated the readme a bit. Putnam 2020-09-26 21:52:16 -07:00
  • 7653076cfb Merge remote-tracking branch 'upstream/master' DeltaFire 2020-09-27 05:37:49 +02:00
  • d0247bdb3b modifies heretic sac husking a bit DeltaFire 2020-09-27 05:35:33 +02:00
  • 28e2e1c652 more fixes dapnee 2020-09-26 19:31:27 -06:00
  • fc0066a238 Automatic changelog compile [ci skip] Changelogs 2020-09-27 00:56:15 +00:00
  • 215737ccb8 Automatic changelog compile [ci skip] Changelogs 2020-09-27 00:19:34 +00:00
  • 9b0d1bcac3 Automatic changelog compile [ci skip] Changelogs 2020-09-27 00:15:06 +00:00
  • b97b595f6f Three new wooden floor types ItzGabby 2020-09-26 18:29:46 -04:00
  • f32e3be067 Merge remote-tracking branch 'upstream/master' DeltaFire 2020-09-26 21:45:45 +02:00
  • c8d899adb4 Automatic changelog generation for PR #13433 [ci skip] CitadelStationBot 2020-09-26 13:27:35 -05:00
  • 4314159ab3 Merge pull request #13433 from SiliconMain/patch-7 Putnam3145 2020-09-26 11:27:33 -07:00
  • 9f871dfa17 Makes shivering and fever not broken. Putnam 2020-09-26 11:22:24 -07:00
  • cd5b108627 Alpha Tupinambis 2020-09-26 12:47:11 -05:00
  • 29d2a12d55 fixes revenants reviving DeltaFire 2020-09-26 16:29:11 +02:00
  • 03ee3d97ec Merge remote-tracking branch 'upstream/master' DeltaFire 2020-09-26 15:50:33 +02:00
  • 63c24e31b1 fixes a 5 year old hex value bug Tupinambis 2020-09-26 00:14:32 -05:00
  • 4ce4cd3ed1 Merge pull request #13435 from Citadel-Station-13/halohair LetterJay 2020-09-25 22:07:36 -05:00
  • 0411072ec2 Automatic changelog compile [ci skip] Changelogs 2020-09-26 00:53:09 +00:00
  • 04a7c66561 fix turret removal timothyteakettle 2020-09-26 01:38:04 +01:00
  • e716ed6901 Automatic changelog compile [ci skip] Changelogs 2020-09-26 00:17:55 +00:00
  • 2ad1ca9ea2 Automatic changelog compile [ci skip] Changelogs 2020-09-26 00:14:41 +00:00
  • 47ff98e4c5 Adds examine text, removes old self sustain checks The0bserver 2020-09-25 18:12:26 -04:00
  • 178be2b643 fixes plushlings DeltaFire 2020-09-25 23:41:18 +02:00
  • 07f50845b6 no more conditional invincibility DeltaFire 2020-09-25 23:24:00 +02:00
  • 083f06609b Merge remote-tracking branch 'upstream/master' DeltaFire 2020-09-25 23:14:04 +02:00
  • 0746116e17 fixes a bunch of blacksmithing stuff DeltaFire 2020-09-25 22:04:55 +02:00
  • bbf5c7f43e Merge branch 'master' into 09/22/20_engi_hazard_jumpsuits Mark9013100 2020-09-25 15:45:38 -04:00
  • e4f9849cc3 Adds engineering hazard jumpsuits Mark9013100 2020-09-22 09:44:37 -04:00
  • b56036a2ed travis still runs on linux Putnam 2020-09-25 09:41:29 -07:00
  • 24c48c2bec Adds an "unstuck" step to LINDA Putnam 2020-09-25 09:40:32 -07:00
  • 89557a8ee3 Update custom_items.dm LetterJay 2020-09-25 10:46:43 -05:00
  • 8fef121064 Fixes missing hair when wearing halo Jay 2020-09-25 10:45:13 -05:00
  • 84f240c5dd Update holosign.dm SiliconMain 2020-09-25 09:50:08 -05:00
  • 4e5296438c Update tool_designs.dm SiliconMain 2020-09-25 09:46:11 -05:00
  • 57c4a3416a Merge remote-tracking branch 'citadel/master' into combat_rework_experimental silicons 2020-09-25 01:03:15 -07:00
  • d18e47d9e1 Automatic changelog generation for PR #13426 [ci skip] CitadelStationBot 2020-09-24 23:40:43 -05:00
  • f6d9d4b535 Merge pull request #13426 from CoreFlare/master Putnam3145 2020-09-24 21:40:41 -07:00
  • a70c71b72c FINAL EmeraldSundisk 2020-09-24 20:18:33 -07:00
  • 865ef8d06f DIGIFIX EmeraldSundisk 2020-09-24 19:59:08 -07:00
  • 92ecf6c0d2 ICONS EmeraldSundisk 2020-09-24 19:45:52 -07:00
  • 360b2131bc DIGI EmeraldSundisk 2020-09-24 19:43:41 -07:00
  • b23f90b4a1 FUCK EmeraldSundisk 2020-09-24 19:33:42 -07:00
  • d80950eb9a Merge branch 'cargoclothes' of https://github.com/EmeraldSundisk/Citadel-Station-13 into cargoclothes EmeraldSundisk 2020-09-24 19:27:39 -07:00
  • 50682b9cf5 Update uniform.dmi EmeraldSundisk 2020-09-24 19:26:31 -07:00
  • 079d4eeb58 Merge pull request #63 from EmeraldSundisk/Citadel-Station-13-master EmeraldSundisk 2020-09-24 19:18:50 -07:00
  • 63f1461656 Revert "planti" EmeraldSundisk 2020-09-24 19:17:41 -07:00
  • 806f06d3a4 planti EmeraldSundisk 2020-09-24 19:16:48 -07:00
  • 45ca212904 Revert "cargotech dmis" EmeraldSundisk 2020-09-24 19:04:27 -07:00
  • dadb272dd6 Revert "complete" EmeraldSundisk 2020-09-24 19:04:01 -07:00
  • 7a4bb419a4 Revert "still needs planticasual" EmeraldSundisk 2020-09-24 19:03:39 -07:00
  • 102c9981d4 Automatic changelog compile [ci skip] Changelogs 2020-09-25 00:53:27 +00:00
  • c4cc37298f Automatic changelog compile [ci skip] Changelogs 2020-09-25 00:18:31 +00:00
  • c31366f2a7 Automatic changelog compile [ci skip] Changelogs 2020-09-25 00:15:08 +00:00
  • 106b8ccead Merge branch 'master' into heterochromia Timothy Teakettle 2020-09-24 22:09:03 +01:00
  • 70dd401861 Merge pull request #62 from Citadel-Station-13/master EmeraldSundisk 2020-09-24 11:47:23 -07:00
  • 775616f1ef complete EmeraldSundisk 2020-09-24 11:33:20 -07:00
  • d16cbb54f0 still needs planticasual EmeraldSundisk 2020-09-24 10:36:10 -07:00
  • 186f13f56c Revert "icon should work now I hope" EmeraldSundisk 2020-09-24 09:38:26 -07:00
  • d5f4f04736 Automatic changelog generation for PR #13430 [ci skip] CitadelStationBot 2020-09-24 08:15:29 -05:00
  • a1b5c9fa47 Merge pull request #13430 from Putnam3145/removeRemoveNullsFromList silicons 2020-09-24 06:15:25 -07:00
  • 6f6e330984 Removes removeNullsFromList, cause it doesn't work. Putnam 2020-09-24 01:15:22 -07:00
  • 650d76ba69 Fixed a dumb typo. Putnam 2020-09-23 22:36:12 -07:00
  • e4f0cd6a27 loadout EmeraldSundisk 2020-09-23 22:27:53 -07:00
  • 179b9ba05d icon should work now I hope EmeraldSundisk 2020-09-23 21:49:26 -07:00
  • 1a6584e9dc Automatic changelog compile [ci skip] Changelogs 2020-09-24 00:53:59 +00:00
  • dc87d39341 Automatic changelog compile [ci skip] Changelogs 2020-09-24 00:19:11 +00:00
  • 0e867f37e6 Automatic changelog compile [ci skip] Changelogs 2020-09-24 00:15:22 +00:00
  • fc67ee610a reverts mojito changes TrilbySpaceClone 2020-09-23 18:09:01 -04:00
  • 4f0f752ac6 More animated drinks TrilbySpaceClone 2020-09-23 18:03:54 -04:00
  • a08baf782c Automatic changelog generation for PR #13380 [ci skip] CitadelStationBot 2020-09-23 16:40:00 -05:00
  • 7ca1b1dc79 Merge pull request #13380 from Putnam3145/cache-locality-experiments silicons 2020-09-23 14:39:56 -07:00
  • c41add450a Merge pull request #13425 from Arturlang/TGUI_Updoot Putnam3145 2020-09-23 14:19:22 -07:00