Commit Graph

  • 4f5071cc87 Clockwork fix and removal of station traits keronshb 2021-09-14 21:53:08 -04:00
  • cafe82e531 Automatic changelog compile [ci skip] Changelogs 2021-09-15 00:25:27 +00:00
  • 7ed5f622f4 Dynamic keronshb 2021-09-14 19:33:17 -04:00
  • fb05100008 Update mouse.dm (#15115) silicons 2021-09-14 15:16:57 -07:00
  • 7c918d0f79 Update prisoner.dm silicons 2021-09-14 15:11:58 -07:00
  • cd9b5fb7d8 Makes special objective items delete on reroll Putnam3145 2021-09-14 14:34:41 -07:00
  • 9a8698230b Added a config entry for monstermos Putnam3145 2021-09-14 14:18:14 -07:00
  • 1c24f65e59 fixed a typo Putnam3145 2021-09-14 14:17:56 -07:00
  • 82c5518256 fixthefunnypipes zerothebigboy 2021-09-14 11:57:07 -04:00
  • 3c60632312 spiteful zerothebigboy 2021-09-14 11:01:20 -04:00
  • 2995a767a6 theseshouldhavecommitted zerothebigboy 2021-09-14 09:42:32 -04:00
  • 3ef6436a4a whoopsiforgotsareas zerothebigboy 2021-09-14 09:27:40 -04:00
  • b4dcbb638e shit zerothebigboy 2021-09-14 09:19:19 -04:00
  • d536d22100 Merge pull request #15109 from Citadel-Station-13/silicons-patch-11 Lin 2021-09-14 01:09:22 -05:00
  • 4cdee473a4 Merge pull request #15132 from Citadel-Station-13/silicons-patch-17 Lin 2021-09-14 01:08:15 -05:00
  • d53820d9bf Merge pull request #15130 from Citadel-Station-13/when_why Lin 2021-09-14 01:08:06 -05:00
  • bde0e54eb6 Automatic changelog compile [ci skip] Changelogs 2021-09-14 00:26:53 +00:00
  • 8bb364df0a fix (#15128) silicons 2021-09-13 17:25:10 -07:00
  • 4af82878dc Update uplink_ammo.dm (#15141) silicons 2021-09-13 17:24:37 -07:00
  • ac0fd70b0b Update misc_floor.dm (#15140) silicons 2021-09-13 17:24:15 -07:00
  • 6524e3d539 Update species.dm (#15126) silicons 2021-09-13 17:23:52 -07:00
  • 6ce75c57d7 Automatic changelog generation for PR #15071 [ci skip] CitadelStationBot 2021-09-13 17:09:31 -05:00
  • 85659a297f Merge pull request #15071 from Putnam3145/remove-bomb-research-cap silicons 2021-09-13 15:09:28 -07:00
  • 1fe1d2582e Automatic changelog generation for PR #15099 [ci skip] CitadelStationBot 2021-09-13 17:09:07 -05:00
  • faed0eff01 Merge pull request #15099 from Hatterhat/tablets-gaming silicons 2021-09-13 15:09:04 -07:00
  • 17b3c3db2a Automatic changelog generation for PR #15120 [ci skip] CitadelStationBot 2021-09-13 17:08:52 -05:00
  • abbd3d7708 Merge pull request #15120 from LetterN/what-if-i-updated-mafia-yeah-right silicons 2021-09-13 15:08:50 -07:00
  • f7bcfa57ae safety DeltaFire 2021-09-13 23:28:02 +02:00
  • a0fa118415 unfucks changes DeltaFire 2021-09-13 22:48:16 +02:00
  • d6c9fb3594 Merge remote-tracking branch 'upstream/master' into clockcult-ai-conversion DeltaFire 2021-09-13 22:43:43 +02:00
  • 6664be64c7 change DeltaFire 2021-09-13 22:34:05 +02:00
  • a1eaab5446 Merge pull request #15136 from Citadel-Station-13/revert-15112-fix-supermatter-cascade silicons 2021-09-13 12:02:50 -07:00
  • 99908e17c5 Revert "Reworks supermatter gas output to be less cascade-y, more risky" Putnam3145 2021-09-13 11:39:32 -07:00
  • 6b572abd87 Merge remote-tracking branch 'upstream/master' DeltaFire 2021-09-13 20:08:39 +02:00
  • 932b0a5770 Update traumas.json zeroisthebiggay 2021-09-13 08:23:48 -04:00
  • 49be91467d Update traumas.json zeroisthebiggay 2021-09-13 00:39:36 -04:00
  • a33093ceb3 Update traumas.json zeroisthebiggay 2021-09-13 00:38:57 -04:00
  • 8999bc7c34 Update traumas.json zeroisthebiggay 2021-09-13 00:36:46 -04:00
  • 7a4d1042e6 Automatic changelog generation for PR #15062 [ci skip] CitadelStationBot 2021-09-12 23:10:53 -05:00
  • 47568e50bf Merge pull request #15062 from zeroisthebiggay/patch-18 silicons 2021-09-12 21:10:50 -07:00
  • 1616c496f6 Update sillytips.txt zeroisthebiggay 2021-09-13 00:05:33 -04:00
  • ce6a2c05f0 Update sillytips.txt zeroisthebiggay 2021-09-13 00:03:13 -04:00
  • c395068006 Update sillytips.txt zeroisthebiggay 2021-09-13 00:01:32 -04:00
  • 3e2bd8f256 Update tips.txt zeroisthebiggay 2021-09-13 00:00:52 -04:00
  • 333340fa02 Update sillytips.txt zeroisthebiggay 2021-09-13 00:00:22 -04:00
  • bb6f4b0c1d Automatic changelog generation for PR #15070 [ci skip] CitadelStationBot 2021-09-12 22:59:15 -05:00
  • e342145663 Merge pull request #15070 from zeroisthebiggay/prisoners silicons 2021-09-12 20:59:12 -07:00
  • 4f0d5e8c9a Merge pull request #15112 from Putnam3145/fix-supermatter-cascade silicons 2021-09-12 20:58:48 -07:00
  • 78657bb0de Automatic changelog generation for PR #15113 [ci skip] CitadelStationBot 2021-09-12 22:58:38 -05:00
  • 3a5f6e1649 Merge pull request #15113 from keronshb/unhuboxsm silicons 2021-09-12 20:58:36 -07:00
  • 401159bbec Automatic changelog generation for PR #15123 [ci skip] CitadelStationBot 2021-09-12 22:58:11 -05:00
  • 8d72664eef Merge pull request #15123 from keronshb/hitbyfix silicons 2021-09-12 20:58:09 -07:00
  • ff2a63c5fe Automatic changelog generation for PR #15124 [ci skip] CitadelStationBot 2021-09-12 22:58:00 -05:00
  • a0ad386b59 Merge pull request #15124 from zeroisthebiggay/why silicons 2021-09-12 20:57:58 -07:00
  • 5b0af1c5d1 Update tips.txt zeroisthebiggay 2021-09-12 23:47:32 -04:00
  • fcac5fa3c0 Update recycler.dm silicons 2021-09-12 20:40:25 -07:00
  • 4c058114a6 Update login.dm silicons 2021-09-12 20:37:03 -07:00
  • d2f3ff4d11 Update holy_weapons.dm silicons 2021-09-12 20:23:00 -07:00
  • 20b21549fa Update job.dm silicons 2021-09-12 20:21:29 -07:00
  • 57b6946fbb Update holy_weapons.dm silicons 2021-09-12 20:18:48 -07:00
  • 037f466a47 Update holy_weapons.dm silicons 2021-09-12 20:12:31 -07:00
  • aa7a376dd5 removes DoT silicons 2021-09-12 20:10:01 -07:00
  • 7aae90a360 Update holy_weapons.dm silicons 2021-09-12 20:05:47 -07:00
  • baa8d26428 Update holy_weapons.dm silicons 2021-09-12 20:03:26 -07:00
  • c038529677 Update holy_weapons.dm silicons 2021-09-12 19:55:20 -07:00
  • 45895c52e6 Automatic changelog compile [ci skip] Changelogs 2021-09-13 00:27:21 +00:00
  • 137a30a047 more nerfs lol Putnam3145 2021-09-12 15:04:42 -07:00
  • d41648b365 dumbasskevinz zerothebigboy 2021-09-11 23:34:02 -04:00
  • 223ba8d6c1 why zerothebigboy 2021-09-11 23:20:01 -04:00
  • f077f374bd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into why zerothebigboy 2021-09-11 23:04:48 -04:00
  • ba72e3d8f0 why zerothebigboy 2021-09-11 23:04:21 -04:00
  • 1bce3461ec Automatic changelog compile [ci skip] Changelogs 2021-09-12 00:27:13 +00:00
  • 4cb198fe05 Fixes Hitby runtime keronshb 2021-09-11 17:38:32 -04:00
  • 32675f611a Merge remote-tracking branch 'upstream/master' keronshb 2021-09-11 14:16:14 -04:00
  • 083704e29d lowered max oxy mult, made temp not matter Putnam3145 2021-09-11 11:03:15 -07:00
  • 3965ad9dae yeah that's just too much gas sorry Putnam3145 2021-09-11 10:25:39 -07:00
  • b444afede3 ACTION BUTTON SLAM keronshb 2021-09-11 12:06:18 -04:00
  • 0e944f5363 Automatic changelog generation for PR #15102 [ci skip] CitadelStationBot 2021-09-11 00:17:27 -05:00
  • 149d149dff Merge pull request #15102 from timothyteakettle/icecream silicons 2021-09-10 22:17:25 -07:00
  • 8152d84f94 Automatic changelog generation for PR #15122 [ci skip] CitadelStationBot 2021-09-11 00:17:10 -05:00
  • 6b17f53118 Merge pull request #15122 from LetterN/patch-10 silicons 2021-09-10 22:17:08 -07:00
  • 368bc3e45b Automatic changelog generation for PR #15121 [ci skip] CitadelStationBot 2021-09-11 00:17:02 -05:00
  • 9ccb105e98 Merge pull request #15121 from LetterN/WHO-BROKE-THIS-THEME-REEEEEE silicons 2021-09-10 22:16:59 -07:00
  • de4311e4d9 shut up Letter N 2021-09-11 12:50:06 +08:00
  • 1d53bf2094 i forgot LetterN 2021-09-11 12:39:32 +08:00
  • 791da1b9b4 mafia update. LetterN 2021-09-11 11:38:15 +08:00
  • 237fdb9893 Merge pull request #15118 from Putnam3145/another-auxmos-fix silicons 2021-09-10 18:17:01 -07:00
  • 9b83dc94bb Another auxmos fix Putnam3145 2021-09-10 18:00:39 -07:00
  • 0233f2123f Slaughter Fix and Buff keronshb 2021-09-10 21:00:28 -04:00
  • ad95f4cb56 Automatic changelog compile [ci skip] Changelogs 2021-09-11 00:25:09 +00:00
  • 68e2eb1d7a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into prisoners zerothebigboy 2021-09-10 12:12:57 -04:00
  • bb74dd4adf Cap fix keronshb 2021-09-10 12:01:46 -04:00
  • eae147f6a3 Automatic changelog generation for PR #15063 [ci skip] CitadelStationBot 2021-09-10 02:16:57 -05:00
  • fd785c6abf Merge pull request #15063 from zeroisthebiggay/intern silicons 2021-09-10 00:16:54 -07:00
  • 8c845134fb Automatic changelog generation for PR #15097 [ci skip] CitadelStationBot 2021-09-10 02:16:28 -05:00
  • 4836f222d0 Merge pull request #15097 from LetterN/generic-housekeeping-pr silicons 2021-09-10 00:16:25 -07:00
  • 5587cc91cd Other fix keronshb 2021-09-09 21:56:58 -04:00
  • 4883a93da1 Merge pull request #15092 from lolman360/patch-1 Lin 2021-09-09 20:21:40 -05:00
  • 9efb28c208 Merge pull request #15107 from Citadel-Station-13/silicons-patch-8 Lin 2021-09-09 20:08:48 -05:00
  • a1a6414777 Merge pull request #15096 from Citadel-Station-13/movespeed Lin 2021-09-09 20:08:35 -05:00