Commit Graph

  • 2d3e24fee4 Update engineering.dm SiliconMain 2021-01-12 14:43:54 -06:00
  • bc64cedc2d Update misc_nodes.dm SiliconMain 2021-01-12 14:42:35 -06:00
  • 059d35921a quit making me drop my catgirl Blue Wildrose 2021-01-12 13:41:23 -07:00
  • a26590965e Update misc_designs.dm SiliconMain 2021-01-12 14:41:10 -06:00
  • c9e735b6b4 edge cases DeltaFire 2021-01-12 21:18:33 +01:00
  • d00aa37203 Merge pull request #15 from Citadel-Station-13/master BlueWildrose 2021-01-12 09:29:29 -07:00
  • f3e328af03 hot sauce kappa-sama 2021-01-12 10:04:56 -05:00
  • 656d95ce2f i rewrote this at 2 in the morning kappa-sama 2021-01-12 09:57:36 -05:00
  • f98edf0eaa shush kappa-sama 2021-01-12 09:55:18 -05:00
  • a58141898c i was tired kappa-sama 2021-01-12 09:45:13 -05:00
  • 32aa851062 somethings up with the HoS pet carp on Kilo, fixing that Blue Wildrose 2021-01-12 06:54:06 -07:00
  • 8111757e5b oops messed something up with kilo Blue Wildrose 2021-01-12 06:49:31 -07:00
  • 2ab6a5cf96 Adds Colormates to every map except Snaxi Blue Wildrose 2021-01-12 06:26:13 -07:00
  • f40955f6dc Automatic changelog generation for PR #14026 [ci skip] CitadelStationBot 2021-01-12 02:20:52 -06:00
  • 09772543b9 Merge pull request #14026 from BlueWildrose/SkidoodleSkidaddle silicons 2021-01-12 01:20:49 -07:00
  • 3d9e907532 fixed kappa-sama 2021-01-12 02:19:13 -05:00
  • c751f114aa finally kappa-sama 2021-01-12 01:42:55 -05:00
  • 699d8e1e88 Fixes fermichem EMPs being massive. Putnam 2021-01-11 21:06:47 -08:00
  • 19078449fe Merge branch 'master' into SkidoodleSkidaddle BlueWildrose 2021-01-11 20:26:21 -07:00
  • 63aaac873f Merge pull request #13973 from Citadel-Station-13/shitcode DeltaFire 2021-01-12 01:30:24 +01:00
  • 9d4b30d4e9 Merge pull request #14023 from Citadel-Station-13/silicons-patch-8 Lin 2021-01-12 00:01:44 +00:00
  • df825b4441 deltafire's suggested fixes Artur 2021-01-12 00:23:39 +02:00
  • 02efd6237f Replaces majority judgment with usual judgement Putnam 2021-01-11 12:39:18 -08:00
  • f8870c7c5d Fixed another error in the examine text. HeroWithYay 2021-01-12 08:16:10 +13:00
  • f4c5fa9b7c Fixed an error in the examine text. HeroWithYay 2021-01-12 08:15:20 +13:00
  • 2c8b83bcaa Wormhole Projector and Gravity Gun now use anomaly cores instead of firing pins. HeroWithYay 2021-01-12 08:03:15 +13:00
  • 4eab9e6520 why not DeltaFire 2021-01-11 18:06:43 +01:00
  • 893199679d Update arcade.dm MrJWhit 2021-01-11 08:46:12 -05:00
  • b4fbeddda9 Probably makes more sense Blue Wildrose 2021-01-11 00:12:13 -07:00
  • 4ec834c3dd your dick is no longer a big fat noodle Blue Wildrose 2021-01-11 00:00:48 -07:00
  • 8590d364e0 spellcheck DeltaFire 2021-01-11 02:18:58 +01:00
  • 2b1d79dae0 synth medstuff DeltaFire 2021-01-11 02:11:30 +01:00
  • 95101ac36a Merge pull request #14013 from Citadel-Station-13/compressor Lin 2021-01-11 00:21:11 +00:00
  • 08d2b0bc17 Update code/modules/ruins/objects_and_mobs/sin_ruins.dm Timothy Teakettle 2021-01-10 23:41:52 +00:00
  • 36bd92ae06 Merge pull request #14 from Citadel-Station-13/master BlueWildrose 2021-01-10 16:30:32 -07:00
  • f4c4e0721b Merge pull request #14012 from Citadel-Station-13/silicons-patch-6 Lin 2021-01-10 19:36:47 +00:00
  • cd62c45902 Update nuclearbomb.dm silicons 2021-01-10 03:52:16 -07:00
  • e998fd4e34 Automatic changelog generation for PR #13993 [ci skip] CitadelStationBot 2021-01-10 02:36:46 -06:00
  • 72bc00bc22 Merge pull request #13993 from Arturlang/cursed_heart_tweaks silicons 2021-01-10 01:36:43 -07:00
  • 07399d2c93 Merge pull request #13949 from Citadel-Station-13/silicons-patch-60 Putnam3145 2021-01-09 22:16:14 -08:00
  • 3f6939c1cb fix DeltaFire 2021-01-10 06:20:27 +01:00
  • 1265995f60 Automatic changelog generation for PR #14014 [ci skip] CitadelStationBot 2021-01-09 20:49:13 -06:00
  • 121104ca6c Merge pull request #14014 from necromanceranne/bokken_fixes_2 silicons 2021-01-09 19:49:10 -07:00
  • 6e408d470a found more extra pixels on existing moth wings, removed them. shellspeed1 2021-01-09 18:25:30 -08:00
  • 99b26c08be Update sin_ruins.dm timothyteakettle 2021-01-10 01:56:18 +00:00
  • eac7959f01 Merge pull request #14017 from Citadel-Station-13/silicons-patch-7 DeltaFire 2021-01-10 02:22:40 +01:00
  • 58426beadc readds missing none wings for insects shellspeed1 2021-01-09 16:15:50 -08:00
  • fd77be9b89 Update _status_effects.dm silicons 2021-01-09 16:44:56 -07:00
  • 679f097e27 resets names shellspeed1 2021-01-09 15:39:50 -08:00
  • 2525334bb0 smooth movement twaeks silicons 2021-01-09 15:30:56 -08:00
  • 9733305997 Merge remote-tracking branch 'citadel/master' into tgsync silicons 2021-01-09 14:56:32 -08:00
  • e680d58a03 fixes silicons 2021-01-09 14:56:29 -08:00
  • b50c23a82a Automatic changelog generation for PR #13965 [ci skip] CitadelStationBot 2021-01-09 16:39:08 -06:00
  • 656691912e Merge pull request #13965 from Xantholne/GoodNightDisky silicons 2021-01-09 15:39:06 -07:00
  • 185a57cd5d Automatic changelog generation for PR #13995 [ci skip] CitadelStationBot 2021-01-09 16:38:10 -06:00
  • fffafff5d3 Merge pull request #13995 from DeltaFire15/xeno-clickdelay silicons 2021-01-09 15:38:07 -07:00
  • 4d64026a88 Automatic changelog generation for PR #14006 [ci skip] CitadelStationBot 2021-01-09 16:37:48 -06:00
  • 22a32d25b4 Merge pull request #14006 from DeltaFire15/borg-shell-dupe silicons 2021-01-09 15:37:45 -07:00
  • b453799918 Automatic changelog generation for PR #14007 [ci skip] CitadelStationBot 2021-01-09 16:37:38 -06:00
  • 3db556b9b7 Merge pull request #14007 from DeltaFire15/heretic-spec-role-fix silicons 2021-01-09 15:37:35 -07:00
  • 1d2928ad52 Automatic changelog generation for PR #14008 [ci skip] CitadelStationBot 2021-01-09 16:37:21 -06:00
  • 2bf5a0e91e Merge pull request #14008 from TheSpaghetti/patch-5 silicons 2021-01-09 15:37:19 -07:00
  • b0f0d52bd9 Automatic changelog generation for PR #14010 [ci skip] CitadelStationBot 2021-01-09 16:36:31 -06:00
  • 778be450f1 Merge pull request #14010 from shellspeed1/fixes-missing-organs-in-tech-fab silicons 2021-01-09 15:36:28 -07:00
  • c36151b4cf Update machine_designs_sci.dm silicons 2021-01-09 15:35:26 -07:00
  • 562dbd5802 Automatic changelog generation for PR #14016 [ci skip] CitadelStationBot 2021-01-09 16:34:08 -06:00
  • 8664c2c624 Merge pull request #14016 from timothyteakettle/preference-coders-are-bad silicons 2021-01-09 15:34:06 -07:00
  • bc29b80c94 :lazy: DeltaFire 2021-01-09 22:46:40 +01:00
  • d459f6db91 Update looc.dm Timothy Teakettle 2021-01-09 21:30:18 +00:00
  • 648c9f951b bonk DeltaFire 2021-01-09 22:30:09 +01:00
  • 125ea9dad2 vitality sigil drain DeltaFire 2021-01-09 20:44:51 +01:00
  • 05f7991981 snap DeltaFire 2021-01-09 20:37:24 +01:00
  • d7d342cc75 Back sprites as well necromanceranne 2021-01-10 05:48:27 +11:00
  • 6d10ca9efa Fixes missing sprites on the steelwood bokkens, fixes further problems with crafting bokken parts necromanceranne 2021-01-10 05:43:33 +11:00
  • 5e08df700f Merge pull request #13939 from silicons/reagentlogs Lin 2021-01-09 16:24:40 +00:00
  • eb300481c4 Merge pull request #14002 from Citadel-Station-13/silicons-patch-5 Lin 2021-01-09 16:12:33 +00:00
  • b0a94a6e1c Update engineering_nodes.dm silicons 2021-01-09 07:30:14 -07:00
  • 34c5d99afb Update machine_designs_sci.dm silicons 2021-01-09 07:29:31 -07:00
  • a54af117f0 linux gets help too Putnam 2021-01-09 05:46:54 -08:00
  • 8cc0b9c69e Various fixes and performance tweaks Putnam 2021-01-09 05:44:18 -08:00
  • 9fec00621e Update colormate.dm silicons 2021-01-09 06:43:55 -07:00
  • 04d60c85d9 a shellspeed1 2021-01-09 03:06:48 -08:00
  • 773a04e5ea Ports wings shellspeed1 2021-01-09 01:56:56 -08:00
  • daafa721ce Fixes the conflict necromanceranne 2021-01-09 19:06:16 +11:00
  • 9c0989d233 Merge remote-tracking branch 'upstream/master' into robocoat necromanceranne 2021-01-09 19:02:38 +11:00
  • b52e8bf447 double punctuation bad TheSpaghetti 2021-01-09 00:18:15 -05:00
  • bffc43e95e fixes silicons 2021-01-08 18:59:26 -08:00
  • 849e9405fd projectile fix silicons 2021-01-08 18:53:49 -08:00
  • bd9c979b07 riding datums silicons 2021-01-08 18:48:59 -08:00
  • 23dfce7d5b Automatic changelog generation for PR #14005 [ci skip] CitadelStationBot 2021-01-08 19:09:39 -06:00
  • 536ae34ea7 Merge pull request #14005 from DeltaFire15/AAAAAAAAAAAAA silicons 2021-01-08 18:09:36 -07:00
  • 9cfd3c073e smol fix DeltaFire 2021-01-09 00:33:20 +01:00
  • 23c5f1744d actually DeltaFire 2021-01-09 00:12:10 +01:00
  • 4f3df626c6 no cell no problem DeltaFire 2021-01-09 00:09:17 +01:00
  • 56a2892fd3 sigh DeltaFire 2021-01-08 23:48:32 +01:00
  • 060346cd88 Merge remote-tracking branch 'upstream/master' DeltaFire 2021-01-08 23:30:29 +01:00
  • 01321cb2ac let's just use the tg version silicons 2021-01-08 12:06:15 -08:00
  • b40dfc1c66 conflicties zerothebigboy 2021-01-08 14:36:44 -05:00
  • 880b988813 Merge branch 'paramed' of https://github.com/zeroisthebiggay/Citadel-Station-13 into paramed zerothebigboy 2021-01-08 14:33:14 -05:00
  • 82b00cd656 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into paramed zerothebigboy 2021-01-08 14:32:46 -05:00