Commit Graph

350 Commits

Author SHA1 Message Date
Fermi
e58a94bcc7 Merge remote-tracking branch 'upstream/master' 2019-06-01 03:12:38 +01: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
Fermi
4607a2b6c3 Compile safe. Today's fixes. 2019-05-27 05:39:52 +01: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
Fermi
4cb697d2ec Final changes before checks. 2019-05-26 17:37:20 +01: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
Ghommie
d8024ef36f lazyinitlist. 2019-05-25 16:32:17 +02:00
deathride58
cf1acdf058 can my post-testing optimizations please at least work? 2019-05-23 13:12:31 -04:00
deathride58
4e989038e2 Fixes blob shields being completely invulnerable to all forms of damage after reaching a weakened state. 2019-05-23 12:37:46 -04:00
UntoldTactics
0cf0d4d8ed Update runes.dm 2019-05-23 18:37:17 +10:00
Fermi
f932fadfc6 Blood commit. 2019-05-22 18:46:46 +01:00
Ghommie
4998b7cfa1 Actually, the cult team should process it instead.
Got you covered, badmins spawning cult on other modes.
2019-05-22 18:43:26 +02:00
Ghommie
6bb70297ec Why did you check if the gamemode's type is an antagonist datum?
And why did it sort of work too?
I don't understand.
Pooj's copypasting this black magic, smh.
2019-05-22 06:09:18 +02:00
kevinz000
dc548c06b5 Merge pull request #8293 from Useroth/ninja-adrenals
Adrenal implant, as well as ling and ninja adrenals buff (or rather, making them function like pre-rework (or even slightly better))
2019-05-20 23:40:52 -07:00
kevinz000
cccf1e1291 Merge pull request #8369 from Trilbyspaceclone/patch-129
Adds more shuttle curse texts
2019-05-20 23:36:25 -07:00
kevinz000
a6a1de2f2f Merge pull request #8386 from BlackMajor/Ooga
Ling hivemind no longer turns apostrophes into &#39;
2019-05-20 23:30:48 -07:00
Trilbyspaceclone
d59614a9bb Update cult_items.dm 2019-05-20 15:21:06 -04:00
BlackMajor
20bbc0888d Ling hivemind no longer turns apostrophes into &#39;
Because They&#39;re not enjoying speaking gibberish for having proper grammar.
2019-05-18 17:42:17 +12:00
deathride58
cbac4b1daf Merge pull request #8330 from Scorpion-117/master
This is an entire addition to put stargazers back into clock cult.
2019-05-17 00:13:35 -04:00
Trilbyspaceclone
88a41f7783 Update cult_items.dm 2019-05-16 19:54:08 -04:00
Trilbyspaceclone
381a4869bb Update cult_items.dm 2019-05-16 19:40:09 -04:00
kevinz000
4f12a762f3 Merge pull request #8342 from BurgerLUA/Cult-Improvements-and-Fixes
Adds EMP Defensive Traps to Clockcult
2019-05-11 22:19:46 -07:00
BurgerLua
f66326ab51 Fixes an potential AI exploit. 2019-05-10 19:19:42 -07:00
BurgerLua
4aba11739b Finishing touches. 2019-05-10 19:15:42 -07:00
BurgerLua
d97bf47b95 Added 2019-05-10 18:12:36 -07:00
Scorpion-117
7a8adff8e0 testing a value of 7
x
2019-05-10 01:58:53 -06:00
Scorpion-117
9fd61b660d modifying to make it take far more power to produce
x
2019-05-10 01:55:25 -06:00
Useroth
a0d948497b Totally forgotten the abductor adrenals. 2019-05-09 13:28:04 +02:00
Useroth
83661fff9d Update abduction_gear.dm 2019-05-09 13:17:12 +02:00
Useroth
07685a1074 Abductor baton buff. Because it currently sucks balls. 2019-05-09 12:20:02 +02:00
Scorpion-117
e8299db245 Readding stargazer 2019-05-08 07:44:39 -06:00
Scorpion-117
0c6d84d50e Reading stargazers
because why not
2019-05-08 07:29:50 -06:00
Scorpion-117
d0970e327c Update stargazer.dm 2019-05-08 07:21:17 -06:00
Scorpion-117
c0717561ff puts back stargazer DM
x
2019-05-08 07:20:29 -06:00
deathride58
f318ad7d1b Merge pull request #8278 from Trilbyspaceclone/patch-106
Buffs blob Shield armor, as well as weaken state
2019-05-06 22:13:50 -04:00
Useroth
5d8cf0cabe Let's give adrenals the one more small touch of love. 2019-04-28 16:13:07 +02:00
Useroth
8ab82e0853 Fixed two leftovers from a feature that I will do in another PR. 2019-04-28 06:23:36 +02:00
Useroth
56b2e7150c Back to the point of entry. 2019-04-28 06:21:03 +02:00
Useroth
41a8177f34 Adjustments v2. 2019-04-27 13:53:04 +02:00
Useroth
c1ffffa4f1 Adjustments. 2019-04-27 13:50:23 +02:00
Useroth
9c17845e0f Buffed changeling adrenals too. 2019-04-26 21:34:50 +02:00
kevinz000
6ce3a0150f Merge pull request #8242 from Trilbyspaceclone/patch-99
Give some blob things basic armor
2019-04-25 04:18:21 -07:00
Trilbyspaceclone
139024566f Update shield.dm 2019-04-23 03:15:46 -04:00
Trilbyspaceclone
415461d736 Forgot bomb armor 2019-04-23 02:32:07 -04:00
Trilbyspaceclone
073684b7bc As Kev requested 2019-04-23 02:30:55 -04:00
kevinz000
333f758e30 Merge pull request #8105 from Trilbyspaceclone/patch-76
[Ready] Makes transformation slings have a loundess of 2 factor
2019-04-22 21:34:50 -07:00
Trilbyspaceclone
e7bac925dc Update core.dm 2019-04-15 15:05:11 -04:00
Trilbyspaceclone
3a67385bde Update resource.dm 2019-04-14 17:41:54 -04:00