deathride58 936c6a33f2 Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-35475

2018-03-09 14:18:47 -05:00

..

bot

[MIRROR] Disease antagonist (#5815)

2018-03-05 15:20:59 -06:00

friendly

[reviewpls] Adds moodlets to the game - [Please give suggestions for trait additions in comments]

2018-03-07 20:49:25 -06:00

guardian

Fixed instant summon behavior with simple animals (#35780)

2018-02-19 22:08:01 -06:00

hostile

Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-35475

2018-03-09 14:18:47 -05:00

slime

[MIRROR] Fixes negative bodytemp in some cases and shivering not doing anything unless you're already very cold (#5674)

2018-02-23 17:42:57 -06:00

animal_defense.dm

…

constructs.dm

The ARM is now harder to obtain (#36051)

2018-03-09 02:17:46 -06:00

corpse.dm

Fixes wrong ID for syndicate ghost roles

2018-02-11 15:35:14 -06:00

damage_procs.dm

Defines math, take 2

2017-12-17 10:02:43 -06:00

parrot.dm

Parrot fixes (#34934)

2018-01-26 11:21:09 -06:00

shade.dm

…

simple_animal_vr.dm

Vore code to json and more (#5789)

2018-03-06 03:59:31 -06:00

simple_animal.dm

Vore code to json and more (#5789)

2018-03-06 03:59:31 -06:00

spawner.dm

balances the netherworld link, spawners can now spawn from a pool of mobs, and the netherworld link can now summon all three types of netherworld critters. (and mining spawner cleanup for admin events i guess) (#35386)

2018-02-07 08:13:45 -06:00

status_procs.dm

…