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

..

admin

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

2015-09-27 13:48:33 +02:00

alarm

…

assembly

Non-headset/borg radios now all allow access to department channels. Headset and borg radios still rely on their encryption keys.

2015-09-03 09:38:15 +02:00

awaymissions

…

client

Adds language prefix reset option.

2015-09-18 21:42:02 +02:00

clothing

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

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

customitems

…

detectivework

…

economy

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

2015-09-12 13:10:29 +02:00

events

Meteor events are now direction biased.

2015-09-18 21:45:15 +02:00

examine

…

ext_scripts

…

flufftext

…

food

…

games

…

genetics

…

ghosttrap

…

holodeck

Refactors various item attack() implementations

2015-09-08 23:39:33 -04:00

hydroponics

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

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

icon generation

…

library

Fixes missing cooldowns, missing cult blade sound.

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

lighting

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

2015-09-18 08:51:10 +02:00

liquid

…

maps

…

materials

…

mining

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

2015-09-11 08:54:03 +02:00

mob

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

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

multiz

Turf initialization tweaking.

2015-09-27 13:18:18 +02:00

nano

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

2015-09-29 11:52:48 +02:00

organs

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

2015-09-11 08:54:03 +02:00

overmap

…

paperwork

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

2015-09-27 13:48:33 +02:00

power

Destroy tweaks.

2015-09-25 10:44:23 +02:00

projectiles

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

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

random_map

…

reagents

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

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

recycling

fix #10882

2015-09-16 14:34:20 +03:00

research

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

2015-10-04 17:41:02 +02:00

scripting

…

security levels

…

shieldgen

…

shuttles

…

spells

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

2015-09-27 13:48:33 +02:00

supermatter

…

surgery

…

tables

…

vehicles

Merge pull request #10672 from mwerezak/frag-grenade

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

virus2

Makes internal radiation sources also use apply_effect(), by utilizing the ability to ignore radiation protection.

2015-09-26 09:19:58 +02:00

xgm

…