LetterJay 408182758f Merge branch 'master' into upstream-merge-33498

2017-12-19 17:50:11 -06:00

..

bosses

[MIRROR] Grammar fixes to atom descriptions (#3165)

2017-10-21 07:17:03 -05:00

gorilla

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

jungle

[MIRROR] Grammar fixes to atom descriptions (#3165)

2017-10-21 07:17:03 -05:00

megafauna

Defines math, take 2

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

mining_mobs

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

retaliate

Cleans up goldcore defines

2017-11-26 16:51:44 -06:00

alien.dm

Cleans up goldcore defines

2017-11-26 16:51:44 -06:00

bear.dm

Update bear.dm

2017-11-26 21:24:27 -05:00

bees.dm

Cleans up goldcore defines

2017-11-26 16:51:44 -06:00

carp.dm

Cleans up goldcore defines

2017-11-26 16:51:44 -06:00

creature.dm

Merge branch 'master' into upstream-merge-32624

2017-12-04 17:12:53 -05:00

eyeballs.dm

Tg patch branch to master (#192)

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

faithless.dm

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

giant_spider.dm

Cleans up goldcore defines

2017-11-26 16:51:44 -06:00

headcrab.dm

Replaces a bunch of loc assignments with forcemoves and moves to nullspace

2017-12-13 13:56:57 -06:00

hivebot.dm

Cleans up goldcore defines

2017-11-26 16:51:44 -06:00

hostile.dm

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

illusion.dm

Two more types of Legion and makes environment_smash levels into defines

2017-05-21 02:52:23 -05:00

killertomato.dm

Cleans up goldcore defines

2017-11-26 16:51:44 -06:00

mecha_pilot.dm

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

mimic.dm

Replaces a bunch of loc assignments with forcemoves and moves to nullspace

2017-12-13 13:56:57 -06:00

mushroom.dm

Speeds up simple_animals/hostile/proc/CanAttack()

2017-09-30 19:48:59 -05:00

nanotrasen.dm

this sure was FUN

2017-09-07 09:47:56 -05:00

netherworld.dm

Mi-go

2017-12-17 04:11:01 -06:00

pirate.dm

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

russian.dm

here we go again (#2456)

2017-08-24 19:24:25 -07:00

skeleton.dm

Cleans up goldcore defines

2017-11-26 16:51:44 -06:00

statue.dm

Fixes hostile mobs attacking surrounding tiles when trying to attack someone: the stunning finale

2017-11-22 15:24:21 -06:00

stickman.dm

[MIRROR] Ammo cleanup (#2643)

2017-09-22 22:30:44 -05:00

syndicate.dm

Cleans up goldcore defines

2017-11-26 16:51:44 -06:00

tree.dm

Cleans up goldcore defines

2017-11-26 16:51:44 -06:00

venus_human_trap.dm

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

wizard.dm

[MIRROR] Fixes to more Initialize procs (#2733)

2017-09-13 22:54:12 -05:00

wumborian_fugu.dm

[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014)

2017-12-11 16:36:38 -08:00