Commit Graph

  • 97609fb84e Merge pull request #8409 from Poojawa/why-is-arousal-code-is-bad kevinz000 2019-05-25 11:13:55 -07:00
  • 16310a9aea Merge pull request #8425 from BlackMajor/Dunga kevinz000 2019-05-25 11:13:29 -07:00
  • 3bf6c84779 Automatic changelog generation for PR #8420 [ci skip] CitadelStationBot 2019-05-25 13:10:22 -05:00
  • 104d3c1f37 Merge pull request #8420 from deathride58/fixesblobs kevinz000 2019-05-25 11:10:19 -07:00
  • e3d3f30ea9 Could this be the final commit?! Fermi 2019-05-25 16:12:46 +01:00
  • d8024ef36f lazyinitlist. Ghommie 2019-05-25 16:32:17 +02:00
  • 08bb998cf3 Fixes some oofs Arturlang 2019-05-25 14:06:45 +03:00
  • 749e3a6f6a Apply suggestions from code review Arturlang 2019-05-25 14:01:55 +03:00
  • 96ab12cb48 Update code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm Arturlang 2019-05-25 13:59:35 +03:00
  • 0a1a7260cb no swapping places with lying mobs, thanks. Ghommie 2019-05-25 10:04:04 +02:00
  • 9864fe275d I'm tired of my grabs on horizontal spacemen breaking off because of cit crawling. Ghommie 2019-05-25 08:22:27 +02:00
  • 521c371253 actually, let's just halve it, won't be an issue I suppose. Ghommie 2019-05-25 07:44:45 +02:00
  • 34cad3786b Reduces stunprod's delay. Ghommie 2019-05-25 07:35:48 +02:00
  • 4b8cb81752 Compile safe. Fermi 2019-05-25 05:35:03 +01:00
  • e2c1eb1d7c prebed fixes Fermi 2019-05-25 05:27:28 +01:00
  • d1887d2431 Update comp_board_designs_medical.dm Trilbyspaceclone 2019-05-24 23:05:47 -04:00
  • 633bea1ad2 Update machine_designs_sci.dm Trilbyspaceclone 2019-05-24 22:56:44 -04:00
  • a43e4a6ca1 Update machine_designs_medical.dm Trilbyspaceclone 2019-05-24 22:55:59 -04:00
  • 1ff9489901 Update machine_designs_sci.dm Trilbyspaceclone 2019-05-24 22:37:59 -04:00
  • a0ee1aaccb Poojawa hissy fit for a game they dont even play. Trilbyspaceclone 2019-05-24 22:35:05 -04:00
  • 61605443b5 Update rifle.dm Trilbyspaceclone 2019-05-24 22:18:53 -04:00
  • b4624c5537 I really hate genitals. Fermi 2019-05-25 03:15:15 +01:00
  • f5d4135fe9 Update automatic.dm Trilbyspaceclone 2019-05-24 22:14:17 -04:00
  • 5b6f324993 Update shotgun.dm Trilbyspaceclone 2019-05-24 22:13:16 -04:00
  • 180666f519 Update recipes.dm Trilbyspaceclone 2019-05-24 22:11:11 -04:00
  • 5e8a20b171 More bugs, to be fixed. Fermi 2019-05-25 03:00:31 +01:00
  • faf6585b69 Winding down to the final commits. Fermi 2019-05-25 01:04:00 +01:00
  • 80d95f2297 Automatic changelog generation for PR #8429 [ci skip] CitadelStationBot 2019-05-24 12:48:34 -05:00
  • c68f4324b1 Merge pull request #8429 from deathride58/fuckconcats kevinz000 2019-05-24 10:48:32 -07:00
  • 9d240d3375 [s] fixes concatenator circuits being able to crash the server deathride58 2019-05-24 13:37:53 -04:00
  • d9cc539948 Removed color whitelist CalamaBanana 2019-05-24 17:46:48 +02:00
  • d082479ccb Slimespeak! Sishen 2019-05-24 08:48:03 -04:00
  • 9e025a03bd Ditto Arturlang 2019-05-24 15:23:54 +03:00
  • 7b82ce463b Ditto Arturlang 2019-05-24 15:23:10 +03:00
  • 40e90d1e34 Adds volume pump max text, as unlikely as it may be. Removes unnecesary icon update. Arturlang 2019-05-24 15:21:40 +03:00
  • 5a7ab390ce Gah, forgot to do spacing Arturlang 2019-05-24 15:20:36 +03:00
  • 661c1d9020 Add fancy colours to the plaintext. Arturlang 2019-05-24 15:18:38 +03:00
  • 5b2fc29d1f Pumps now let you know when their output is maxed using Alt Arturlang 2019-05-24 15:08:25 +03:00
  • 5d06de81b6 Fixes inconsistent indentation Arturlang 2019-05-24 15:00:27 +03:00
  • f94cbe94f6 Ports TG firebots BlackMajor 2019-05-24 23:58:39 +12:00
  • 92bbe42337 FOUR TRIES? IT TOOK HIM FOUR TRIES?! Sishen 2019-05-24 07:41:18 -04:00
  • fc54f4b7bf Update mixer.dm Arturlang 2019-05-24 13:49:24 +03:00
  • 07db00be8f Update filter.dm Arturlang 2019-05-24 13:48:03 +03:00
  • e91338f9e3 Update volume_pump.dm Arturlang 2019-05-24 13:47:23 +03:00
  • e2e070d307 Merge pull request #8 from Citadel-Station-13/master BlackMajor 2019-05-24 22:40:38 +12:00
  • 77bfcc61ed Update pump.dm Arturlang 2019-05-24 13:37:05 +03:00
  • ea1edd965d Update mixer.dm Arturlang 2019-05-24 12:18:13 +03:00
  • 277a498f28 Update filter.dm Arturlang 2019-05-24 12:13:45 +03:00
  • 54e013272a Volume pump CTRL and alt click functionality Arturlang 2019-05-24 12:12:15 +03:00
  • a09df34420 Gas pump CTRL and Alt click function Arturlang 2019-05-24 12:09:14 +03:00
  • 05aaeb4d70 Current state Fermi 2019-05-24 06:06:25 +01:00
  • b1c11071de Fixed acid to water and funbits. Fermi 2019-05-24 01:50:33 +01:00
  • 645dfca14a Compile ready. Fermi 2019-05-23 23:17:17 +01:00
  • 2f7a4082ab woooah. Fermi 2019-05-23 23:09:32 +01:00
  • c0cdc4c3ef Update weaponized.dm Useroth 2019-05-23 22:49:21 +02:00
  • 99372ace45 Automatic changelog generation for PR #8411 [ci skip] CitadelStationBot 2019-05-23 15:32:16 -05:00
  • 05d38cc016 Merge pull request #8411 from Trilbyspaceclone/patch-134 kevinz000 2019-05-23 13:32:12 -07:00
  • 8a8178a0b1 I uh, I'm worried this won't compile for some reason. Fermi 2019-05-23 20:52:20 +01:00
  • 310344e828 EVERYTHING BROKE AAAAAAAAAAAAAAAAAA Fermi 2019-05-23 20:21:52 +01:00
  • cf1acdf058 can my post-testing optimizations please at least work? deathride58 2019-05-23 13:12:31 -04:00
  • 4e989038e2 Fixes blob shields being completely invulnerable to all forms of damage after reaching a weakened state. deathride58 2019-05-23 12:37:46 -04:00
  • 0cf0d4d8ed Update runes.dm UntoldTactics 2019-05-23 18:37:17 +10:00
  • 196da05313 Brute deconv correct JTGSZ 2019-05-23 02:49:35 -04:00
  • 38ad6785a0 Over-reduced the item costs a bit too much. JTGSZ 2019-05-23 01:42:00 -04:00
  • 9081b34cb8 blunt trauma deconv JTGSZ 2019-05-23 01:16:29 -04:00
  • 080b29de79 Solves a few things. JTGSZ 2019-05-23 00:40:57 -04:00
  • c373b252d2 Merge pull request #11 from Thalpy/NewFixes Thalpy 2019-05-23 05:30:08 +01:00
  • a480ccb9fa Changes Fermi 2019-05-23 05:26:38 +01:00
  • ed23f9834a Update jetpack.dm Trilbyspaceclone 2019-05-22 22:19:32 -04:00
  • fb6eca8d46 How did this even compile? Trilbyspaceclone 2019-05-22 21:28:16 -04:00
  • 717398213b Update pirates.dm Trilbyspaceclone 2019-05-22 18:52:15 -04:00
  • e47598be8b Update jetpack.dm Trilbyspaceclone 2019-05-22 18:39:51 -04:00
  • 4da50828f7 Update suit_storage_unit.dm Trilbyspaceclone 2019-05-22 18:31:36 -04:00
  • e0e0142fb1 Better grammar Trilbyspaceclone 2019-05-22 18:26:06 -04:00
  • 3168c956a9 *cough* Trilbyspaceclone 2019-05-22 15:46:57 -04:00
  • 6fbe698e32 I know what im doing, I sware Trilbyspaceclone 2019-05-22 15:45:47 -04:00
  • 90bc986b84 Bhijn's sanity Trilbyspaceclone 2019-05-22 15:33:50 -04:00
  • 9da13f231c OOPS BROKE LUNGS Fermi 2019-05-22 20:23:45 +01:00
  • 0d6a28ed87 who in the fuck named progressbars progessbars? kevinz000 2019-05-22 12:21:08 -07:00
  • 5d40d4b9a2 sprint stamina stuff kevinz000 2019-05-22 12:18:47 -07:00
  • 4c3a51a620 Automatic changelog generation for PR #8400 [ci skip] CitadelStationBot 2019-05-22 13:50:58 -05:00
  • 4897f59a0b Merge pull request #40 from Citadel-Station-13/master Trilbyspaceclone 2019-05-22 14:43:01 -04:00
  • 80b44ac0f4 Update hardsuit.dm Trilbyspaceclone 2019-05-22 14:37:24 -04:00
  • 82ea741f57 Update packs.dm Trilbyspaceclone 2019-05-22 14:34:50 -04:00
  • 435ca89134 New traits. Fermi 2019-05-22 19:24:25 +01:00
  • 90b62234d6 Made the hotel booze-o-mat hacked by default. Useroth 2019-05-22 20:13:58 +02:00
  • f932fadfc6 Blood commit. Fermi 2019-05-22 18:46:46 +01:00
  • b900815e90 Merge pull request #8400 from dtfe3/watcher-trophy kevinz000 2019-05-22 10:42:25 -07:00
  • 9441853f6d Boltable hotel. Now with mapmerge. Useroth 2019-05-22 19:28:50 +02:00
  • 41d991e81c Pre blood commit Fermi 2019-05-22 18:13:12 +01:00
  • 4998b7cfa1 Actually, the cult team should process it instead. Got you covered, badmins spawning cult on other modes. Ghommie 2019-05-22 18:43:26 +02:00
  • 3bf667ba36 Update magweapon_energy.dm Trilbyspaceclone 2019-05-22 12:42:28 -04:00
  • 005647d4f6 Update magweapon_energy.dm Trilbyspaceclone 2019-05-22 12:12:06 -04:00
  • fc3482ec90 Squeak! Fermi 2019-05-22 16:51:52 +01:00
  • 7cb7f5de73 Update of master required. Fermi 2019-05-22 16:50:53 +01:00
  • 1bddf2d5ae Added comment Carlen White 2019-05-22 09:32:25 -04:00
  • d375284f42 Concating a string instead of a list Carlen White 2019-05-22 09:25:25 -04:00
  • 4324d08f32 aaaaAAAAAAAA Poojawa 2019-05-22 04:52:21 -05:00
  • f6b3260eeb oh right. Poojawa 2019-05-22 04:19:59 -05:00
  • 971ddef989 reverts forensics components. If I can't figure it out, MURDER IT Poojawa 2019-05-22 04:10:29 -05:00