Commit Graph

  • a7d29ae830 Merge pull request #10973 from Trilbyspaceclone/put-a-pin-in-it Ghom 2020-02-13 09:42:22 +01:00
  • 1106ea86bc Automatic changelog generation for PR #10969 [ci skip] CitadelStationBot 2020-02-13 02:41:13 -06:00
  • 5730b717c5 Merge pull request #10969 from Seris02/crowbarcrate Ghom 2020-02-13 09:41:10 +01:00
  • 43ae33e737 Automatic changelog generation for PR #11027 [ci skip] CitadelStationBot 2020-02-13 02:40:25 -06:00
  • b3a530abc9 Merge pull request #11027 from ShadeAware/capsdrobe2 Ghom 2020-02-13 09:40:22 +01:00
  • 7d324c1b85 Automatic changelog generation for PR #10955 [ci skip] CitadelStationBot 2020-02-13 02:39:29 -06:00
  • 500ed0dd57 Merge pull request #10955 from Citadel-Station-13/kevinz000-patch-10 Ghom 2020-02-13 09:39:26 +01:00
  • bfdef7fcfd Merge pull request #10755 from kevinz000/attack_chain Ghom 2020-02-13 09:39:07 +01:00
  • 0b008db5e6 Import Cogchamp Winter Flare 2020-02-13 03:36:54 -05:00
  • e5753b4fc0 Automatic changelog generation for PR #11026 [ci skip] CitadelStationBot 2020-02-13 02:36:13 -06:00
  • 380983bd10 Merge pull request #11026 from Trilbyspaceclone/patch-278 Ghom 2020-02-13 09:36:10 +01:00
  • ac55d1d25d Merge branch 'master' into tinytweaks-2-9-20 Winter Flare 2020-02-13 03:34:44 -05:00
  • 86667b4c1c Automatic changelog generation for PR #11024 [ci skip] CitadelStationBot 2020-02-13 02:28:38 -06:00
  • 721b647e3c Merge pull request #11024 from Citadel-Station-13/kevinz000-patch-5 Ghom 2020-02-13 09:28:35 +01:00
  • 9d55e2d514 Merge pull request #11030 from InnocentFire/markings_notmammals.dmi-update Ghom 2020-02-13 09:27:55 +01:00
  • f32affdb1c Made Mugs Colorful Winter Flare 2020-02-13 03:26:35 -05:00
  • aa12ec70a3 Update shields.dm Trilbyspaceclone 2020-02-13 03:02:26 -05:00
  • ac387e0655 Merge pull request #11059 from Citadel-Station-13/Ghommie-patch-1 deathride58 2020-02-13 02:53:22 -05:00
  • 4f61f570ce Merge pull request #11058 from Citadel-Station-13/kevinz000-patch-16 Ghom 2020-02-13 08:52:03 +01:00
  • eca0e0f2dc Merge remote-tracking branch 'citadel/master' into mobility_flags kevinz000 2020-02-13 00:39:20 -07:00
  • a8a071851a s kevinz000 2020-02-13 00:32:26 -07:00
  • 1fd8ebc2dc Update genitals.dm Ghom 2020-02-13 08:28:52 +01:00
  • e4a20a16a4 Update genitals.dm Ghom 2020-02-13 08:25:44 +01:00
  • 1ef3f45f89 Update genitals.dm Ghom 2020-02-13 08:22:08 +01:00
  • d9885cf278 oh damn, forgot those are numbers Ghom 2020-02-13 08:16:37 +01:00
  • 40111faab1 Update geiger_counter.dm kevinz000 2020-02-13 00:12:25 -07:00
  • 358fe3d2e0 Automatic changelog generation for PR #10943 [ci skip] CitadelStationBot 2020-02-13 01:05:04 -06:00
  • 79f253e042 Merge pull request #10943 from Ghommie/Ghommie-cit562 kevinz000 2020-02-13 00:05:01 -07:00
  • ee10c03630 Merge branch 'master' into Ghommie-cit562 Ghom 2020-02-13 08:00:53 +01:00
  • f1e0c62141 Update gravity.dm kevinz000 2020-02-12 23:59:03 -07:00
  • f0f043db49 Automatic changelog generation for PR #11012 [ci skip] CitadelStationBot 2020-02-13 00:58:16 -06:00
  • c790478a3d Merge pull request #11012 from keronshb/RatvarDrink kevinz000 2020-02-12 23:58:14 -07:00
  • ed6c35f170 Automatic changelog generation for PR #11005 [ci skip] CitadelStationBot 2020-02-13 00:57:53 -06:00
  • 5b01691834 Merge pull request #11005 from Arturlang/Hypospray_fix kevinz000 2020-02-12 23:57:50 -07:00
  • ca7134ca92 Automatic changelog generation for PR #10987 [ci skip] CitadelStationBot 2020-02-13 00:56:55 -06:00
  • 4e419eed03 Merge pull request #10987 from Ghommie/Ghommie-cit567 kevinz000 2020-02-12 23:56:53 -07:00
  • c34617d42a Merge branch 'the-p-o-o-l' of https://github.com/Detective-Google/Citadel-Station-13 into the-p-o-o-l Detective Google 2020-02-13 00:12:13 -06:00
  • b6cbb3f505 woo yeah yeah woo Detective Google 2020-02-13 00:12:11 -06:00
  • 165f46b836 goodbye blood bullets necromanceranne 2020-02-13 17:05:36 +11:00
  • a8aa9ac24b Update code/modules/pool/pool_drain.dm as per ghom suggestion 2 Detective-Google 2020-02-12 23:43:32 -06:00
  • 25c677942a Update code/modules/pool/pool_main.dm as per ghom suggestion Detective-Google 2020-02-12 23:43:10 -06:00
  • 4ac7fff7e3 ye Seris02 2020-02-13 13:37:47 +08:00
  • b682f9e730 Automatic changelog generation for PR #11029 [ci skip] CitadelStationBot 2020-02-12 22:01:10 -06:00
  • 4f9652f2d2 Merge pull request #11029 from Putnam3145/fix-that-dumb kevinz000 2020-02-12 21:01:07 -07:00
  • 73e782a4de Update teleportation.dm kevinz000 2020-02-12 20:56:09 -07:00
  • 5d32775170 Changes the desc a little keronshb 2020-02-12 21:31:48 -05:00
  • 7949c4fa01 Changes cult stunhand when halos are out keronshb 2020-02-12 21:24:12 -05:00
  • aad78ffb78 Update teleportation.dm kevinz000 2020-02-12 17:53:42 -07:00
  • 195760e572 h ShadeAware 2020-02-12 16:37:00 -05:00
  • 0f603f2aff Fixes icon state for the refill ShadeAware 2020-02-12 16:34:16 -05:00
  • 34d8381b67 Update blood_drunk_miner.dm Trilbyspaceclone 2020-02-12 15:21:17 -05:00
  • 0bd1357e5f flour Trilbyspaceclone 2020-02-12 15:03:15 -05:00
  • 1ce9232958 Update cereals.dm Trilbyspaceclone 2020-02-12 15:00:08 -05:00
  • ba8c7b191c Update stickman.dm Trilbyspaceclone 2020-02-12 14:52:24 -05:00
  • 7cd3a51c4e Update pistol.dm Trilbyspaceclone 2020-02-12 14:48:53 -05:00
  • 4b880276d8 Update emergency.dm Trilbyspaceclone 2020-02-12 14:41:38 -05:00
  • 90e18f9254 Update bodybag.dm Trilbyspaceclone 2020-02-12 14:31:47 -05:00
  • b7c3582d86 Update outfit.dm Trilbyspaceclone 2020-02-12 14:29:19 -05:00
  • 551a2593d4 Update color.dm Trilbyspaceclone 2020-02-12 14:28:57 -05:00
  • 49a7657404 Correction Trilbyspaceclone 2020-02-12 14:26:29 -05:00
  • 89936a1335 Automatic changelog generation for PR #10994 [ci skip] CitadelStationBot 2020-02-12 09:51:41 -06:00
  • 942f3f28be Merge pull request #10994 from DeltaFire15/narsierunefix Ghom 2020-02-12 16:51:38 +01:00
  • f89d3907e9 Automatic changelog generation for PR #11043 [ci skip] CitadelStationBot 2020-02-12 08:35:05 -06:00
  • 2674fa6efc Merge pull request #11043 from Seris02/apcthingfix Ghom 2020-02-12 15:35:01 +01:00
  • ccf6f6720b Recompile Artur 2020-02-12 16:23:45 +02:00
  • 21ce2242ac Conflict fix Artur 2020-02-12 16:21:29 +02:00
  • ce46f8fdd7 Fixes the buttons not graying out Artur 2020-02-12 16:13:24 +02:00
  • eb5835f668 fixes apcs Seris02 2020-02-12 21:35:51 +08:00
  • 2bd8499b94 We shallnt want mass production. Artur 2020-02-12 14:28:35 +02:00
  • 788d8c5873 Just in case. Artur 2020-02-12 14:13:26 +02:00
  • 0fdcfc8660 Works now. Artur 2020-02-12 14:02:09 +02:00
  • 88f063623e Automatic changelog generation for PR #11020 [ci skip] CitadelStationBot 2020-02-12 05:47:35 -06:00
  • 31c7a0e2be Merge pull request #11020 from Zellular/Animations1 Ghom 2020-02-12 12:47:32 +01:00
  • 12b84aa333 Update mob_holder.dm Ghom 2020-02-12 12:43:47 +01:00
  • a0adf64c6c Lets see if it works now Artur 2020-02-12 12:52:36 +02:00
  • a7e24c33c2 Automatic changelog generation for PR #11018 [ci skip] CitadelStationBot 2020-02-12 04:14:30 -06:00
  • 8c2801fda6 Merge pull request #11018 from Citadel-Station-13/kevinz000-patch-4 Ghom 2020-02-12 11:14:27 +01:00
  • 63482e397a How could i forget. Artur 2020-02-12 11:39:08 +02:00
  • 40ab7b45df Automatic changelog generation for PR #10992 [ci skip] CitadelStationBot 2020-02-12 03:34:28 -06:00
  • af477aa28b Merge pull request #10992 from Hatterhat/buckbuff Ghom 2020-02-12 10:34:25 +01:00
  • 0917617543 Merge pull request #11004 from Citadel-Station-13/kevinz000-patch-2 Ghom 2020-02-12 10:33:08 +01:00
  • 5c102d4da0 Ghommies suggestions Artur 2020-02-12 11:30:55 +02:00
  • 7d1cf6a5a0 Hopefully makes blood useless Artur 2020-02-12 11:27:57 +02:00
  • d8d6a8efb8 lazy-be-gone kevinz000 2020-02-12 02:15:56 -07:00
  • ce5208a1df Merge pull request #11007 from r4d6/random-fixes Ghom 2020-02-12 10:10:16 +01:00
  • 2e6285cece uh kevinz000 2020-02-12 01:44:40 -07:00
  • 33b3d06d4c im lazy kevinz000 2020-02-12 01:44:28 -07:00
  • e5ab230b26 Monky chokehold deluxe. Ghommie 2020-02-12 09:32:38 +01:00
  • e099ed9578 Further mob holder fixes. Ghommie 2020-02-12 09:24:49 +01:00
  • ebba56202d Update MC.dm kevinz000 2020-02-12 01:16:01 -07:00
  • bb320a22e6 Updates markings_notmammals.dmi InnocentFire 2020-02-12 03:10:33 -05:00
  • 62ff589840 Something about a couple runtimes. Ghommie 2020-02-12 09:10:24 +01:00
  • 9997cb4f75 Automatic changelog generation for PR #11032 [ci skip] CitadelStationBot 2020-02-12 02:09:39 -06:00
  • fc3f0d02fc Merge pull request #11032 from Citadel-Station-13/kevinz000-patch-7 Ghom 2020-02-12 09:09:36 +01:00
  • 199df8bec0 Automatic changelog generation for PR #10861 [ci skip] CitadelStationBot 2020-02-12 02:06:06 -06:00
  • 2ed19e0a5a Merge pull request #10861 from ancientpower/far-sliding-port Ghom 2020-02-12 09:06:03 +01:00
  • d1dc2edde3 Update to markings_notmammals.dmi InnocentFire 2020-02-12 02:54:23 -05:00
  • 77163c7909 Update capture_the_flag.dm kevinz000 2020-02-12 00:44:52 -07:00
  • 46d2dc24e9 Update capture_the_flag.dm kevinz000 2020-02-12 00:43:04 -07:00
  • 66a01c1fe9 Update capture_the_flag.dm kevinz000 2020-02-12 00:32:40 -07:00