LetterJay 10f5f27bf0 Merge pull request #1144 from Citadel-Station-13/upstream-merge-27554 ...

[MIRROR] Prevents inserted inert legion cores from healing

2017-05-24 08:33:58 -05:00

..

bot

Merge branch 'master' into upstream-merge-27160

2017-05-22 16:29:43 -05:00

friendly

Merge branch 'master' into upstream-merge-27160

2017-05-22 16:29:43 -05:00

guardian

Merge branch 'master' into upstream-merge-27160

2017-05-22 16:29:43 -05:00

hostile

Prevents inserted inert legion cores from healing

2017-05-24 00:15:13 -05:00

slime

Merge branch 'master' into upstream-merge-26776

2017-05-17 05:14:18 -04:00

animal_defense.dm

adds vore back (why this was removed, I have no idea)

2017-04-14 13:40:44 -05:00

constructs.dm

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27442

2017-05-24 08:06:53 -05:00

corpse.dm

April sync (#360)

2017-04-13 23:37:00 -05:00

damage_procs.dm

Tg patch branch to master (#192)

2017-02-03 05:56:14 -06:00

parrot.dm

Makes radio keys table more compact and easy to change

2017-04-17 09:45:42 -05:00

shade.dm

[MIRROR] Manifest Spirit is better for summoning cannon fodder but slightly worse for instantly summoning Nar-Sie (#916)

2017-05-18 09:37:30 -05:00

simple_animal_vr.dm

Merge /vore into /master (#39)

2016-09-09 23:31:01 -05:00

simple_animal.dm

Merge branch 'master' into upstream-merge-27160

2017-05-22 16:29:43 -05:00

spawner.dm

Tg patch branch to master (#192)

2017-02-03 05:56:14 -06:00

status_procs.dm

Refactors ears into organs (#513)

2017-04-26 09:52:35 -05:00