uraniummeltdown
7f5f255ce7
jaunting wraiths should now always be facing the correct direction in their animation and sprite before and after jaunt ( #34547 )
2018-01-19 09:29:10 -06:00
AnturK
3dc89ba058
Antag Panel / Check antagonists Refactor
2018-01-19 08:43:49 -06:00
oranges
3b9b6f156e
Merge pull request #33933 from coiax/wizard-late-joining
...
Late joiners also get summoned guns/magic
2018-01-10 03:11:56 -06:00
deathride58
e4410a3320
Merge branch 'master' into mapsyncs43293845982
2018-01-08 06:18:11 +00:00
Jordan Brown
af27a1aa03
Fixes can_cast short circuit ( #34097 )
2018-01-07 20:49:50 -06:00
deathride58
d2ec28b1e6
Merge branch 'master' into mapsyncs43293845982
2018-01-07 20:23:00 +00:00
Shadowlight213
e20cbe5aa7
Fixes infernal jaunt causing devils to get stuck if interrupted ( #34056 )
...
* Fixes infernal jaunt causing devils to get stuck if stunned.
* defines because I know a maintainer will yell at me for this.
2018-01-05 06:05:16 -06:00
deathride58
aabbbb9dff
aaaand the rest of the modules folder
2018-01-04 01:45:38 -05:00
LetterJay
590775ddbe
Merge pull request #4635 from Citadel-Station-13/upstream-merge-34003
...
[MIRROR] Fixes Abyssal Gaze blinding forever
2018-01-02 17:13:31 -06:00
LetterJay
4adbd0fbf4
Update construct_spells.dm
2018-01-02 15:46:51 -06:00
XDTM
bae882bf46
Fixes Abyssal Gaze blinding forever
2018-01-02 08:22:32 -06:00
Tad Hardesty
0418ee4df6
Replace explicit z-level checks with defines
2017-12-29 13:41:10 -06:00
LetterJay
a64a1e4a5c
Merge branch 'master' into upstream-merge-33783
2017-12-29 06:49:47 -06:00
Robustin
d7723a064c
Spell action buttons finally fixed ( #33882 )
...
* Action button fix
* Action button fix
* Spell action button fix
* Spell action button fix
* Update alien_powers.dm
* Update spell.dm
* Action button fix
* Update touch_attacks.dm
2017-12-29 02:54:50 -06:00
LetterJay
8a792d6ef6
more save points
2017-12-29 00:07:36 -06:00
LetterJay
ac5503d338
Merge branch 'master' into upstream-merge-33055
2017-12-25 04:10:34 -06:00
Jordan Brown
164db7ae9b
Prefixed all disability defines with DISABILITY_ to fix a name collision
2017-12-24 15:03:30 -06:00
LetterJay
92c347d068
Merge branch 'master' into upstream-merge-33246
2017-12-20 00:27:06 -06:00
LetterJay
408182758f
Merge branch 'master' into upstream-merge-33498
2017-12-19 17:50:11 -06:00
LetterJay
cfeea088e8
Update genetic.dm
2017-12-18 17:27:12 -06:00
XDTM
3af0aa2489
[Ready Again]Refactors disabilities into lists, allowing for independent disability sources
2017-12-18 15:19:53 -06:00
Emmett Gaines
f875d4e176
Defines math, take 2
2017-12-17 10:02:43 -06:00
Armhulen
8a0aa32335
Mi-go
2017-12-17 04:11:01 -06:00
LetterJay
7af461539f
Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"
2017-12-16 13:08:50 -06:00
kevinz000
253c819bc1
TG Sync 12/15/17
...
s
s
2017-12-15 06:27:57 -08:00
AnturK
6bfca33a78
Roundend report refactor
2017-12-11 10:58:23 -06:00
XDTM
988dbe87da
Brain Traumas
2017-12-06 12:05:20 -06:00
ShizCalev
2762e3b530
Fixes Lord Singuloth hungering for more than he should
2017-11-24 13:00:42 -06:00
jammer312
cf10130b21
Conjuration spells fix ( #32951 )
...
* conjure spells fix
* added newline at end of file
2017-11-21 22:30:05 -06:00
LetterJay
809951c56c
Merge pull request #3326 from Citadel-Station-13/upstream-merge-31176
...
[MIRROR] loc -- > forcemove
2017-11-14 15:58:20 -06:00
Leo
6962cf8b24
Merge pull request #32577 from PKPenguin321/patch-13
...
Fixes lich revival text spelling
2017-11-11 14:32:04 -06:00
LetterJay
d6e5942baf
Merge branch 'master' into upstream-merge-31176
2017-11-09 03:24:38 -06:00
LetterJay
110b0e0615
Update shapeshift.dm
2017-11-04 22:44:56 -05:00
AnturK
b32f8dbba7
Shapeshift tweaks.
2017-11-03 15:54:28 -05:00
KorPhaeron
edfc86c895
Halloween race fixes
2017-10-29 12:31:38 -05:00
Armhulen
404740d784
Adds spiders to the shapeshift menu! ( #31896 )
...
* >gondolas
* :(
2017-10-22 13:55:07 -05:00
CitadelStationBot
d25cb1ba5d
[MIRROR] Grammar fixes to atom descriptions ( #3165 )
...
* Grammar fixes to atom descriptions
* compile errors
2017-10-21 07:17:03 -05:00
CitadelStationBot
adc2e46114
[MIRROR] Does some code standardization/consistency. ( #3161 )
...
* Does some code standardization/consistency.
* fixes merge conflict generation
* Missed a few, oops
* Update pierrot_throat.dm
2017-10-21 06:10:22 -05:00
LetterJay
568ed91f28
Merge pull request #3430 from Citadel-Station-13/upstream-merge-30599
...
[MIRROR] Moves projectile processing to a subsystem
2017-10-16 10:39:41 -04:00
kevinz000
ed96224d3a
Moves projectile processing to a subsystem
2017-10-15 21:51:24 -05:00
MoreRobustThanYou
1b7cd05752
EI NATH! now causes a flash of light ( #31691 )
...
i've been reading too much harry potter
2017-10-15 21:04:14 -05:00
kevinz000
b20e5916ea
Removes a bunch of sleeps/spawns and makes a few booleans defines
2017-10-14 18:53:48 -05:00
kevinz000
033d14e8b3
loc -- > forcemove
2017-10-12 06:13:11 -05:00
LetterJay
7390bd82fd
Update rightandwrong.dm
2017-10-12 02:55:28 -05:00
AnturK
5be4669924
Datum antag wizard.
2017-10-11 05:24:17 -05:00
Jordan Brown
7b30be0058
Merge pull request #31494 from MrStonedOne/tick_contention_tug_of_war
...
In which the stoner one gets stoned and tries to address tick contention... again
2017-10-10 13:28:38 -05:00
Jordan Brown
075cb673c0
Remove drop_item, drop_item_v, put_in_hands_or_del
2017-10-07 12:37:06 -05:00
KorPhaeron
037ea0ce13
Nightmare organs
2017-10-03 18:22:01 -05:00
CitadelStationBot
1e309deac0
[MIRROR] Wizard can't cast shout or whisper spells when he is unable to speak ( #2965 )
...
* Wizard being mute now blocks touch attacks from activating (can still be cast)
* Wizard can't cast shout or whisper spells when he is unable to speak
2017-10-02 23:20:46 -07:00
AnturK
6afd603fe6
Fixes some hardset dna misuse
2017-09-30 14:51:52 -05:00
