Commit Graph

  • b4ec612b4e Automatic changelog compile [ci skip] Changelogs 2021-03-29 00:07:03 +00:00
  • 2074166772 Automatic changelog generation for PR #14431 [ci skip] CitadelStationBot 2021-03-28 18:09:40 -05:00
  • 0f5d5522b0 Merge pull request #14431 from YakumoChen/ancient-bundle Lin 2021-03-28 18:09:38 -05:00
  • 130a76677b Merge pull request #14527 from LetterN/yay-nullspace Lin 2021-03-28 18:03:18 -05:00
  • 2cc5658afd Automatic changelog generation for PR #14528 [ci skip] CitadelStationBot 2021-03-28 18:02:51 -05:00
  • c4f2267fd0 Merge pull request #14528 from BlueWildrose/Idungoofed Lin 2021-03-28 18:02:49 -05:00
  • e4cbb44075 Automatic changelog generation for PR #14533 [ci skip] CitadelStationBot 2021-03-28 14:53:41 -05:00
  • ee7357c328 Merge pull request #14533 from Citadel-Station-13/silicons-patch-12 DeltaFire 2021-03-28 21:53:39 +02:00
  • 2a7aa8e826 Merge pull request #14524 from SandPoot/borgs-buff silicons 2021-03-28 13:48:14 -06:00
  • b6b62e84bc Update machine_designs_service.dm silicons 2021-03-28 12:47:22 -07:00
  • 5256d5cfda Automatic changelog generation for PR #14519 [ci skip] CitadelStationBot 2021-03-28 14:45:07 -05:00
  • ef43b566f3 Merge pull request #14519 from qweq12yt/improvs-and-contraband silicons 2021-03-28 13:45:05 -06:00
  • a7b41e2dbc Automatic changelog compile [ci skip] Changelogs 2021-03-28 00:06:45 +00:00
  • ae39ba3cca ok multiples of 5 tho qweq12yt 2021-03-27 11:38:58 -03:00
  • afa68172ee less smoke bombs qweq12yt 2021-03-27 11:36:52 -03:00
  • 85cad7b51a Merge branch 'master' into improvs-and-contraband qweq12yt 2021-03-27 11:33:01 -03:00
  • e7fdf9b274 Automatic changelog generation for PR #14440 [ci skip] CitadelStationBot 2021-03-27 02:38:09 -05:00
  • ebacd30cb5 Merge pull request #14440 from Putnam3145/slaughter-demon-thing silicons 2021-03-27 01:38:07 -06:00
  • 14a1f12c0e Automatic changelog generation for PR #14274 [ci skip] CitadelStationBot 2021-03-27 02:37:12 -05:00
  • f269a8d35f Merge pull request #14274 from timothyteakettle/disguise silicons 2021-03-27 01:37:09 -06:00
  • f83e1c3e2e Merge pull request #14520 from Citadel-Station-13/dependabot/pip/tools/pyyaml-5.4 silicons 2021-03-27 01:37:00 -06:00
  • 634c3b850a Automatic changelog generation for PR #14522 [ci skip] CitadelStationBot 2021-03-27 02:36:51 -05:00
  • 1f91d8efe3 Merge pull request #14522 from Hatterhat/rusted-hills-bruh silicons 2021-03-27 01:36:49 -06:00
  • ce7120b631 Automatic changelog generation for PR #14486 [ci skip] CitadelStationBot 2021-03-27 02:36:21 -05:00
  • 3ffe980e35 Merge pull request #14486 from keronshb/radioactivemicroport silicons 2021-03-27 01:36:19 -06:00
  • 4f3e695afa Merge pull request #14495 from Hatterhat/synth-aug silicons 2021-03-27 01:35:54 -06:00
  • 01a08e9e7c Automatic changelog generation for PR #14434 [ci skip] CitadelStationBot 2021-03-27 02:35:19 -05:00
  • a3d0dd6cf1 Merge pull request #14434 from dzahlus/joy silicons 2021-03-27 01:35:18 -06:00
  • cd158b4c5d Automatic changelog generation for PR #14501 [ci skip] CitadelStationBot 2021-03-27 02:34:49 -05:00
  • b2151ea989 Merge pull request #14501 from Shadow-Quill/RunIconFix silicons 2021-03-27 01:34:47 -06:00
  • 0f270f227b Automatic changelog generation for PR #14504 [ci skip] CitadelStationBot 2021-03-27 02:34:25 -05:00
  • 4f631c29bb Merge pull request #14504 from zeroisthebiggay/tritails silicons 2021-03-27 01:34:23 -06:00
  • 0c9bf019d7 Automatic changelog generation for PR #14506 [ci skip] CitadelStationBot 2021-03-27 02:34:18 -05:00
  • ee4f019459 Merge pull request #14506 from timothyteakettle/loadout-tab-defines silicons 2021-03-27 01:34:16 -06:00
  • 0abb461c50 Automatic changelog generation for PR #14509 [ci skip] CitadelStationBot 2021-03-27 02:34:04 -05:00
  • 26b011bb8b Merge pull request #14509 from R3dtail/patch-5 silicons 2021-03-27 01:34:02 -06:00
  • ec11627ad0 Merge pull request #14510 from Putnam3145/supernova-further-adjust silicons 2021-03-27 01:33:57 -06:00
  • 59ab104b15 Automatic changelog generation for PR #14511 [ci skip] CitadelStationBot 2021-03-27 02:33:49 -05:00
  • ea797787bd Merge pull request #14511 from R3dtail/patch-6 silicons 2021-03-27 01:33:48 -06:00
  • dbf7efe774 Automatic changelog generation for PR #14512 [ci skip] CitadelStationBot 2021-03-27 02:33:37 -05:00
  • ce8342ed92 Merge pull request #14512 from R3dtail/patch-8 silicons 2021-03-27 01:33:35 -06:00
  • ef0dd2e727 Automatic changelog generation for PR #14513 [ci skip] CitadelStationBot 2021-03-27 02:33:29 -05:00
  • bdbb33842e Merge pull request #14513 from Putnam3145/chaos-for-secret silicons 2021-03-27 01:33:27 -06:00
  • d53f930baa Automatic changelog generation for PR #14515 [ci skip] CitadelStationBot 2021-03-27 02:32:48 -05:00
  • 8a5d87725b Merge pull request #14515 from CuteMoff/Plasmaispogtake2 silicons 2021-03-27 01:32:47 -06:00
  • 07484e53aa Merge pull request #14516 from DeltaFire15/cc-headmessages-again silicons 2021-03-27 01:32:10 -06:00
  • b8a6987ffa Automatic changelog generation for PR #14518 [ci skip] CitadelStationBot 2021-03-27 02:31:58 -05:00
  • bf382f490c Merge pull request #14518 from necromanceranne/shield_explodies_fix silicons 2021-03-27 01:31:55 -06:00
  • e3c77d1125 Merge pull request #14529 from Hatterhat/sawed-inhands-grmbl silicons 2021-03-26 22:10:11 -06:00
  • 61af4108ea i don't wanna talk about it Hatterhat 2021-03-26 23:06:00 -05:00
  • f6b3ef0893 probably a better way of setting this up Blue Wildrose 2021-03-26 20:11:26 -07:00
  • 8091844a1c Urist McGreyshit regains their grip on the ! necromanceranne 2021-03-27 14:06:41 +11:00
  • ac0d261959 can't repair unless absolutely broken no more Blue Wildrose 2021-03-26 20:03:19 -07:00
  • 9c3c9861ab null-too-early LetterN 2021-03-27 08:31:48 +08:00
  • 0994a37af5 upload files SandPoot 2021-03-26 11:05:36 -03:00
  • c56c730c56 bruh Hatterhat 2021-03-25 23:56:01 -05:00
  • c8249c47cd uhh that's kinda fucked up bossman Hatterhat 2021-03-25 22:34:54 -05:00
  • cc761218b9 Automatic changelog compile [ci skip] Changelogs 2021-03-26 02:26:26 +00:00
  • 4edba9fb03 Automatic changelog compile [ci skip] Changelogs 2021-03-26 02:05:08 +00:00
  • bf9a093b06 Bump pyyaml from 5.3.1 to 5.4 in /tools dependabot[bot] 2021-03-26 00:47:40 +00:00
  • 31fb065c2a Automatic changelog compile [ci skip] Changelogs 2021-03-26 00:08:43 +00:00
  • a4f0b749de god damn GRAMMAR qweq12yt 2021-03-25 20:18:59 -03:00
  • 5e28d34a15 seed price adjustment qweq12yt 2021-03-25 20:04:51 -03:00
  • 780c401d5c commented out rocket_boots, check comments qweq12yt 2021-03-25 19:05:22 -03:00
  • f72ef06e82 Automatic changelog generation for PR #14517 [ci skip] CitadelStationBot 2021-03-25 16:59:09 -05:00
  • 072d52307c Merge pull request #14517 from timothyteakettle/slime-delimb DeltaFire 2021-03-25 22:59:07 +01:00
  • 2368968c66 Ports #42721 which happened to resolve this already necromanceranne 2021-03-26 08:45:14 +11:00
  • 14e066fe61 oops left something behind, sorry qweq12yt 2021-03-25 18:44:28 -03:00
  • d6ab576530 ported rocket boots qweq12yt 2021-03-25 18:17:47 -03:00
  • ae44649950 ported the clear PDA qweq12yt 2021-03-25 18:15:48 -03:00
  • 13033bd7bb availability for items tweaked, internals box added qweq12yt 2021-03-25 18:09:35 -03:00
  • 9015b22f62 removed wind-up gun and derringer from code qweq12yt 2021-03-25 17:34:23 -03:00
  • f784b849b8 removed derringer, it is not ready yet qweq12yt 2021-03-25 17:27:11 -03:00
  • 84223c65f5 Adds the shield flags to the ratvaran shield, adds the remaining sprites for the kinetic/energy/holo shields necromanceranne 2021-03-26 07:07:48 +11:00
  • a22cfe5650 chances to appear, some price changes qweq12yt 2021-03-25 16:53:32 -03:00
  • 6536dc4ecd Update _bodyparts.dm Timothy Teakettle 2021-03-25 18:24:57 +00:00
  • f113844c41 Update _bodyparts.dm Timothy Teakettle 2021-03-25 18:22:56 +00:00
  • 1e7d4e4335 *snap DeltaFire 2021-03-25 16:53:25 +01:00
  • dd295d20c2 Merge branch 'master' into Plasmaispogtake2 CuteMoff 2021-03-25 10:44:12 -04:00
  • 3efce37fd9 Update mineral.dm CuteMoff 2021-03-25 10:32:13 -04:00
  • 7265724c5b Update basemats.dm CuteMoff 2021-03-25 10:29:56 -04:00
  • 2c0ffca75c Update miscellaneous.dm Fabian 2021-03-25 14:26:18 +01:00
  • 899b94f0f3 Made threat a subsystem instead of dynamic-attached. Putnam 2021-03-24 23:44:37 -07:00
  • a8c6e2ee40 Update code/modules/cargo/blackmarket/blackmarket_uplink.dm R3dtail 2021-03-25 00:05:10 -05:00
  • a89fb1087c Update blackmarket_uplink.dm R3dtail 2021-03-24 22:46:12 -05:00
  • d856a1d2e0 added more items, stock/price/chance balance qweq12yt 2021-03-25 00:35:47 -03:00
  • 0b3773163c Removes Ichor Crates from chest rolls R3dtail 2021-03-24 22:20:09 -05:00
  • b06c15ab30 Update traitordevices.dm keronshb 2021-03-24 21:32:31 -04:00
  • ac432bdd25 remember to compile before sending commits Putnam 2021-03-24 18:31:06 -07:00
  • 362fb9a848 Automatic changelog generation for PR #14480 [ci skip] CitadelStationBot 2021-03-24 20:25:27 -05:00
  • 32797e0446 Merge pull request #14480 from BlueWildrose/sensorydetail silicons 2021-03-24 19:25:24 -06:00
  • 7190ef5d62 why did i do it that way? Putnam 2021-03-24 18:25:12 -07:00
  • d4ed7968dd Automatic changelog generation for PR #14505 [ci skip] CitadelStationBot 2021-03-24 20:24:00 -05:00
  • d58697c78d Merge pull request #14505 from timothyteakettle/the-most-important-pr silicons 2021-03-24 19:23:58 -06:00
  • 7869a5da75 Automatic changelog generation for PR #14507 [ci skip] CitadelStationBot 2021-03-24 20:23:04 -05:00
  • 0845840f5e Merge pull request #14507 from CuteMoff/thisismydiamondsword silicons 2021-03-24 19:23:02 -06:00
  • ecb1c0baec Automatic changelog compile [ci skip] Changelogs 2021-03-25 01:23:00 +00:00
  • 3164c2ace1 Automatic changelog generation for PR #14497 [ci skip] CitadelStationBot 2021-03-24 20:22:39 -05:00
  • 602140af99 Merge pull request #14497 from Hatterhat/lever-guns silicons 2021-03-24 19:22:36 -06:00
  • e7e13a8e47 Merge pull request #14499 from DeltaFire15/get-out-bot silicons 2021-03-24 19:22:28 -06:00