Commit Graph

12895 Commits

Author SHA1 Message Date
kevinz000 ca16cd9467 Merge pull request #8488 from Trilbyspaceclone/ERT_SUITS
[Ready] High alarm ERT suits
2019-05-31 17:41:39 -07:00
kevinz000 a96e414d2f Merge pull request #8486 from BlackMajor/Ooga
Supermatter no longer works while inside of a turf.
2019-05-31 17:40:30 -07:00
kevinz000 f5b3484e92 Merge pull request #8295 from Trilbyspaceclone/T_T
[Ready] Nerfs(Not really) Engi printing and organized many designs
2019-05-30 11:12:35 -07:00
Trilbyspaceclone a8ec60d9c1 Update miscellaneous.dm 2019-05-30 13:51:55 -04:00
Trilbyspaceclone 39700503f9 Update miscellaneous.dm 2019-05-30 11:40:37 -04:00
Trilbyspaceclone 618c2c070c Update ert.dm 2019-05-30 11:36:20 -04:00
Trilbyspaceclone 0eb468e3a5 Update ert.dm 2019-05-30 11:33:38 -04:00
BlackMajor 0d06605662 Supermatter eats the closed turf it's inside.
Because /turf/closed doesn't respect atmos and an SM engine in a plasmafire unharmed because it's inside a turf is questionable.
2019-05-30 16:17:33 +12:00
kevinz000 aca63ebea3 Merge pull request #8408 from Ghommie/Ghommie-cit13
Fixing cult rounds potentially stalling if the sac target is erased from this realm.
2019-05-27 15:09:11 -07:00
kevinz000 e8036a8a9b Merge pull request #8439 from Ghommie/Ghommie-cit18
stunbaton status rework.
2019-05-27 14:08:52 -07:00
kevinz000 76314e463e Merge pull request #8443 from deathride58/stripfix
Item stripping no longer gets interrupted by changes in your actively held item
2019-05-27 14:08:04 -07: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 e0a0be9e4e Merge pull request #8440 from BurgerLUA/Sensor-Improvement
Improves Crew Monitoring Console Sorting
2019-05-27 03:30:39 -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 573f60fbc2 Merge pull request #8437 from Trilbyspaceclone/patch-138
[Ready] Adds more box crafting and white gloves to cloth
2019-05-27 03:29:01 -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 21ade7bb2c Update uplink_items.dm 2019-05-26 22:49:07 -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 5a0c7df824 Update uplink_items.dm 2019-05-26 21:59:01 -04:00
Trilbyspaceclone 06bacf3436 Update uplink_items.dm 2019-05-26 21:52:28 -04:00
Ghommie 37aa491fa5 removes emp downtime, Kev's request. 2019-05-27 02:30:03 +02: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
BurgerLua e3aaff68b7 Added 2019-05-26 00:34:37 -07:00
Ghommie a47a7b31ba more leniency. 2019-05-26 06:56:02 +02:00
Ghommie cfa53d53f1 updating old teleprods. 2019-05-26 06:49:58 +02:00
Ghommie 288f97dd13 further tweaking. 2019-05-26 06:38:04 +02:00
Ghommie 7289d8a999 tweaking. 2019-05-26 06:31:25 +02:00
BurgerLua 125db4c6b4 Added 2019-05-25 21:21:52 -07:00
Ghommie 9b2ab8fc2a 21 minutes sounds, I don't really wanna overly punish. 2019-05-26 05:21:17 +02:00
Ghommie e61942cba9 it will approx take 18-19 minutes now. 2019-05-26 05:18:07 +02:00
Ghommie 28c435134b stunbaton emp & status tweaks 2019-05-26 04:52:05 +02: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
Trilbyspaceclone 070e43ca64 Update sheet_types.dm 2019-05-25 17:58:33 -04:00
Trilbyspaceclone b6590cd9e9 Update boxes.dm 2019-05-25 17:54:57 -04:00
Trilbyspaceclone ed974bdcde Update sheet_types.dm 2019-05-25 17:18:40 -04:00
CalamaBanana fc5b617ca0 Input-check for the color 2019-05-25 21:18:17 +02:00
kevinz000 0dba89c4e7 Merge pull request #8325 from Trilbyspaceclone/patch-118
[Ready] Cleaner looking autolathen organization
2019-05-25 11:51:17 -07:00
kevinz000 90a3199315 Merge pull request #8417 from Trilbyspaceclone/patch-136
Gives space queen's men void jet packs + tweeks
2019-05-25 11:34:55 -07:00
kevinz000 a4b2aa0420 Merge pull request #8296 from Trilbyspaceclone/patch-112
Nerfs Synda NPC block Rng to 25%
2019-05-25 11:31:30 -07:00