PsiOmega 5e84bfa57c Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/modules/clothing/spacesuits/rig/suits/ert.dm

2015-05-30 15:59:54 +02:00

..

admin

Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into newmalf-merge

2015-05-22 21:01:26 +02:00

alarm

…

assembly

…

awaymissions

…

client

Adds engineering workboots

2015-05-23 23:00:26 -04:00

clothing

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

2015-05-30 15:59:54 +02:00

customitems

…

detectivework

…

economy

…

events

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

2015-05-30 15:59:54 +02:00

examine

…

ext_scripts

…

flufftext

…

food

…

games

…

genetics

…

holodeck

…

hydroponics

Cleanup

2015-05-30 05:35:00 +09:30

icon generation

…

library

…

lighting

…

liquid

…

maps

…

materials

Fixes #9414

2015-05-30 03:15:19 +09:30

mining

Rebalancing and adjusting divisors for all weapon damage values.

2015-05-17 16:51:55 +09:30

mob

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

2015-05-30 15:59:54 +02:00

nano

Merge pull request #9554 from GinjaNinja32/nano_template

2015-05-30 02:16:32 +09:30

organs

Fixes #8929

2015-05-30 04:38:41 +09:30

overmap

…

paperwork

More consistent logging via admin_inject_log proc

2015-05-29 16:57:42 +01:00

power

Merge pull request #9549 from atlantiscze/bright-solution

2015-05-30 02:11:10 +09:30

projectiles

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

2015-05-22 08:26:13 +02:00

random_map

…

reagents

More consistent logging via admin_inject_log proc

2015-05-29 16:57:42 +01:00

recycling

…

research

Merge pull request #9553 from GinjaNinja32/reagent_protection

2015-05-30 13:57:31 +09:30

scripting

…

security levels

…

shieldgen

Implements github suggestions

2015-05-23 22:22:38 +02:00

shuttles

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

2015-05-30 15:59:54 +02:00

spells

…

supermatter

…

surgery

Merge with dev.

2015-05-20 13:39:31 +09:30

tables

Fixes IV stands blocking bullets

2015-05-26 23:05:38 -04:00

vehicles

Merge pull request #9390 from mwerezak/attack-animation

2015-05-21 06:52:30 +02:00

virus2

…