mwerezak 087a978d56 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into clickcooldown ...

Conflicts:
	code/_onclick/click.dm
	code/_onclick/telekinesis.dm
	code/game/objects/items.dm
	code/game/objects/structures/grille.dm
	code/game/turfs/simulated/walls.dm
	code/modules/mob/living/carbon/resist.dm
	code/modules/mob/living/simple_animal/simple_animal.dm

2015-06-28 22:35:14 -04:00

..

admin

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

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

alarm

…

assembly

…

awaymissions

…

client

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

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

clothing

Compilation fixes.

2015-06-26 20:33:55 +02:00

customitems

…

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

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 branch 'dev' of https://github.com/Baystation12/Baystation12 into clickcooldown

2015-06-28 22:35:14 -04: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-26 20:28:47 +02:00

mining

Merge with dev-freeze.

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

mob

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into clickcooldown

2015-06-28 22:35:14 -04: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 resolution.

2015-06-28 06:13:24 +09:30

projectiles

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into clickcooldown

2015-06-28 22:35:14 -04:00

random_map

…

reagents

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into clickcooldown

2015-06-28 22:35:14 -04:00

recycling

Fixes disposal bins filling instantly

2015-06-24 22:09:47 -04: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

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 pull request #9694 from PsiOmegaDelta/150605-Meteors

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

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