Commit Graph

391 Commits

Author SHA1 Message Date
Thalpy
c418312cc6 Merge branch 'master' into master 2019-07-09 05:33:09 +01:00
kevinz000
91f114f717 Merge pull request #8832 from Ghommie/Ghommie-cit116
Fixes new player runtime that makes people unable to join rounds.
2019-07-07 02:33:32 -07:00
kevinz000
9d13576cc9 Merge pull request #8826 from Ghommie/Ghommie-cit111
Ports "Adds safer helper for alt-click turf listing"
2019-07-07 02:32:56 -07:00
Thalpy
cc39c9f896 Merge branch 'master' into master 2019-07-06 16:03:17 +01:00
Ghommie
fe2abc990b Fixes new player runtime that makes people unable to join rounds. 2019-07-06 04:51:56 +02:00
kevinz000
748550895d Merge pull request #8632 from Arturlang/Traitor_Codeword_Highlight
Ports traitor codeword highlighting
2019-07-05 06:57:49 -07:00
Ghommie
5ff8be0faa Ports "Adds safer helper for alt-click turf listing" 2019-07-04 22:42:51 +02:00
Thalpy
696d879874 Merge branch 'master' into master 2019-06-29 15:48:25 +01:00
Trilbyspaceclone
227dd82daa just adrinals 2019-06-27 17:57:58 -04:00
TrilbySpaceClone
9cab7b960c web-editless 2019-06-26 18:10:13 -04:00
Fermi
10109d0fe5 Merge branch 'pr/18' 2019-06-23 19:15:07 +01:00
kevinz000
f7dcedce5f Merge pull request #8715 from Sishen1542/toxinmanbad
Pentetic Jelly, the chem we all needed. Anatomic panacea not deadly for slimes! Also, medbeam buff?
2019-06-23 06:57:09 -07:00
kevinz000
05f304f9c0 Merge pull request #8692 from Ghommie/Ghommie-cit69
[s] Ports "Fixes PDA TK exploits" and "Fixes pride mirror exploit"
2019-06-23 06:56:17 -07:00
kevinz000
294e1e48d2 Merge pull request #8659 from Ghommie/Ghommie-cit57
ports "Componentizes orbiting"
2019-06-23 06:50:32 -07:00
Ghommie
d1008122da indention bested me. 2019-06-23 06:33:27 +02:00
Ghommie
41c0586154 Ports in "makes the abductor console use radials" 2019-06-23 06:28:37 +02:00
Sishen
0a43036eae hugboxing slimepeople one thing at a time 2019-06-21 20:01:19 -04:00
Ghommie
55795355fd Ports "[s] Fixes pride mirror exploit" 2019-06-19 03:31:36 +02:00
Thalpy
41eee65b15 Merge branch 'master' into master 2019-06-17 12:18:40 +01:00
deathride58
7b329ae824 Merge pull request #8593 from Citadel-Station-13/changeling_adrenaline
Fixes adrenaline (it didn't actually work). Replaces traitor/ling adrenal omnizine with regenjelly (3x faster, but lasts shorter too), reworks changeling adrenals to scale burst stamina heal rather than flat 100
2019-06-16 22:51:03 -04:00
kevinz000
27d7dc430f Merge pull request #8497 from BurgerLUA/Clockwork-Reflectors
Adds Clockwork Reflectors
2019-06-16 19:41:57 -07:00
Ghommie
b782226900 ports "Componentizes orbiting" 2019-06-17 00:19:57 +02:00
Fermi
6b9becce71 Merge branch 'pr/14' 2019-06-14 21:29:04 +01:00
Ghommie
cf56870b57 Fixes the sacrificial target icon not displaying on the cult objective alert. 2019-06-13 23:48:15 +02:00
Arturlang
4d532ee67e Fixeds 2019-06-12 23:34:49 +03:00
Arturlang
d83cf7e2eb Bug fix 2019-06-12 20:22:55 +03:00
Arturlang
b747e0739e Improvements 2019-06-12 20:16:26 +03:00
unknown
b90d344afc It works. It just works. 2019-06-12 01:10:21 +03:00
kevinz000
49b61b54db yeah no stamina buffer I GUESS 2019-06-10 00:18:41 -07:00
kevinz000
8ba3609a4d god why fuck 2019-06-10 00:07:04 -07:00
kevinz000
3b9188d301 let's see how badly this goes 2019-06-08 18:28:04 -07:00
kevinz000
c3db9a3cd9 stuff 2019-06-08 18:22:37 -07:00
kevinz000
bd0e16461b Merge pull request #8522 from Useroth/changeling-hentai
Made the changeling tentacle disarm a bit more reliable.
2019-06-08 01:32:52 -07:00
kevinz000
d28754cb4d Merge pull request #8560 from Ghommie/Ghommie-cit37
Ports in the fix against hitting oneself with one's own thrown items.
2019-06-08 01:27:43 -07:00
kevinz000
ab565d2483 Merge pull request #8547 from Ghommie/Ghommie-cit29
Moves traits to datums and turn the accessors into defines
2019-06-08 01:22:16 -07:00
Ghommie
92e925f1f7 Stuff to fix, fools to blame. 2019-06-07 07:14:24 +02:00
Ghommie
d3d2b8d898 should be ready. 2019-06-06 19:24:20 +02:00
Useroth
ebb820ed38 Made the changeling tentacle disarm a bit more reliable. 2019-06-03 22:56:01 +02:00
Fermi
e58a94bcc7 Merge remote-tracking branch 'upstream/master' 2019-06-01 03:12:38 +01:00
BurgerLua
5f94441cc7 Adds Clockwork Reflectors 2019-05-30 22:52:43 -07:00
kevinz000
e75e629a8a Update code/modules/antagonists/changeling/powers/adrenaline.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2019-05-30 10:32:02 -07:00
kevinz000
8cd0b69b61 adrenals 2019-05-28 01:00:41 -07: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