skull132 205ed7ed42 Merge remote-tracking branch 'origin/just-in-case' ...

# Conflicts:
#	code/game/objects/items/weapons/weaponry.dm

Conflict clearance for vampire.

2016-01-28 01:32:20 +02:00

..

admin

Vampire Gamemode Developement Test

2016-01-20 22:14:21 -05:00

alarm

…

assembly

…

awaymissions

…

client

Merge remote-tracking branch 'origin/just-in-case'

2016-01-28 01:32:20 +02:00

clothing

Merge pull request #23 from Ryan784/step-sounds

2016-01-24 23:12:50 +02:00

customitems

…

detectivework

…

economy

…

events

…

examine

…

ext_scripts

…

flufftext

…

food

…

games

…

genetics

…

holodeck

Footstep Sounds + ASFX Tab

2016-01-14 18:28:09 -05:00

hydroponics

Fixes #11489, fixes labels as well

2015-11-20 19:37:00 -05:00

icon generation

…

intern

Interns integration

2016-01-13 18:48:41 +01:00

library

…

lighting

…

liquid

…

maps

…

materials

Fixes #10838

2015-12-10 10:23:49 +10:30

mining

Footstep Sounds + ASFX Tab

2016-01-14 18:28:09 -05:00

mob

Merge remote-tracking branch 'origin/just-in-case'

2016-01-28 01:32:20 +02:00

nano

Fixes the broken Antag Uplink.

2015-12-06 16:24:40 +01:00

organs

Vaurca Update

2016-01-20 19:50:19 +00:00

overmap

…

paperwork

Added a missing update_icon()

2015-12-07 11:27:33 +00:00

power

Merge remote-tracking branch 'Aurorastation/development' into new-engine

2016-01-24 23:25:08 +02:00

projectiles

Lawgiver reinstated

2016-01-14 16:54:26 -05:00

random_map

Fixes #10753

2015-12-10 10:41:48 +10:30

reagents

Merge remote-tracking branch 'origin/just-in-case'

2016-01-28 01:32:20 +02:00

recycling

Fixes #11093

2015-12-11 21:32:00 -07:00

research

Merge pull request #22 from Ryan784/Lawgiver-1.0

2016-01-24 23:12:44 +02:00

scripting

…

security levels

…

shieldgen

…

shuttles

Makes shuttle control consoles sturdier.

2015-11-22 11:37:14 +01:00

spells

Merge remote-tracking branch 'origin/just-in-case'

2016-01-28 01:32:20 +02:00

supermatter

Hallucinations no longer burn on the SuperMatter

2015-12-19 21:33:02 -05:00

surgery

Replaces most instances of if(E & ORGAN_DESTROYED) with if(E.is_stump()). Fixes #11468

2015-12-06 04:17:52 -05:00

tables

…

telesci

…

vehicles

…

virus2

Vampire Gamemode Developement Test

2016-01-20 22:14:21 -05:00