Commit Graph

  • 5fe6772c58 Update microwave.dm MrJWhit 2021-01-22 13:23:10 -05:00
  • fb75c6a949 adds in ending sequence for Ratvar spawning, + various other changes Dan-Neposh 2021-01-22 00:04:04 -05:00
  • c38e5ca446 puts the eminence spire back in Reebe until the eminence vote changes Dan-Neposh 2021-01-21 23:46:21 -05:00
  • 48d8ffc9a7 reverts every change slowing down developement of this PR Dan-Neposh 2021-01-21 23:42:23 -05:00
  • e0d0995ea3 Removes explosive decomp; makes planet atmos check better Putnam 2021-01-21 18:16:46 -08:00
  • aa9625cffc Automatic changelog compile [ci skip] Changelogs 2021-01-22 00:45:25 +00:00
  • 920be8cffc stuffs DeltaFire 2021-01-22 01:43:35 +01:00
  • 1eb994ed2b Merge remote-tracking branch 'upstream/master' DeltaFire 2021-01-22 01:06:48 +01:00
  • ca9292f6fd Update overmind.dm Timothy Teakettle 2021-01-21 22:45:46 +00:00
  • 897f8a744f Update overmind.dm Timothy Teakettle 2021-01-21 22:39:38 +00:00
  • 8569c40ce5 Update adminpm.dm Timothy Teakettle 2021-01-21 22:23:48 +00:00
  • 401e6a7690 test Timothy Teakettle 2021-01-21 20:17:25 +00:00
  • 01e8412e09 Automatic changelog generation for PR #14103 [ci skip] CitadelStationBot 2021-01-21 02:41:32 -06:00
  • f2853ab414 Merge pull request #14103 from Arturlang/give_hotkey silicons 2021-01-21 01:41:29 -07:00
  • d1e8891d9e makes what i'm doing with model_temp more explicit Putnam 2021-01-20 18:43:59 -08:00
  • 51100c9bf9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos Putnam 2021-01-20 18:38:52 -08:00
  • 165cdbf040 Makes it compile. Putnam 2021-01-20 18:36:45 -08:00
  • d1bcfbbf67 Automatic changelog compile [ci skip] Changelogs 2021-01-21 00:47:50 +00:00
  • 95db018de8 itt: i dont test my code again Hatterhat 2021-01-20 18:34:57 -06:00
  • 34473c2ac7 fix silicons 2021-01-20 16:55:19 -07:00
  • 996ad0634d fix silicons 2021-01-20 16:16:06 -07:00
  • 20f06cae0f fix silicons 2021-01-20 16:07:42 -07:00
  • 9792463690 dme fix silicons 2021-01-20 16:05:21 -07:00
  • 235ca8809a uh silicons 2021-01-20 16:04:52 -07:00
  • e06f0bbc72 fixes silicons 2021-01-20 16:01:09 -07:00
  • 72716068ba Merge pull request #14101 from Hatterhat/more-gauze-shit silicons 2021-01-20 15:26:41 -07:00
  • 562b222d9d Automatic changelog generation for PR #13969 [ci skip] CitadelStationBot 2021-01-20 16:26:15 -06:00
  • 8cb8ddef42 Merge pull request #13969 from Arturlang/blood_bag_tweaks silicons 2021-01-20 15:26:12 -07:00
  • 83625305a2 Update uplink_clothing.dm silicons 2021-01-20 15:24:09 -07:00
  • 2bbfe67c80 Automatic changelog generation for PR #14083 [ci skip] CitadelStationBot 2021-01-20 16:22:09 -06:00
  • 66874fe252 Merge pull request #14083 from shellspeed1/alternative-xeno-hive silicons 2021-01-20 15:22:06 -07:00
  • 4a707cce1d Automatic changelog generation for PR #14078 [ci skip] CitadelStationBot 2021-01-20 16:21:58 -06:00
  • 30755bfeb9 Merge pull request #14078 from MrJWhit/metastation-toxins-fix-2-electric-bogaloo silicons 2021-01-20 15:21:55 -07:00
  • 1a33feff25 Automatic changelog generation for PR #14076 [ci skip] CitadelStationBot 2021-01-20 16:21:47 -06:00
  • 2acdee8d01 Merge pull request #14076 from Hatterhat/cotton-stack-pull silicons 2021-01-20 15:21:44 -07:00
  • f238f73716 Automatic changelog generation for PR #14092 [ci skip] CitadelStationBot 2021-01-20 16:21:09 -06:00
  • 718cb3f501 Merge pull request #14092 from BlueWildrose/Timidwomen silicons 2021-01-20 15:21:06 -07:00
  • c786eb48ce Merge pull request #14095 from necromanceranne/sprite_fixies silicons 2021-01-20 15:20:55 -07:00
  • f14dd4175c Automatic changelog generation for PR #14100 [ci skip] CitadelStationBot 2021-01-20 16:20:48 -06:00
  • fa587e3d1a Merge pull request #14100 from Hatterhat/sheath-exp silicons 2021-01-20 15:20:45 -07:00
  • 84453c812d Automatic changelog generation for PR #14107 [ci skip] CitadelStationBot 2021-01-20 16:17:50 -06:00
  • 288bbcd334 Merge pull request #14107 from shellspeed1/Brings-back-mining-point-card-for-borgs silicons 2021-01-20 15:17:47 -07:00
  • acee2eea95 Automatic changelog generation for PR #14109 [ci skip] CitadelStationBot 2021-01-20 16:17:40 -06:00
  • f6a8306174 Merge pull request #14109 from Arturlang/space_tackling_meme_fix silicons 2021-01-20 15:17:36 -07:00
  • 60200d4f0e Automatic changelog generation for PR #14110 [ci skip] CitadelStationBot 2021-01-20 16:17:15 -06:00
  • f7c6dbd8ba Merge pull request #14110 from BlueWildrose/nicebobbertsonsyougotthere silicons 2021-01-20 15:17:12 -07:00
  • 5afe3bbb6f Merge remote-tracking branch 'citadel/master' into ex_act_3 silicons 2021-01-20 15:15:10 -07:00
  • 9f50ea66c8 Merge pull request #14104 from LetterN/semi-sync silicons 2021-01-20 15:14:37 -07:00
  • f3cdaf941b Update colormate.dm silicons 2021-01-20 15:11:04 -07:00
  • 94d419c6cd Update modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm Putnam3145 2021-01-20 14:08:07 -08:00
  • f6eca7afad hugboxy shit silicons 2021-01-20 15:06:53 -07:00
  • da412a2269 Automatic changelog generation for PR #14097 [ci skip] CitadelStationBot 2021-01-20 15:20:54 -06:00
  • d262f366e7 Merge pull request #14097 from Citadel-Station-13/silicons-patch-28 Lin 2021-01-20 15:20:50 -06:00
  • 41f4586f50 Forgot to undo some testing changes Artur 2021-01-20 22:30:14 +02:00
  • 4457d568dd Tank memes finished Artur 2021-01-20 20:25:36 +02:00
  • 87c9201707 No gunning sadly Artur 2021-01-20 19:51:11 +02:00
  • f1f6e35804 Automatic changelog generation for PR #14094 [ci skip] CitadelStationBot 2021-01-20 10:45:55 -06:00
  • 2debe930fc Merge pull request #14094 from kittycat2002/master Putnam3145 2021-01-20 08:45:52 -08:00
  • 66979e2364 Merge branch 'master' into revenant_TK Artur 2021-01-20 18:27:11 +02:00
  • 16e0b85b44 More funshit Artur 2021-01-20 18:23:28 +02:00
  • e24eb14121 args DeltaFire 2021-01-20 16:32:15 +01:00
  • 80ccc93fd7 Removes breast and penis analysis from medical scanners Blue Wildrose 2021-01-20 07:32:03 -07:00
  • 5aa710ffd7 spess Artur 2021-01-20 16:05:20 +02:00
  • ef950400a4 Fixes the space tackling meme Artur 2021-01-20 15:50:41 +02:00
  • 3737c52df8 Funny actions Artur 2021-01-20 15:23:34 +02:00
  • 125cd17cee Merge remote-tracking branch 'origin/master' into rustsql Letter N 2021-01-20 15:40:41 +08:00
  • 81e37b6e33 Update robot_modules.dm shellspeed1 2021-01-19 21:40:47 -08:00
  • 721f9c6a7c Merge remote-tracking branch 'upstream/master' into heretic-target-fix DeltaFire 2021-01-20 06:32:37 +01:00
  • 1057721d2a Merge pull request #14106 from Citadel-Station-13/silicons-patch-29 DeltaFire 2021-01-20 06:32:01 +01:00
  • ae5cb78424 Update toggles.dm silicons 2021-01-19 22:27:13 -07:00
  • 7136f5cffb boop DeltaFire 2021-01-20 06:09:20 +01:00
  • 4578f30001 brrt DeltaFire 2021-01-20 05:54:38 +01:00
  • a68957dcc4 wow thanks tabnine 😂 Letter N 2021-01-20 12:02:20 +08:00
  • 6547028272 what the fuck?? Letter N 2021-01-20 11:56:44 +08:00
  • 9fa6958a99 OH FUCK Letter N 2021-01-20 11:49:53 +08:00
  • 02ca168df3 why are we building windows facing nothing but rock infront of it? Letter N 2021-01-20 11:37:44 +08:00
  • 021b28a2b7 cleanup shitcode - b - gone Letter N 2021-01-20 11:08:21 +08:00
  • 4a3fe48710 Automatic changelog generation for PR #13610 [ci skip] CitadelStationBot 2021-01-19 20:29:29 -06:00
  • 2b16435033 Merge pull request #13610 from Putnam3145/fix-eq-hogging silicons 2021-01-19 19:29:19 -07:00
  • 2e2a609d4b Merge remote-tracking branch 'origin/master' into semi-sync Letter N 2021-01-20 10:24:28 +08:00
  • c08765d0eb let's not get ddosed Letter N 2021-01-20 10:23:30 +08:00
  • a1b208f1da Revert "Update json_verifier.py" Putnam 2021-01-19 18:23:08 -08:00
  • 3c43345ff6 Update json_verifier.py Putnam 2021-01-19 18:22:50 -08:00
  • 745c825205 Give hotkey, but citadel Artur 2021-01-20 04:21:57 +02:00
  • 158dd11d8d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos Putnam 2021-01-19 17:52:40 -08:00
  • f05df1c7de Huge optimizations+some fixes Putnam 2021-01-19 17:48:20 -08:00
  • 131b11f4ae Automatic changelog generation for PR #13826 [ci skip] CitadelStationBot 2021-01-19 19:22:11 -06:00
  • f7f9185073 Merge pull request #13826 from LetterN/semi-sync Putnam3145 2021-01-19 17:22:05 -08:00
  • cc4c3533b7 Apply suggestions from code review Arturlang 2021-01-20 02:25:22 +02:00
  • a8cb8b79c6 for one, dont forget the sprites, dumbass Hatterhat 2021-01-19 17:40:34 -06:00
  • e006587f4b today i will not test my code Hatterhat 2021-01-19 17:24:33 -06:00
  • 90b85480e1 uuuuuuuuuuuuugh Hatterhat 2021-01-19 17:07:10 -06:00
  • 1445f448e9 uuuuuuuuuuuuuuuuuuugh Hatterhat 2021-01-19 17:04:59 -06:00
  • fccf24ac17 sheef Hatterhat 2021-01-19 16:54:49 -06:00
  • b1fb0b3095 Automatic changelog generation for PR #14089 [ci skip] CitadelStationBot 2021-01-19 12:46:17 -06:00
  • 11ab32d8d6 Merge pull request #14089 from MrJWhit/mining-station-minor-QoL Lin 2021-01-19 12:46:13 -06:00
  • 83566cdbe3 Update parrot.dm silicons 2021-01-19 05:23:43 -07:00
  • dedb0cb62e Merge remote-tracking branch 'citadel/master' into tgsync silicons 2021-01-19 04:24:42 -07:00
  • f0a9a7a179 fix silicons 2021-01-19 04:21:21 -07:00
  • e514db4bbb Update species.dm silicons 2021-01-19 03:33:31 -07:00