Commit Graph

  • 5be54a8897 Automatic changelog generation for PR #8121 [ci skip] CitadelStationBot 2019-03-16 17:53:10 -05:00
  • 459af1f124 Merge pull request #8121 from deathride58/fixesconversions kevinz000 2019-03-16 15:53:08 -07:00
  • ff26b92564 Merge pull request #8112 from Ragolution/First-Aid-Icon-Update kevinz000 2019-03-16 15:52:49 -07:00
  • 5e6e651869 eh fuck it revs can stay kevinz000 2019-03-16 15:50:42 -07:00
  • 8b3d4c3da1 Update clock_cult.dm kevinz000 2019-03-16 15:48:28 -07:00
  • 83dbfc2987 Update cult.dm kevinz000 2019-03-16 15:48:06 -07:00
  • 696625f7b8 Update clock_cult.dm kevinz000 2019-03-16 15:47:19 -07:00
  • 4fea9d3a65 Update revolution.dm kevinz000 2019-03-16 15:46:42 -07:00
  • 44d4c177e2 Merge branch 'master' into Pizza Trilbyspaceclone 2019-03-16 17:53:52 -04:00
  • 45a0fc856e Update snacks_pizza.dm Trilbyspaceclone 2019-03-16 17:46:38 -04:00
  • f88de367ed Update recipes_pizza.dm Trilbyspaceclone 2019-03-16 13:26:45 -04:00
  • 9408fd8daf Update recipes_pizza.dm Trilbyspaceclone 2019-03-16 12:58:49 -04:00
  • dcea7886d8 Makes sprinting stamloss make sense by making sprinting take no stamloss in no gravity or when being pulled deathride58 2019-03-15 20:25:44 -04:00
  • 9d711370d4 Fixes staminaloss not redirecting to the chest when attempting to apply to the head deathride58 2019-03-15 20:09:34 -04:00
  • 78472039cf i hit ctrl s god fucking damnit deathride58 2019-03-15 19:47:02 -04:00
  • 4bc0833982 Makes conversions mute victims that are deciding their fate, fixes conversions requiring three cultists to sacrifice a refusing victim deathride58 2019-03-15 19:43:24 -04:00
  • 95c975078c fixes travis deathride58 2019-03-15 19:22:28 -04:00
  • 36119e007d Properly fixes igniters by increasing the max hotspot expose temperature of sparks to 700 deathride58 2019-03-15 16:49:10 -04:00
  • e4c5f005a0 makes DNR apply properly to ghost roles and midround antags deathride58 2019-03-15 16:26:17 -04:00
  • ccca2ac8a8 Automatic changelog generation for PR #8114 [ci skip] CitadelStationBot 2019-03-14 17:10:40 -05:00
  • c21fbedeca Merge pull request #8114 from izzyinbox/timegate-fix nik707 2019-03-14 17:10:38 -05:00
  • 67f25f2721 Additional methods. Ragolution 2019-03-14 18:02:29 -04:00
  • 8bf81919c8 reduce minimal player age for command jobs izzy 2019-03-14 16:46:30 -05:00
  • 12db99dc01 Update revival.dm Ragolution 2019-03-14 13:21:04 -04:00
  • 86ddab31c4 Merge pull request #8107 from AmatsuDF/chillingbugfix kevinz000 2019-03-14 04:13:54 -07:00
  • 890a23df52 Github client is shit. Ragolution 2019-03-14 00:16:11 -04:00
  • 8cc589b069 Actually fixes the thing. Ragolution 2019-03-14 00:03:37 -04:00
  • 1fea681ea4 Revert "Update firstaid.dm" Ragolution 2019-03-13 23:54:44 -04:00
  • 8e2775bbe3 A few changes (mix edit for Neko) Fermi 2019-03-14 03:27:25 +00:00
  • fddbbce94e Update firstaid.dm Ragolution 2019-03-13 22:26:38 -04:00
  • 896e03f568 Merge pull request #8110 from Ragolution/master nik707 2019-03-13 14:11:06 -05:00
  • b0ccfbc1b4 Revert "Merge pull request #8089 from Trilbyspaceclone/patch-70" Ragolution 2019-03-12 14:28:54 -04:00
  • 9f63d13d82 Automatic changelog generation for PR #8104 [ci skip] CitadelStationBot 2019-03-12 02:30:27 -05:00
  • 98cdaf38cb Merge pull request #8104 from Ghommie/Ghommie-cit9 kevinz000 2019-03-12 00:30:24 -07:00
  • 4558110dfb aaaa what did I doooo Fermi 2019-03-11 18:21:09 +00:00
  • 720e8d2d1d Merge pull request #2 from Thalpy/master Thalpy 2019-03-11 17:52:17 +00:00
  • 96448ff79f Merge pull request #1 from Citadel-Station-13/master Thalpy 2019-03-11 17:50:01 +00:00
  • 0e8f356610 Milk. Ghommie 2019-03-11 11:54:40 +01:00
  • aedadb30a5 Fixes a difference between /tg/ and Citadel that made extracts uninjectable. Amatsu Darkfyre 2019-03-10 23:54:45 -04:00
  • ec030144d2 Update tiny_prick.dm Trilbyspaceclone 2019-03-10 17:03:45 -04:00
  • 8625d1cad5 Automatic changelog generation for PR #8090 [ci skip] CitadelStationBot 2019-03-10 15:51:46 -05:00
  • 821a31afb8 Merge pull request #8090 from deathride58/tgpushes kevinz000 2019-03-10 13:51:44 -07:00
  • b17b2a0a4a Merge pull request #8097 from AmatsuDF/master kevinz000 2019-03-10 13:50:37 -07:00
  • 2ca75aabe2 Automatic changelog generation for PR #8056 [ci skip] CitadelStationBot 2019-03-10 15:48:44 -05:00
  • 698adb7c7d Merge pull request #8056 from deathride58/tegnerf kevinz000 2019-03-10 13:48:42 -07:00
  • d681b30df5 Merge pull request #8102 from Trilbyspaceclone/semi-auto kevinz000 2019-03-10 13:44:57 -07:00
  • 986e4e893f Automatic changelog generation for PR #8084 [ci skip] CitadelStationBot 2019-03-10 15:44:35 -05:00
  • ac8636e127 Merge pull request #8084 from Poojawa/patch-4 kevinz000 2019-03-10 13:44:33 -07:00
  • 7b3e6c570a Automatic changelog generation for PR #8070 [ci skip] CitadelStationBot 2019-03-10 15:44:22 -05:00
  • 4451d8e3ad Merge pull request #8070 from deathride58/consensualcults kevinz000 2019-03-10 13:44:20 -07:00
  • 7a606fadc4 Automatic changelog generation for PR #8091 [ci skip] CitadelStationBot 2019-03-10 15:43:23 -05:00
  • 7628289ad6 Merge pull request #8091 from deathride58/fixesz1hyperspace kevinz000 2019-03-10 13:43:21 -07:00
  • 23d5d38017 Automatic changelog generation for PR #8058 [ci skip] CitadelStationBot 2019-03-10 15:43:06 -05:00
  • 0652c32c23 Merge pull request #8058 from deathride58/joggingslipresistance kevinz000 2019-03-10 13:43:05 -07:00
  • 598dee6440 Automatic changelog generation for PR #8098 [ci skip] CitadelStationBot 2019-03-10 15:42:46 -05:00
  • b143f6f883 Merge pull request #8098 from Coolgat3/patch-2 kevinz000 2019-03-10 13:42:44 -07:00
  • 2d286e525d Changes Adamantine Suit's armor values to not be bad. Also recolors the Slime Mask so it's more obvious at a glance what it is. Amatsu Darkfyre 2019-03-10 15:10:07 -04:00
  • aafbbad2af Update tiny_prick.dm Trilbyspaceclone 2019-03-10 13:33:56 -04:00
  • 8a3b7d29d3 Update tiny_prick.dm Trilbyspaceclone 2019-03-10 13:30:45 -04:00
  • 27efffb74c 1 Ghommie 2019-03-10 15:28:05 +01:00
  • 1929c6bbb6 Update weapon_designs.dm Trilbyspaceclone 2019-03-09 20:37:06 -05:00
  • 137fec5d28 Update weapon_designs.dm Trilbyspaceclone 2019-03-09 20:36:44 -05:00
  • 5197c0fb94 Update weapon_designs.dm Trilbyspaceclone 2019-03-09 20:34:39 -05:00
  • 8b99ca8094 Update packs.dm Trilbyspaceclone 2019-03-09 20:31:00 -05:00
  • 5aa5f1ed56 SMG Trilbyspaceclone 2019-03-09 20:29:19 -05:00
  • 538e64b9e9 oops Trilbyspaceclone 2019-03-09 20:13:47 -05:00
  • ce7c76e8a4 ? Trilbyspaceclone 2019-03-09 20:12:44 -05:00
  • 8f9542bc43 Update automatic.dm Trilbyspaceclone 2019-03-09 20:05:07 -05:00
  • beb812e291 Update packs.dm Trilbyspaceclone 2019-03-09 20:03:40 -05:00
  • 979f9125ef Update weapon_designs.dm Trilbyspaceclone 2019-03-09 19:54:48 -05:00
  • ca4ea1d4e4 Update weapon_designs.dm Trilbyspaceclone 2019-03-09 19:45:52 -05:00
  • 54a3bde375 Update weapon_designs.dm Trilbyspaceclone 2019-03-09 19:45:30 -05:00
  • 45a4693618 Update helmet.dm Coolgat3 2019-03-09 16:42:27 +01:00
  • eb786cbfde Update jobs.dm Coolgat3 2019-03-09 16:39:51 +01:00
  • 5e6395270b Merge pull request #7889 from Citadel-Station-13/kevinz000-patch-7 deathride58 2019-03-08 21:05:20 -05:00
  • e80b17e572 Update code/modules/food_and_drinks/food/snacks_meat.dm Ghom 2019-03-08 20:55:41 -05:00
  • d9df0c1f76 Merge pull request #8093 from Trilbyspaceclone/patch-74 deathride58 2019-03-08 20:54:21 -05:00
  • c2acda5a96 Merge pull request #8073 from Citadel-Station-13/kevinz000-patch-27 deathride58 2019-03-08 20:51:15 -05:00
  • 2ae75ccd21 Merge pull request #8078 from Citadel-Station-13/kevinz000-patch-29 deathride58 2019-03-08 20:50:50 -05:00
  • e5f5520393 Merge pull request #8075 from BlackMajor/master deathride58 2019-03-08 20:50:33 -05:00
  • aac192752f Merge pull request #8088 from Trilbyspaceclone/patch-69 deathride58 2019-03-08 20:50:13 -05:00
  • 6ed81162b3 Merge pull request #8089 from Trilbyspaceclone/patch-70 deathride58 2019-03-08 20:49:38 -05:00
  • 6aaee476c8 Merge pull request #8079 from Citadel-Station-13/kevinz000-patch-30 deathride58 2019-03-08 20:49:18 -05:00
  • 3b3fcb5d19 Merge pull request #8094 from Trilbyspaceclone/patch-75 deathride58 2019-03-08 20:48:40 -05:00
  • 5aa9dd7c14 Merge pull request #8092 from Trilbyspaceclone/patch-71 deathride58 2019-03-08 20:46:57 -05:00
  • df1decf1b1 Merge pull request #8087 from Trilbyspaceclone/QoL-RCD deathride58 2019-03-08 20:46:19 -05:00
  • 1f3821d443 Merge pull request #8082 from Poojawa/patch-2 deathride58 2019-03-08 20:45:02 -05:00
  • 1c7fc9c699 Merge pull request #8067 from Trilbyspaceclone/patch-67 deathride58 2019-03-08 20:44:23 -05:00
  • f7c9b1cd32 Merge pull request #8066 from Citadel-Station-13/kevinz000-patch-23 deathride58 2019-03-08 20:43:42 -05:00
  • 2cd9c69ed1 Merge pull request #8083 from Poojawa/patch-3 deathride58 2019-03-08 20:43:25 -05:00
  • 3fc98af157 Merge pull request #8095 from nik707/DINK deathride58 2019-03-08 20:42:54 -05:00
  • 54a9b3206f Updates in response to feedback from Bhijn. Also adding in missed icons from my first sweep and renamed _corecross.dm to __corecross.dm. Amatsu Darkfyre 2019-03-08 17:22:40 -05:00
  • af04b72476 Making secberets protect as much as helmets Coolgat3 2019-03-08 17:36:46 +01:00
  • 575c7ebeba Adds Chilling effects to Slime Crossbreeding, along with their icons and proper DM files. Nothing is modularized, as this is all content from upstream, so there should be no upstream conflicts when or if a sync occurs. Amatsu Darkfyre 2019-03-08 04:02:21 -05:00
  • bda18c0770 Update extinguisher.dm Trilbyspaceclone 2019-03-06 20:32:40 -05:00
  • 7c79484784 Update extinguisher.dm Trilbyspaceclone 2019-03-06 20:05:53 -05:00
  • fdad1c30be ? Trilbyspaceclone 2019-03-06 17:05:54 -05:00
  • 371a4a1a9e Maybe Trilbyspaceclone 2019-03-06 16:45:47 -05:00
  • 8a5b4414a3 Update extinguisher.dm Trilbyspaceclone 2019-03-05 16:37:22 -05:00
  • a89ab006c1 Adds new and immersive sound for combat nik707 2019-03-05 15:03:08 -06:00