Commit Graph

9386 Commits

Author SHA1 Message Date
Fermi a1afeb880f Final testing. Added pH meter too. Compile safe. 2019-05-27 15:00:19 +01:00
kevinz000 ff82569c6f Merge pull request #8404 from WhiteHusky/flavor-text-bugfix
Flavor text with special characters don't get partially unescaped
2019-05-27 03:31:49 -07:00
kevinz000 843bfc3a3e Merge pull request #8427 from CalamaBanana/quick-fix-for-importing-custom-colored-circuits
Removes color-whitelist blocking custom-colored circuit blueprints from being imported
2019-05-27 03:30:07 -07:00
kevinz000 45146b28c8 Merge pull request #8456 from Trilbyspaceclone/patch-151
suppressors now only cost 1 tc
2019-05-27 03:27:22 -07:00
kevinz000 433d6cae4b Merge pull request #8455 from Trilbyspaceclone/patch-150
Binary Translator Key costs 2 from 5
2019-05-27 03:26:45 -07:00
kevinz000 625901bfe3 Merge pull request #8454 from Trilbyspaceclone/patch-149
Adv Syndicate Surgery Duffel Bag tweaks
2019-05-27 03:26:26 -07:00
kevinz000 2f79f36a38 Merge pull request #8448 from Trilbyspaceclone/patch-143
Makes laser scatter shot cost 4 not 5
2019-05-27 03:25:56 -07:00
kevinz000 b718460cf6 Merge pull request #8460 from Trilbyspaceclone/patch-154
ultra clown fireing pins
2019-05-27 03:24:47 -07:00
kevinz000 e20206a6cb Merge pull request #8450 from Trilbyspaceclone/patch-145
Reduces FRAME cart by 2tc
2019-05-27 03:23:33 -07:00
Trilbyspaceclone 689077a54d grammar 2019-05-27 04:57:10 -04:00
Trilbyspaceclone a244bf33f7 Update recipes.dm 2019-05-27 04:39:06 -04:00
Trilbyspaceclone 1b48db693f Update shotgun.dm 2019-05-27 02:42:46 -04:00
Fermi 4607a2b6c3 Compile safe. Today's fixes. 2019-05-27 05:39:52 +01:00
Trilbyspaceclone 962c5c7a17 Update uplink_items.dm 2019-05-26 22:53:00 -04:00
Trilbyspaceclone 6b05ccbda8 Update uplink_items.dm 2019-05-26 22:51:22 -04:00
Trilbyspaceclone 21ade7bb2c Update uplink_items.dm 2019-05-26 22:49:07 -04:00
Trilbyspaceclone 254e84e46b Update uplink_items.dm 2019-05-26 22:44:17 -04:00
Trilbyspaceclone b28e374640 Update uplink_items.dm 2019-05-26 22:35:12 -04:00
Trilbyspaceclone ea6b538d0b Update uplink_items.dm 2019-05-26 22:32:10 -04:00
Trilbyspaceclone 4138748616 Update uplink_items.dm 2019-05-26 22:29:55 -04:00
Trilbyspaceclone a633d3202a It was 2019-05-26 22:22:31 -04:00
kevinz000 fa4e1f44ff Merge pull request #8438 from BurgerLUA/AssFix
Ass Fix
2019-05-26 19:19:13 -07:00
Trilbyspaceclone 2dde7e8451 Update uplink_items.dm 2019-05-26 22:18:56 -04:00
Trilbyspaceclone 7bc3aa4cf1 Update uplink_items.dm 2019-05-26 22:11:36 -04:00
Trilbyspaceclone 5a0c7df824 Update uplink_items.dm 2019-05-26 21:59:01 -04:00
Trilbyspaceclone a628c81474 Update uplink_items.dm 2019-05-26 21:56:37 -04:00
Trilbyspaceclone 06bacf3436 Update uplink_items.dm 2019-05-26 21:52:28 -04:00
kevinz000 d4026d70ff Merge pull request #8435 from Ghommie/Ghommie-cit17
lazyinitlist on IAA targets stealing.
2019-05-26 17:23:05 -07:00
kevinz000 e204cdc84e Merge pull request #8419 from UntoldTactics/Cult-Changes
Rewords Blood Cult 'offer' rune click here prompt.
2019-05-26 17:22:43 -07:00
deathride58 375965d731 Item stripping no longer gets interrupted by changes in your actively held item 2019-05-26 16:22:15 -04:00
Trilbyspaceclone 057fd54d92 Update packs.dm 2019-05-26 15:25:04 -04:00
Fermi 4cb697d2ec Final changes before checks. 2019-05-26 17:37:20 +01:00
Arturlang 352b07d5b1 Goddamnit, TABS, not spaces.
Also removes alt click function for vol pumps, since thats unnecesary.
2019-05-26 17:49:48 +03:00
Arturlang 3f7f8a3560 Update mixer.dm
Adds logging and to-admin
2019-05-26 17:34:48 +03:00
Arturlang 3eff474300 Update filter.dm
Adds logging and to-admin
2019-05-26 17:33:25 +03:00
Arturlang b494e21ef6 Update volume_pump.dm
Adds logging and message to admins
2019-05-26 17:31:23 +03:00
Arturlang ac066c3425 Logging
Adds logging and message to admins for CTRL and Alt
2019-05-26 17:27:21 +03:00
Poojawa 84aafb87f9 Lizard tails are actually marked 2019-05-26 04:52:44 -05:00
Trilbyspaceclone 5b549f030d huh... 2019-05-26 04:50:19 -04:00
Fermi bd85095590 Prebed tweaks 2019-05-26 05:34:28 +01:00
BurgerLua 125db4c6b4 Added 2019-05-25 21:21:52 -07:00
UntoldTactics 49351fe909 Update code/modules/antagonists/cult/runes.dm
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>
2019-05-26 12:23:35 +10:00
Fermi 91f10442cf Merge branch 'pr/12' 2019-05-26 02:05:48 +01:00
Fermi a0073295e1 Updating from Cit, pre PR. 2019-05-26 01:49:58 +01:00
Arturlang 869fac49a7 Apply suggestions from code review
Fixes compile errors

Co-Authored-By: Poojawa <Poojawa@users.noreply.github.com>
2019-05-26 03:29:27 +03:00
Trilbyspaceclone a29aed136b Update misc_designs.dm 2019-05-25 18:25:01 -04:00
Trilbyspaceclone df236fbda5 Update comp_board_designs.dm 2019-05-25 18:24:33 -04:00
Trilbyspaceclone 7b4ddd8965 Update comp_board_designs.dm 2019-05-25 18:24:19 -04:00
Trilbyspaceclone c8734cebdc Update biogenerator_designs.dm 2019-05-25 16:35:50 -04:00
deathride58 4fc31f6322 Merge branch 'master' into fuckatmos 2019-05-25 15:34:06 -04:00