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

Conflicts:
	code/modules/hydroponics/seed_mobs.dm
	code/modules/materials/materials.dm

2015-07-09 08:45:49 +02:00

..

admin

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

2015-07-09 08:45:49 +02:00

alarm

…

assembly

…

awaymissions

…

client

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

2015-07-08 09:11:47 +02:00

clothing

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

2015-07-09 08:45:49 +02:00

customitems

Revert "[DNM] Makes custom items use the host item's inhand sprites if none are provided, knife fixes"

2015-07-07 17:14:42 +02:00

detectivework

Merge with dev-freeze.

2015-06-21 20:45:47 +09:30

economy

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

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

events

Merge with dev-freeze.

2015-06-21 20:45:47 +09:30

examine

…

ext_scripts

(probably) fixes an issue where the server hangs at roundstart if the IRC bot doesn't respond properly

2015-06-28 11:43:53 +01: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-07-09 08:45:49 +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-07-09 08:45:49 +02:00

mining

Merge with dev-freeze.

2015-06-21 20:45:47 +09:30

mob

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

2015-07-09 08:45:49 +02:00

nano

Fixes antags being able to see the appearance changer.

2015-06-21 21:12:28 +02:00

organs

Merge pull request #9812 from PsiOmegaDelta/150614-MakingYourLifeEvenEasierApplyDirectlyToForehead

2015-06-28 20:20:49 +09:30

overmap

…

paperwork

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

2015-06-26 20:28:47 +02:00

power

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

2015-07-01 22:46:40 +02:00

projectiles

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

2015-07-06 18:33:09 +02:00

random_map

…

reagents

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

2015-06-26 20:28:47 +02:00

recycling

Fixes disposal bins filling instantly

2015-06-24 22:09:47 -04:00

research

Merge with dev-freeze.

2015-07-02 19:04:01 +09:30

scripting

…

security levels

…

shieldgen

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

2015-07-06 18:33:09 +02:00

shuttles

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

2015-06-26 20:28:47 +02:00

spells

Merge with dev-freeze.

2015-06-21 20:45:47 +09:30

supermatter

Merge with dev-freeze.

2015-07-02 19:04:01 +09:30

surgery

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

2015-06-26 20:28:47 +02:00

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

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

2015-06-26 20:28:47 +02:00