mwerezak 4951790b50 Fixes missing cooldowns, missing cult blade sound. ...

Conflicts:
	code/game/objects/items/weapons/material/kitchen.dm

2016-04-22 04:58:25 -04:00

..

admin

Merge branch 'master' into cleanupTwo

2016-04-21 11:41:32 +03:00

alarm

Camera fixes and performance tweaks.

2016-03-21 17:30:52 -04:00

assembly

Construction Update

2016-03-25 16:02:36 -04:00

awaymissions

…

blob

Mulebots are now mobs

2016-02-02 17:51:50 +03:00

client

Merge pull request #1451 from SinTwo/minimalist-ui

2016-04-20 13:22:55 +01:00

clothing

Fixes missing cooldowns, missing cult blade sound.

2016-04-22 04:58:25 -04:00

customitems

Ports Byond 510 preperations from Bay

2016-03-14 18:21:44 +00:00

detectivework

Merge branch 'master' into cleanupTwo

2016-04-21 11:41:32 +03:00

economy

Merge branch 'master' into cleanupTwo

2016-04-21 11:41:32 +03:00

events

Construction Update

2016-03-25 16:02:36 -04:00

examine

Merge pull request #938 from Neerti/2/8/2016_stasis_bag_cleanup_and_buffs

2016-02-09 16:05:08 +00:00

ext_scripts

…

flufftext

Ports Byond 510 preperations from Bay

2016-03-14 18:21:44 +00:00

food

…

games

Construction Update

2016-03-25 16:02:36 -04:00

genetics

…

ghosttrap

Changes types of ghosts and eyes

2016-02-20 15:36:05 +03:00

holodeck

Refactors various item attack() implementations

2016-04-22 04:57:22 -04:00

hydroponics

Refactors bottle smashing, apply_hit_effect() now returns the blocked status.

2016-04-22 04:57:23 -04:00

icon generation

…

library

Fixes missing cooldowns, missing cult blade sound.

2016-04-22 04:58:25 -04:00

lighting

…

maps

Fixes issues travis found

2016-03-11 11:59:51 +03:00

materials

Merge pull request #1229 from SinTwo/construction_update

2016-03-26 15:45:19 -04:00

mining

Merge branch 'master' into cleanupTwo

2016-04-21 11:41:32 +03:00

mob

Refactors bottle smashing, apply_hit_effect() now returns the blocked status.

2016-04-22 04:57:23 -04:00

multiz

…

nano

Updates NanoUI map.

2016-03-30 15:02:42 +01:00

organs

Merge branch 'master' into cleanupTwo

2016-04-21 11:41:32 +03:00

overmap

…

paperwork

Merge branch 'master' into cleanupTwo

2016-04-21 11:41:32 +03:00

power

Merge pull request #1470 from Hubblenaut/smes

2016-04-21 21:09:42 -04:00

projectiles

Fixes missing cooldowns, missing cult blade sound.

2016-04-22 04:58:25 -04:00

random_map

Merge pull request #1027 from Kelenius/mobCleanup

2016-03-18 13:50:47 -04:00

reagents

Fixes missing cooldowns, missing cult blade sound.

2016-04-22 04:58:25 -04:00

recycling

Construction Update

2016-03-25 16:02:36 -04:00

research

Merge pull request #1414 from Mark9013100/4/15/2016tank_grammar

2016-04-20 13:23:51 +01:00

scripting

Ports Byond 510 preperations from Bay

2016-03-14 18:21:44 +00:00

security levels

Construction Update

2016-03-25 16:02:36 -04:00

shieldgen

…

shuttles

Removed the Vox Pox.

2016-02-20 11:24:19 +10:30

spells

Mob inventory cleanup

2016-03-24 01:23:08 +03:00

supermatter

Mob inventory cleanup

2016-03-24 01:23:08 +03:00

surgery

Merge branch 'master' into cleanupTwo

2016-04-21 11:41:32 +03:00

tables

…

vehicles

Mob inventory cleanup

2016-03-24 01:23:08 +03:00

virus2

Fixes #1171

2016-03-21 14:22:44 +03:00

xgm

Revert "Revert "Bay update.""

2016-02-07 16:33:30 +10:30