Commit Graph

  • 6ea7843e38 updating my fork probably in the less efficient way BlueWildrose 2020-09-01 14:59:14 -07:00
  • 5869ddb1cd Real Fix, Real Fox (I hope.) The0bserver 2020-09-01 06:55:15 -04:00
  • 7d2d7f84dd a fix for a fox. The0bserver 2020-09-01 06:49:05 -04:00
  • 6673779ca2 Hi. Someone needs to fix up circuits. Not me tho. The0bserver 2020-09-01 06:46:31 -04:00
  • 457cb5e238 THIS IS IT LUIGI! ALL REAGENTS SET! The0bserver 2020-09-01 06:44:46 -04:00
  • 5697ab2ff4 Merge remote-tracking branch 'upstream/master' into AnPrimAssistants lolman360 2020-09-01 16:57:02 +10:00
  • 82ffb64268 maybe? The0bserver 2020-09-01 02:53:29 -04:00
  • a89d6cd125 I hate circuits. They hate change. The0bserver 2020-09-01 02:47:05 -04:00
  • e36f93baeb Sorry, Circuits. (Only slightly.) The0bserver 2020-09-01 02:42:43 -04:00
  • 89b837461e This should squash the error. The0bserver 2020-09-01 02:32:28 -04:00
  • 75854915ee You open the door. There's a green bean. The0bserver 2020-09-01 02:27:15 -04:00
  • 2c6cfd2115 YOU CAN'T STOP ME FROM DREAMING! The0bserver 2020-09-01 02:19:37 -04:00
  • d38cdcb6be Update fermi.dm silicons 2020-08-31 22:35:25 -07:00
  • aee7974140 Update astral.dm silicons 2020-08-31 22:34:19 -07:00
  • d504d45839 Cat Roomba... (Further solidification of instab) The0bserver 2020-09-01 01:27:22 -04:00
  • 4f33865ce5 Automatic changelog generation for PR #13305 [ci skip] CitadelStationBot 2020-08-31 23:21:49 -05:00
  • 10fdc4427a Merge pull request #13305 from Tupinambis/maintloot2 silicons 2020-08-31 21:21:46 -07:00
  • e4c758e92e Automatic changelog generation for PR #13307 [ci skip] CitadelStationBot 2020-08-31 23:21:12 -05:00
  • 9a4f9aef6e Merge pull request #13307 from raspy-on-osu/pyroanomaly-slimespawn-spam silicons 2020-08-31 21:21:09 -07:00
  • ed791312d6 Automatic changelog generation for PR #13308 [ci skip] CitadelStationBot 2020-08-31 23:20:52 -05:00
  • 0dc96492a1 Merge pull request #13308 from Putnam3145/save_character_unit_test silicons 2020-08-31 21:20:48 -07:00
  • 5ffa571e67 Automatic changelog generation for PR #13310 [ci skip] CitadelStationBot 2020-08-31 23:20:18 -05:00
  • db28a50953 Merge pull request #13310 from Putnam3145/fix-fusion-display silicons 2020-08-31 21:20:15 -07:00
  • 2bb19e838b Automatic changelog generation for PR #13316 [ci skip] CitadelStationBot 2020-08-31 23:19:40 -05:00
  • 77cf561f7f Merge pull request #13316 from timothyteakettle/ckey-pref silicons 2020-08-31 21:19:37 -07:00
  • 81645301e1 Automatic changelog generation for PR #13313 [ci skip] CitadelStationBot 2020-08-31 23:19:12 -05:00
  • 1670b6f2a6 Merge pull request #13313 from Putnam3145/plastitanium-rapier-fix silicons 2020-08-31 21:19:09 -07:00
  • 6348dd7d13 Revert "removes two unused sprites" silicons 2020-08-31 21:06:18 -07:00
  • 735809a69b Commented out threaded FFI. Putnam 2020-08-31 20:11:52 -07:00
  • 2f3edb4491 Added threaded extools logging as an alternative to rust_g logging. Putnam 2020-08-31 19:56:49 -07:00
  • 1b52ceb63a Various changes. lolman360 2020-09-01 11:43:01 +10:00
  • 05bd0579ca Merge remote-tracking branch 'upstream/master' into AnPrimAssistants lolman360 2020-09-01 11:23:57 +10:00
  • 4d6fb10dff Nyoops. lolman360 2020-09-01 10:55:55 +10:00
  • 4e0ec238f0 Automatic changelog compile [ci skip] Changelogs 2020-09-01 00:51:49 +00:00
  • 83d83a7e9d Automatic changelog compile [ci skip] Changelogs 2020-09-01 00:50:46 +00:00
  • 400391e8d8 Bronze anvil tweaks, clarity. lolman360 2020-09-01 10:37:56 +10:00
  • cb0c4b9fe5 Automatic changelog compile [ci skip] Changelogs 2020-09-01 00:17:14 +00:00
  • e652591639 Automatic changelog compile [ci skip] Changelogs 2020-09-01 00:16:02 +00:00
  • 515e0333fc Automatic changelog generation for PR #13319 [ci skip] CitadelStationBot 2020-08-31 19:00:01 -05:00
  • 4936829bac Merge pull request #13319 from BlueWildrose/hungryhungryslimes silicons 2020-08-31 16:59:58 -07:00
  • 5bcae6431b Merge pull request #13323 from silicons/rsc Putnam3145 2020-08-31 16:21:32 -07:00
  • d859d12b9f yes Timothy Teakettle 2020-09-01 00:14:17 +01:00
  • ee0d86f201 fix silicons 2020-08-31 14:14:53 -07:00
  • b1b92c3225 runtiment Hatterhat 2020-08-31 14:12:10 -05:00
  • c8f947011f Makes ghost dojo hilbert hotel not easily enterable. Putnam 2020-08-31 05:43:56 -07:00
  • df3c2d3d8d Reduced some bloat, using TRAY_NAME_UPDATE The0bserver 2020-08-31 05:01:51 -04:00
  • 9be7bda9bc urgh The0bserver 2020-08-31 03:30:13 -04:00
  • b13db43985 Let's not forget this. The0bserver 2020-08-31 03:27:56 -04:00
  • dbb6ef7d4e I think we got rid of nutrilevel, finally. The0bserver 2020-08-31 03:26:43 -04:00
  • cc9648c08d Update slime.dm Blue Wildrose 2020-08-30 23:19:18 -07:00
  • 4edf61dde7 New Define File: Botany.dm Earthmother save me. The0bserver 2020-08-31 00:34:45 -04:00
  • ceea4f07ea tested? no Letter N 2020-08-31 10:43:03 +08:00
  • 0db189333a >one fucking callback Hatterhat 2020-08-30 21:21:27 -05:00
  • af2c7b295e ah yes timothyteakettle 2020-08-31 02:25:54 +01:00
  • a9ec2254ba hide your ckey timothyteakettle 2020-08-31 01:47:49 +01:00
  • 6ed6c75cd7 Automatic changelog compile [ci skip] Changelogs 2020-08-31 00:24:54 +00:00
  • e92845ab7d Automatic changelog compile [ci skip] Changelogs 2020-08-31 00:23:09 +00:00
  • 408882171f Automatic changelog compile [ci skip] Changelogs 2020-08-31 00:16:29 +00:00
  • d97d9f564b Automatic changelog compile [ci skip] Changelogs 2020-08-31 00:15:04 +00:00
  • a4ec595599 Merge remote-tracking branch 'upstream/master' DeltaFire 2020-08-30 22:24:45 +02:00
  • 55fcd95eba Automatic changelog generation for PR #13294 [ci skip] CitadelStationBot 2020-08-30 15:15:13 -05:00
  • 4bfa6d0a06 Merge pull request #13294 from Putnam3145/health-event-fix silicons 2020-08-30 13:15:10 -07:00
  • c2002aca78 This is it, Luigi. We gotta move the function! The0bserver 2020-08-30 12:44:12 -04:00
  • af97bddf87 It begins. Earthmother preserve me. The0bserver 2020-08-30 11:38:46 -04:00
  • 34393a187b fix ipcs Timothy Teakettle 2020-08-30 16:27:09 +01:00
  • 6028c66ceb Fixed the combat log issue Putnam 2020-08-30 08:26:29 -07:00
  • 10586f3c3b trend, trend! Putnam 2020-08-30 07:33:17 -07:00
  • 4cf040a11a Makes plastitanium rapier not silently poison for pacifists. Putnam 2020-08-30 06:25:00 -07:00
  • cba2a1645b Makes pool actually check for the reagent instead of checking for a number. Putnam 2020-08-30 06:16:21 -07:00
  • 4626a9a411 Merge branch 'fix-fusion-display' of https://github.com/Putnam3145/Citadel-Station-13 into fix-fusion-display Putnam 2020-08-30 05:42:38 -07:00
  • 9da959795c Made the text make sense, again. Putnam 2020-08-30 05:42:21 -07:00
  • 4d4cfd58d9 Remove bizarre changelog change. Putnam3145 2020-08-30 05:35:03 -07:00
  • 15b5b77494 Replaced all the references of fusionpower to instability in results. Putnam 2020-08-30 03:06:36 -07:00
  • 384170331c Merge branch 'fix-fusion-display' of https://github.com/Putnam3145/Citadel-Station-13 into fix-fusion-display Putnam 2020-08-30 03:05:07 -07:00
  • 6f2e871ba3 Merge branch 'master' of https://github.com/Putnam3145/Citadel-Station-13 Putnam 2020-08-30 03:02:40 -07:00
  • 5ba883bfe5 Fixes fusion power text to make sense. Putnam 2020-08-30 02:53:46 -07:00
  • 282f292347 Automatic changelog generation for PR #13058 [ci skip] CitadelStationBot 2020-08-30 02:52:58 -05:00
  • 69f6927275 Update broom.dm (#13058) silicons 2020-08-30 00:52:54 -07:00
  • 3b571e2edf oh jesus fuck its all gone wrong Hatterhat 2020-08-30 01:33:56 -05:00
  • da641c9b96 Update necropolis_chests.dm Trilbyspaceclone 2020-08-30 02:10:59 -04:00
  • 66899faa72 needs that var/ Putnam 2020-08-29 23:10:13 -07:00
  • 3097c790b8 Added an extra test. Putnam 2020-08-29 23:02:18 -07:00
  • e97ef2d84d Added a character saving unit test. Putnam 2020-08-29 22:58:04 -07:00
  • c90c46a2d1 mob_spawners raspy-on-osu 2020-08-30 01:50:55 -04:00
  • a8f920f88c Update _lists.dm silicons 2020-08-29 22:48:26 -07:00
  • 550fc4a538 Automatic changelog generation for PR #13249 [ci skip] CitadelStationBot 2020-08-30 00:34:46 -05:00
  • 7c5197f383 Merge pull request #13249 from Citadel-Station-13/silicons-patch-25 Putnam3145 2020-08-29 22:34:43 -07:00
  • 9c8f3305bb Merge branch 'master' into spike-loot-differentces Trilbyspaceclone 2020-08-30 00:41:42 -04:00
  • 55226048b2 Automatic changelog generation for PR #13292 [ci skip] CitadelStationBot 2020-08-29 23:41:09 -05:00
  • bf27de1aec Merge pull request #13292 from Putnam3145/fix-dynamic-again silicons 2020-08-29 21:41:06 -07:00
  • 328d1f255c Automatic changelog generation for PR #13293 [ci skip] CitadelStationBot 2020-08-29 23:40:50 -05:00
  • ded821f249 Merge pull request #13293 from lolman360/ShuttleEngineFixes silicons 2020-08-29 21:40:46 -07:00
  • cce4c944ad Merge pull request #13297 from Detective-Google/more-snaxi-changes silicons 2020-08-29 21:40:39 -07:00
  • 896a18136b Automatic changelog generation for PR #13298 [ci skip] CitadelStationBot 2020-08-29 23:40:26 -05:00
  • d4bc6f9fee Merge pull request #13298 from DeltaFire15/eminence-updates silicons 2020-08-29 21:40:22 -07:00
  • 7c11f4ec4a Automatic changelog generation for PR #13302 [ci skip] CitadelStationBot 2020-08-29 23:40:17 -05:00
  • 1ed712d69d Merge pull request #13302 from necromanceranne/mecha_backstab_fix_port silicons 2020-08-29 21:40:13 -07:00
  • 05b5d39732 Update ballistic.dm silicons 2020-08-29 21:38:45 -07:00
  • 38f91531de Automatic changelog generation for PR #13024 [ci skip] CitadelStationBot 2020-08-29 23:36:01 -05:00
  • bf678a25da Merge pull request #13024 from zeroisthebiggay/saltprfuckwaffles silicons 2020-08-29 21:35:58 -07:00