Mark9013100 488ebc89b2 Balances fm-t2, nerfs burstfire ...

Conflicts:
	code/modules/projectiles/guns/projectile/automatic.dm

2015-10-11 00:42:26 -04:00

..

admin

Merge pull request #11257 from Karolis2011/map_capture

2015-10-09 11:35:54 +01:00

alarm

…

assembly

…

awaymissions

…

blob

Fixes a minor blob issue, adds mecha attack message

2015-10-07 10:49:24 +03:00

client

TG_Port_2

2015-10-11 00:36:13 -04:00

clothing

Fixes an issue with helmet visors

2015-10-11 00:40:11 -04:00

customitems

…

detectivework

Merges f-card box and evidence bag box

2015-10-11 00:41:46 -04:00

economy

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

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

events

Updates blob

2015-10-05 18:10:16 +03:00

examine

…

ext_scripts

…

flufftext

…

food

…

games

…

genetics

…

ghosttrap

…

holodeck

Updates blob

2015-10-05 18:10:16 +03:00

hydroponics

[BOTANY] Seed Fixes

2015-10-11 00:27:49 -04:00

icon generation

…

library

…

lighting

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

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

liquid

…

maps

…

materials

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 9/6/2015_baymerge

2015-09-06 18:26:06 -04:00

mining

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into sync_to_bay_10/10/2015

2015-10-10 23:17:26 -04:00

mob

Adds socks.

2015-10-11 00:13: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

Updates blob

2015-10-05 18:10:16 +03:00

power

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into sync_to_bay_10/10/2015

2015-10-10 23:17:26 -04:00

projectiles

Balances fm-t2, nerfs burstfire

2015-10-11 00:42:26 -04:00

random_map

…

reagents

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into sync_to_bay_10/10/2015

2015-10-10 23:17:26 -04:00

recycling

fix #10882

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

research

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into sync_to_bay_10/10/2015

2015-10-10 23:17:26 -04:00

scripting

…

security levels

…

shieldgen

Updates blob

2015-10-05 18:10:16 +03:00

shuttles

…

spells

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

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

supermatter

…

surgery

…

tables

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 9/6/2015_baymerge

2015-09-06 18:26:06 -04:00

vehicles

Updates blob

2015-10-05 18:10:16 +03:00

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

…