LetterJay 35b56f3075 Merge branch 'master' into upstream-merge-27773

2017-06-06 09:05:26 -05:00

..

bot

Fixed very minor capitalization and punctuation inconsistencies. (#1104)

2017-05-27 13:43:20 -07:00

friendly

You can pet dogs again.

2017-05-29 08:58:43 -05:00

guardian

Fixes bsa not showing up (#1396)

2017-06-04 09:03:30 -07:00

hostile

Merge branch 'master' into upstream-merge-27773

2017-06-06 09:05:26 -05:00

slime

Refactor another spawn var (#1395)

2017-06-04 09:04:56 -07: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

Replaced mob spawner vars with outfits

2017-05-23 07:57:42 -05:00

damage_procs.dm

Tg patch branch to master (#192)

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

parrot.dm

Changes incorporeal movement to use defines

2017-05-27 20:55:04 -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