shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit Graph

  • 90268dea1d Update recipes.dm Trilbyspaceclone 2019-05-12 21:17:28 -04:00
  • 34cb661211 Requested changes BurgerLua 2019-05-12 13:44:23 -07:00
  • 49a2f3cc63 I don't even fucking know anymore Poojawa 2019-05-12 06:31:02 -05:00
  • ad5418f0a1 as it turns out, Creatures don't have minds Poojawa 2019-05-12 04:43:52 -05:00
  • 1a047c0068 I think I got it. Poojawa 2019-05-12 04:06:35 -05:00
  • 3e4412e171 Delete autolathe_designs.dm Trilbyspaceclone 2019-05-12 02:04:07 -04:00
  • 62e5037eab Merge branch 'master' into patch-118 Trilbyspaceclone 2019-05-12 02:03:32 -04:00
  • db74544a7c Create autolathe_designs.dm Trilbyspaceclone 2019-05-12 02:02:49 -04:00
  • 8200e09fa2 Merge pull request #8340 from Poojawa/patch-1 kevinz000 2019-05-11 22:22:01 -07:00
  • d8ad29ac26 Automatic changelog generation for PR #8316 [ci skip] CitadelStationBot 2019-05-12 00:21:18 -05:00
  • 9f3aa6de13 Merge pull request #8316 from Trilbyspaceclone/Lock_and_key kevinz000 2019-05-11 22:21:16 -07:00
  • 3ba9df9604 Automatic changelog generation for PR #8342 [ci skip] CitadelStationBot 2019-05-12 00:19:47 -05:00
  • 4f12a762f3 Merge pull request #8342 from BurgerLUA/Cult-Improvements-and-Fixes kevinz000 2019-05-11 22:19:46 -07:00
  • a06c83c8af Automatic changelog generation for PR #8322 [ci skip] CitadelStationBot 2019-05-12 00:18:32 -05:00
  • 90c3e4b776 Merge pull request #8322 from Trilbyspaceclone/patch-117 kevinz000 2019-05-11 22:18:29 -07:00
  • db99b595f3 Merge pull request #8331 from Useroth/dick-circuits kevinz000 2019-05-11 22:17:46 -07:00
  • 36ee078e23 Merge pull request #8333 from Useroth/ayy-baton kevinz000 2019-05-11 22:17:27 -07:00
  • aae23945a6 Automatic changelog generation for PR #8334 [ci skip] CitadelStationBot 2019-05-12 00:17:10 -05:00
  • cd87e81a6a Merge pull request #8334 from dtfe3/music-maxlines-increase kevinz000 2019-05-11 22:17:08 -07:00
  • 86e3992945 Merge pull request #8335 from Poojawa/quick-fiiiix-marking kevinz000 2019-05-11 22:16:37 -07:00
  • 9b135ed56b Merge pull request #8338 from Sishen1542/satchel-holding kevinz000 2019-05-11 22:14:15 -07:00
  • a818e92f82 Automatic changelog generation for PR #8341 [ci skip] CitadelStationBot 2019-05-12 00:13:20 -05:00
  • 4276f53338 Merge pull request #8341 from Trilbyspaceclone/golden kevinz000 2019-05-11 22:13:18 -07:00
  • cadda98570 Added cowboy hat Fermi 2019-05-12 04:15:10 +01:00
  • ec2f33ceb5 Added Hatmium and a few slight fixes. Fermi 2019-05-12 03:42:23 +01:00
  • 2833dab538 le sigh Trilbyspaceclone 2019-05-11 14:49:51 -04:00
  • 460459a1dd Update craft.dm Trilbyspaceclone 2019-05-11 14:08:43 -04:00
  • 1f1926a70e Create machine_designs_all_misc.dm Trilbyspaceclone 2019-05-11 12:26:56 -04:00
  • dc9f8ecf97 Update tgstation.dme Trilbyspaceclone 2019-05-11 12:24:44 -04:00
  • f47c0786f3 Add files via upload Trilbyspaceclone 2019-05-11 11:42:31 -04:00
  • 172d56ace5 Add files via upload Trilbyspaceclone 2019-05-11 11:41:56 -04:00
  • 3a12bab370 Delete machine_designs.dm Trilbyspaceclone 2019-05-11 11:41:20 -04:00
  • 034a9a0865 Delete comp_board_designs.dm Trilbyspaceclone 2019-05-11 11:41:10 -04:00
  • a720720743 Update tgstation.dme Trilbyspaceclone 2019-05-11 11:40:30 -04:00
  • ddad7a173d All compiling errors fixed!! I did it!! Fermi 2019-05-11 15:47:58 +01:00
  • f7655cad25 All compiling errors fixed, except for a few weird ones that I need help Fermi 2019-05-11 15:40:06 +01:00
  • 3c5bf7f0e2 Merge pull request #9 from Thalpy/FermiChem Thalpy 2019-05-11 14:15:13 +01:00
  • 926bd65392 Merge branch 'master' into FermiChem Thalpy 2019-05-11 14:14:20 +01:00
  • 6a17d66323 Should be most compiling errors fixed outside of outdated merge problems Fermi 2019-05-11 14:04:43 +01:00
  • 8463163faa NEWLINE BurgerLua 2019-05-10 19:22:09 -07:00
  • f66326ab51 Fixes an potential AI exploit. BurgerLua 2019-05-10 19:19:42 -07:00
  • 4aba11739b Finishing touches. BurgerLua 2019-05-10 19:15:42 -07:00
  • d97bf47b95 Added BurgerLua 2019-05-10 18:12:36 -07:00
  • 6466ef562c 100 down, 66 to go. Fermi 2019-05-11 02:05:25 +01:00
  • 29d4a2fdde Finished MCchem, now to fix compling errors. Fermi 2019-05-11 00:14:04 +01:00
  • 427c981386 Update tgstation.dme Trilbyspaceclone 2019-05-10 16:49:43 -04:00
  • af7b7fc638 Update autolathe_designs_medical_and_dinnerware.dm Trilbyspaceclone 2019-05-10 16:48:52 -04:00
  • 38696f4997 Delete autolathe_designs.dm Trilbyspaceclone 2019-05-10 16:47:59 -04:00
  • 50ac2025ab Update tgstation.dme Trilbyspaceclone 2019-05-10 16:47:11 -04:00
  • 2885330459 commit die Trilbyspaceclone 2019-05-10 16:30:39 -04:00
  • a703b8b85f Yep this works 100% no errors at all! Trilbyspaceclone 2019-05-10 16:30:01 -04:00
  • 86e5d96679 Update uplink_items.dm Trilbyspaceclone 2019-05-10 14:55:46 -04:00
  • 4c0caa3aae Update toolbox.dm Trilbyspaceclone 2019-05-10 14:51:49 -04:00
  • 651a452ed0 Update recipes.dm Trilbyspaceclone 2019-05-10 14:50:44 -04:00
  • ba0474feb0 Updates travis to 512.1467 Poojawa 2019-05-10 08:56:05 -05:00
  • dd8e48b383 fixes syndicate helmet, adjusts human sprites Poojawa 2019-05-10 07:44:53 -05:00
  • fcdc748bf1 u h g. I hate this Poojawa 2019-05-10 07:07:09 -05:00
  • 7a8adff8e0 testing a value of 7 Scorpion-117 2019-05-10 01:58:53 -06:00
  • 9fd61b660d modifying to make it take far more power to produce Scorpion-117 2019-05-10 01:55:25 -06:00
  • 8b935b9abf Reverts cooking change, adds safety checks. BurgerLua 2019-05-09 21:10:44 -07:00
  • cb0e50be0a Missed / in last pr Fermi 2019-05-10 03:12:28 +01:00
  • ac8b7be45c Merges old penis enlargement pills into prexisiting Fermichem ones. (master (#8319) by BurgerLUA) Fermi 2019-05-10 03:10:42 +01:00
  • de92265eea Merge pull request #8 from Thalpy/pr/7 Thalpy 2019-05-10 02:20:33 +01:00
  • 5287f3f9c7 Merge branch 'master' into pr/7 Thalpy 2019-05-10 02:20:19 +01:00
  • 7d567fee63 MC chem 5.5/6 Fermi 2019-05-10 02:00:17 +01:00
  • 1b28f0e968 cloak revert Sishen 2019-05-09 20:49:38 -04:00
  • c3df1b354e Satchel of holding Sishen 2019-05-09 20:44:07 -04:00
  • 6df27ef2a3 Updated integrated circuits BurgerLua 2019-05-09 15:25:48 -07:00
  • 28eb23d474 Fixes prosthetics and missing markings Poojawa 2019-05-09 16:15:03 -05:00
  • c9da8e375a Cloak Fix Sishen 2019-05-09 16:35:34 -04:00
  • 9be9ce6d4f Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into quick-fiiiix-marking Poojawa 2019-05-09 14:46:33 -05:00
  • 11c54f5fba Update human_movement.dm Poojawa 2019-05-09 14:43:12 -05:00
  • 88831da8f4 it's the one part that I keep saying I just need to get around to Poojawa 2019-05-09 14:43:05 -05:00
  • 8af9c6fad9 duplicate definitions? really? wtf Poojawa 2019-05-09 10:32:14 -05:00
  • 3f6cd92d54 Ok this time all of them are nitpicked Poojawa 2019-05-09 10:15:51 -05:00
  • 0f02562b51 Fixes Xenomorph blood related travis errors Poojawa 2019-05-09 09:59:34 -05:00
  • 7b6a65ce3b okay we're starting to pass our blood type to bloodmeme now Poojawa 2019-05-09 08:17:18 -05:00
  • 0e0dff14b9 Increased music maxlines from 300 to 600 dtfe3 2019-05-09 14:10:43 +02:00
  • a0d948497b Totally forgotten the abductor adrenals. Useroth 2019-05-09 13:28:04 +02:00
  • 83661fff9d Update abduction_gear.dm Useroth 2019-05-09 13:17:12 +02:00
  • 07685a1074 Abductor baton buff. Because it currently sucks balls. Useroth 2019-05-09 12:20:02 +02:00
  • 4355584833 Added them to loadout too. Useroth 2019-05-09 12:09:18 +02:00
  • abe8ed16cb A small touch-up. Useroth 2019-05-09 11:38:33 +02:00
  • 1efd7123f2 Two new collar types. All collars are now colorable a'la polychromic stuff. Useroth 2019-05-09 11:22:51 +02:00
  • 5ad532f723 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods Poojawa 2019-05-09 03:08:54 -05:00
  • b80bb21219 Dildo-shaped circuit assemblies. Because that's what the community needs. Useroth 2019-05-09 08:45:47 +02:00
  • 854c0097d4 MC 5/6th done, probably. Fermi 2019-05-08 23:13:51 +01:00
  • 6e3722fede increased costs of power Scorpion-117 2019-05-08 07:49:07 -06:00
  • e8299db245 Readding stargazer Scorpion-117 2019-05-08 07:44:39 -06:00
  • 0c6d84d50e Reading stargazers Scorpion-117 2019-05-08 07:29:50 -06:00
  • 8f04c3c20a reading stargazer Scorpion-117 2019-05-08 07:25:26 -06:00
  • d0970e327c Update stargazer.dm Scorpion-117 2019-05-08 07:21:17 -06:00
  • c0717561ff puts back stargazer DM Scorpion-117 2019-05-08 07:20:29 -06:00
  • 5a67114d33 get blood id is my foe now. Poojawa 2019-05-08 04:53:51 -05:00
  • 49a012ea87 Automatic changelog generation for PR #8323 [ci skip] CitadelStationBot 2019-05-08 03:34:36 -05:00
  • a7192734dd Merge pull request #8323 from Trilbyspaceclone/inducer kevinz000 2019-05-08 01:34:33 -07:00
  • 1e40a65536 buff this a bit kevinz000 2019-05-08 01:31:00 -07:00
  • 55d54592d5 Update toxin_reagents.dm kevinz000 2019-05-08 01:30:24 -07:00
  • 5bcc1680fe Hazard Vest sprite fix Sishen 2019-05-07 22:56:43 -04:00
  • 1385e12fe3 MC 4/6th done Fermi 2019-05-07 23:38:50 +01:00