HarpyEagle 7f066065d3 Merge remote-tracking branch 'upstream/dev' into attack-cleanup2 ...

Conflicts:
	code/modules/mob/living/simple_animal/friendly/spiderbot.dm
	code/modules/mob/living/simple_animal/simple_animal.dm

2015-10-05 19:20:33 -04:00

..

effects

Merge pull request #10672 from mwerezak/frag-grenade

2015-09-07 14:12:27 +09:30

items

Merge remote-tracking branch 'upstream/dev' into attack-cleanup2

2015-10-05 19:20:33 -04:00

random

Final tweaks to recipe availability and material inheritance.

2015-05-17 18:22:21 +09:30

structures

Merge remote-tracking branch 'upstream/dev' into attack-cleanup2

2015-10-05 19:20:33 -04:00

buckling.dm

Fixes beds occasionally buckling in odd directions

2015-09-19 15:27:24 +02:00

empulse.dm

Merge remote-tracking branch 'upstream/master' into dev-freeze

2015-08-11 08:21:06 +02:00

explosion_recursive.dm

Merge resolution.

2015-05-11 11:47:24 +09:30

explosion.dm

Multi-Z.

2015-08-30 14:15:20 -07:00

items.dm

Fixes missing cooldowns, missing cult blade sound.

2015-09-09 15:15:43 -04:00

objs.dm

Moves nanomanager.close_uis(src) into datum/proc/Destroy() instead of /obj/Destroy() now that NanoUI supports datums.

2015-09-08 08:32:09 +02:00

structures.dm

Ports /tg/'s meteor implementation.

2015-06-05 14:58:35 +02:00

weapons.dm

…