PsiOmegaDelta 405131a54e Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/projectiles/guns/energy/stun.dm
	code/modules/projectiles/guns/projectile/pistol.dm
	code/modules/projectiles/guns/projectile/revolver.dm

2015-06-20 20:40:06 +02:00

..

admin

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

2015-06-16 10:52:33 +02:00

alarm

…

assembly

…

awaymissions

…

client

Moved some stuff from global.dm into defines files that fit the theme, some into files where they are used (and only there, much global). Axed some obsolete stuff (rip Debug var).

2015-06-04 22:51:15 +03:00

clothing

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

2015-06-20 20:40:06 +02:00

customitems

…

detectivework

All the span-corrected dm files.

2015-06-14 22:08:14 +02:00

economy

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

2015-06-20 20:40:06 +02:00

events

Updates emag attackby usages to emag_act where it's not too much of a headache.

2015-06-16 09:34:13 +02:00

examine

Updates chameleon gun help text

2015-06-06 23:26:56 -04:00

ext_scripts

Merge pull request #9857 from GinjaNinja32/bot

2015-06-18 13:46:50 -04:00

flufftext

…

food

…

games

…

genetics

…

ghosttrap

Fixes tiny oversight in ghost trap datum. GG global vars.

2015-06-11 08:38:32 +09:30

holodeck

Updates emag attackby usages to emag_act where it's not too much of a headache.

2015-06-16 09:34:13 +02:00

hydroponics

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

2015-06-16 10:52:33 +02:00

icon generation

…

library

Updates emag attackby usages to emag_act where it's not too much of a headache.

2015-06-16 09:34:13 +02:00

lighting

…

liquid

…

maps

…

materials

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

2015-06-20 20:40:06 +02:00

mining

Updates emag attackby usages to emag_act where it's not too much of a headache.

2015-06-16 09:34:13 +02:00

mob

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

2015-06-20 20:40:06 +02:00

nano

All the span-corrected dm files.

2015-06-14 22:08:14 +02:00

organs

Fixes #9836

2015-06-20 21:43:54 +09:30

overmap

…

paperwork

All the span-corrected dm files.

2015-06-14 22:08:14 +02:00

power

Merge pull request #9826 from PsiOmegaDelta/150615-EmagAct

2015-06-21 01:18:25 +09:30

projectiles

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

2015-06-20 20:40:06 +02:00

random_map

Refactored random map generator system and added several terrain generators.

2015-06-03 04:36:19 +09:30

reagents

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

2015-06-19 10:19:08 +02:00

recycling

Now when welding sorting pipe, game update it's name

2015-06-04 20:48:57 +03:00

research

Updates emag attackby usages to emag_act where it's not too much of a headache.

2015-06-16 09:34:13 +02:00

scripting

…

security levels

…

shieldgen

Updates emag attackby usages to emag_act where it's not too much of a headache.

2015-06-16 09:34:13 +02:00

shuttles

Updates emag attackby usages to emag_act where it's not too much of a headache.

2015-06-16 09:34:13 +02:00

spells

All the span-corrected dm files.

2015-06-14 22:08:14 +02:00

supermatter

Merge pull request #9694 from PsiOmegaDelta/150605-Meteors

2015-06-08 14:17:57 +03:00

surgery

…

tables

Makes standard tables plastic

2015-06-14 13:38:56 -04:00

vehicles

Updates emag attackby usages to emag_act where it's not too much of a headache.

2015-06-16 09:34:13 +02:00

virus2

…

xgm

…