Commit Graph

  • ec9bf9ed17 Ports sleepy pens and emagged borg cookies buffs, also buffing tirizene. Ghommie 2019-09-20 19:04:28 +02:00
  • 3b1a36fb07 Needed. Fermi 2019-09-20 04:17:01 +01:00
  • 74cc70ed72 Like this? Fermi 2019-09-20 03:16:26 +01:00
  • 277f031143 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit147 Ghommie 2019-09-20 02:27:39 +02:00
  • 3f2933adbf Ghommies' requests. Fermi 2019-09-19 23:31:36 +01:00
  • 79011190c1 Merge branch 'master' into tg-Organ-port Thalpy 2019-09-19 21:26:42 +01:00
  • b8190552f1 Update defines, and vars, and created new procs Fermi 2019-09-19 21:24:50 +01:00
  • d2c49d7987 On_mob_dead! Fermi 2019-09-19 20:30:35 +01:00
  • 70098f8bc8 Merge branch 'master' into Reagents_bitflats Fermi 2019-09-19 20:04:10 +01:00
  • 641196b9dd Merge branch 'master' into FERMICHEMCurTweaks Thalpy 2019-09-19 19:57:57 +01:00
  • 18afb348fe Merge pull request #9294 from Poojawa/patch-1 kevinz000 2019-09-19 10:25:32 -07:00
  • 20c8345373 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods Poojawa 2019-09-19 12:24:32 -05:00
  • 65bcf40c9a Automatic changelog generation for PR #9099 [ci skip] CitadelStationBot 2019-09-19 12:22:02 -05:00
  • 0694dce05e Merge pull request #9099 from Thalpy/NeuroFix kevinz000 2019-09-19 10:21:59 -07:00
  • 7ef5ab0332 TO TEST - also needs #9099 merging. Fermi 2019-09-19 17:52:45 +01:00
  • b9a2a5ce38 Oops Fermi 2019-09-19 15:41:26 +01:00
  • a398f64b66 Okay Fermi 2019-09-19 15:33:40 +01:00
  • 08f6df8b77 digitigrades whatever. Ghommie 2019-09-19 15:56:38 +02:00
  • 40bac8c807 t Fermi 2019-09-19 14:44:12 +01:00
  • d8e6f4247e Traaavis Fermi 2019-09-19 13:40:44 +01:00
  • cce3889abb 1/4 the blood taken rate Trilbyspaceclone 2019-09-19 08:39:17 -04:00
  • 573932437e COMMA Linzolle 2019-09-18 23:55:52 -05:00
  • cd2e894ebe display results and wording Linzolle 2019-09-18 23:51:35 -05:00
  • 4bf9c8cc84 citadel fixes Linzolle 2019-09-18 23:15:05 -05:00
  • 023428f6a4 port experimental dissection XDTM 2018-09-14 04:28:42 +02:00
  • 8ad11d7250 ports ligament surgeries XDTM 2018-12-09 14:50:12 +01:00
  • df4da58ce8 Merge branch 'NeuroFix' of https://github.com/Thalpy/Citadel-Station-13 into NeuroFix Fermi 2019-09-19 01:46:32 +01:00
  • 08eeda97f5 Heck Fermi 2019-09-19 01:45:21 +01:00
  • 18ce46d7ec Merge branch 'master' into NeuroFix Thalpy 2019-09-19 01:44:09 +01:00
  • e38b44d2bc missed one in security GrayRachnid 2019-09-18 20:35:48 -04:00
  • 8a9ecc3deb WINdoors GrayRachnid 2019-09-18 20:34:16 -04:00
  • 587568bf88 Merge branch 'master' into tg-Organ-port Fermi 2019-09-19 01:33:15 +01:00
  • aabc2423a8 Oops. Fermi 2019-09-19 01:19:45 +01:00
  • 107dd67cbe Well it compiles; just synthtissue and TongueLoss now. Fermi 2019-09-19 01:14:12 +01:00
  • fa4f05b919 Update ert.dm Sishen 2019-09-18 20:13:12 -04:00
  • dfa40a4b22 tg Code complete, now to bugtest and clear compile errors. Fermi 2019-09-18 23:57:21 +01:00
  • 9003404ea8 Further tweak BurgerLua 2019-09-18 15:16:02 -07:00
  • fe3117a006 Added Jetpack Tweaks BurgerLua 2019-09-18 14:49:00 -07:00
  • 34d109f6a2 on further thought, all of them kappa-sama 2019-09-18 17:12:06 -04:00
  • 9bdbf444e4 abductor batteries to tech tree kappa-sama 2019-09-18 17:09:24 -04:00
  • af4449de02 update master kappa-sama 2019-09-18 17:06:06 -04:00
  • 5ecf68918b tada TrilbySpaceClone 2019-09-18 03:47:52 -04:00
  • 2c70bd097c Automatic changelog generation for PR #9295 [ci skip] CitadelStationBot 2019-09-18 00:03:31 -05:00
  • a6f4548349 Merge pull request #9295 from Ghommie/Ghommie-cit196 kevinz000 2019-09-17 22:03:29 -07:00
  • aa610617f8 Automatic changelog generation for PR #9302 [ci skip] CitadelStationBot 2019-09-18 00:01:02 -05:00
  • 2cf1e6ff85 Merge pull request #9302 from deathride58/jobcodesanitychecks kevinz000 2019-09-17 22:00:59 -07:00
  • 893f82f6bf Merge pull request #9303 from Ghommie/Ghommie-cit198 kevinz000 2019-09-17 21:59:29 -07:00
  • 8bf4d5754e I'm a moron. Ghommie 2019-09-18 04:23:52 +02:00
  • 18e97451a3 Merge branch 'master' into jobcodesanitychecks deathride58 2019-09-17 22:15:09 -04:00
  • 2c0ab567fa Merge pull request #9301 from Ghommie/Ghommie-cit198 BlackMajor 2019-09-18 14:14:22 +12:00
  • abb8450e29 ninja shoes. Ghommie 2019-09-18 04:07:51 +02:00
  • cc6e436e96 further fixes deathride58 2019-09-17 21:48:48 -04:00
  • d0296a5e81 fixes roundstart runtimes by job_preferences index checks be explicit key checks instead, plus some extra sanity checks deathride58 2019-09-17 20:15:06 -04:00
  • 150da1d34a code quality Ghommie 2019-09-18 01:37:17 +02:00
  • 63fbf225a6 aaaaa Ghommie 2019-09-18 01:24:44 +02:00
  • 040b6472b4 FUCK Ghommie 2019-09-18 01:21:18 +02:00
  • 3ba5a2fd69 Fixes undershirts n socks colors. Ghommie 2019-09-17 18:34:16 +02:00
  • 896d20bfc2 Delete civilian.dm B1gb3ast 2019-09-17 18:31:19 +02:00
  • 73540f1298 Add files via upload B1gb3ast 2019-09-17 18:28:56 +02:00
  • 5e52c62f29 actual balance. Ghommie 2019-09-17 03:41:53 +02:00
  • c23d6f0113 I missed an earlier port. Fermi 2019-09-17 01:08:37 +01:00
  • 661c357aeb Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into gen-poppers Poojawa 2019-09-16 18:06:36 -05:00
  • 6d1a4fce16 adds GenPop access to security Poojawa 2019-09-16 18:05:55 -05:00
  • 92218d0213 doing the little things Poojawa 2019-09-16 17:59:04 -05:00
  • fa7bf43ce7 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods Poojawa 2019-09-16 17:44:10 -05:00
  • 9d32611e64 Automatic changelog generation for PR #9277 [ci skip] CitadelStationBot 2019-09-16 17:25:34 -05:00
  • adb3d6704b Merge pull request #9277 from Poojawa/are-those-horns-are-are-you-just-retarded BlackMajor 2019-09-17 10:25:31 +12:00
  • 6814aae0f8 Tweaks! Fermi 2019-09-16 21:28:23 +01:00
  • 876d65a695 Update DeltaStation2.dmm EmeraldSundisk 2019-09-16 12:34:22 -07:00
  • 0d9b284784 unneeded variable, no gameplay changes. Ghommie 2019-09-16 18:12:05 +02:00
  • ca95d39a46 Slowing down police baton and tele baton speed. Ghommie 2019-09-16 17:47:22 +02:00
  • 6668630649 Merge branch 'master' into are-those-horns-are-are-you-just-retarded Poojawa 2019-09-15 23:25:22 -05:00
  • a739342a5a Updates Travis to 512.1484 Poojawa 2019-09-15 23:21:27 -05:00
  • 5a58ac6875 Merge pull request #9027 from Poojawa/job-menu-improvements BlackMajor 2019-09-16 16:19:42 +12:00
  • 41c8c7dde6 Why tho Fermi 2019-09-16 01:12:49 +01:00
  • f3a5e2e321 leftover legcuffs/handcuffs overlays fix. Ghommie 2019-09-15 20:30:10 +02:00
  • 300c572886 Added work boots and bananium clown shoes inhands, more fixes. ready. Ghommie 2019-09-15 18:21:48 +02:00
  • 89360c3574 Fixes clown shoes and work boots. Ghommie 2019-09-15 17:56:20 +02:00
  • c813555697 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45 Ghommie 2019-09-15 04:05:14 +02:00
  • b76da7c719 Merge pull request #4 from Citadel-Station-13/master EmeraldSundisk 2019-09-14 18:22:15 -07:00
  • f6b96a818e Update Fermi 2019-09-15 00:55:40 +01:00
  • 10a632ae26 Automatic changelog generation for PR #9288 [ci skip] CitadelStationBot 2019-09-14 17:55:46 -05:00
  • f3592a54a7 Merge pull request #9288 from Trilbyspaceclone/patch-227 kevinz000 2019-09-14 15:55:43 -07:00
  • e1ad3ececa Automatic changelog generation for PR #9289 [ci skip] CitadelStationBot 2019-09-14 17:55:27 -05:00
  • c8ba927449 Merge pull request #9289 from Sishen1542/moscl kevinz000 2019-09-14 15:55:24 -07:00
  • 5159a58fef Update strained_muscles.dm Sishen 2019-09-14 12:00:28 -04:00
  • bad8a816ab Update themed.dm Trilbyspaceclone 2019-09-14 06:51:19 -04:00
  • bf3d30c0e4 Seperates Insect fluff from wings Poojawa 2019-09-14 04:27:38 -05:00
  • fbf92d6486 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into gen-poppers Poojawa 2019-09-13 23:28:53 -05:00
  • 0417c0d6af Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements Poojawa 2019-09-13 23:28:08 -05:00
  • ec4b1fba72 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods Poojawa 2019-09-13 23:27:50 -05:00
  • 0faafe8deb Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into are-those-horns-are-are-you-just-retarded Poojawa 2019-09-13 23:26:27 -05:00
  • cc462d7fa0 Automatic changelog generation for PR #9109 [ci skip] CitadelStationBot 2019-09-13 23:20:48 -05:00
  • ea43b941eb Merge pull request #9109 from Trilbyspaceclone/fruit kevinz000 2019-09-13 21:20:46 -07:00
  • 344ccaf20d cleans up some other species related stuff, unmodularizes some code Poojawa 2019-09-13 22:18:53 -05:00
  • ea65833c05 Merge e from Citadel-Station-13/master kappa-sama 2019-09-13 22:44:21 -04:00
  • e281384b7a It's actually less laggy than I thought. Fermi 2019-09-14 03:10:54 +01:00
  • c823a2d23a Preview. Fermi 2019-09-14 03:09:32 +01:00
  • 80b79ef94e Mostly complete for now Fermi 2019-09-14 02:26:06 +01:00
  • e62a491c18 Now does chem reactions too. Fermi 2019-09-14 00:08:23 +01:00