Neerti 91dd3348c5 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 2/2/2017_planet_stuff ...

# Conflicts:
#	code/modules/mob/living/carbon/human/human_movement.dm

2017-02-20 19:06:25 -05:00

..

admin

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 2/2/2017_planet_stuff

2017-02-20 19:06:25 -05:00

alarm

…

assembly

Signaler QoL Improvement - Method to copy setup from one signaler to another

2017-02-05 15:06:28 -05:00

awaymissions

Returns the Vox, who now breath Phoron

2017-01-06 17:49:39 -06:00

blob

…

client

Fixes custom loadout and slot system.

2017-02-02 15:37:27 -05:00

clothing

Further tweaks to Vox and their toys

2017-02-01 21:43:21 -06:00

customitems

…

detectivework

…

economy

…

error_handler

…

events

Merge pull request #2922 from Anewbe/crate_event

2017-01-15 18:17:02 -05:00

examine

…

ext_scripts

…

flufftext

…

food

…

gamemaster

Continues work on new Event System

2017-01-29 19:32:20 -05:00

games

Moves languages to use more defines. Redoes Diona splitting

2017-01-14 22:47:12 -06:00

genetics

…

ghosttrap

…

holodeck

…

hydroponics

Merge pull request #2929 from Anewbe/taste

2017-01-28 21:06:21 -06:00

icon generation

…

integrated_electronics

Merge pull request #2965 from Neerti/1/28/17_magnets_how_do_they_work

2017-01-28 14:03:51 -06:00

library

…

lighting

…

maps

…

materials

More stuff, finalizes it I hope.

2017-02-20 18:28:31 -05:00

metric

…

mining

QoL on abandoned crate puzzle

2017-02-10 00:14:10 +00:00

mob

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 2/2/2017_planet_stuff

2017-02-20 19:06:25 -05:00

multiz

…

nano

…

organs

Merge pull request #2947 from Anewbe/surgery_things

2017-01-21 22:38:25 -05:00

overmap

…

paperwork

Fixes dragging clothing with storage onto an occupied hand

2017-02-09 14:49:13 -05:00

planet

More stuff, finalizes it I hope.

2017-02-20 18:28:31 -05:00

power

Further tweaks to Vox and their toys

2017-02-01 21:43:21 -06:00

projectiles

Merge pull request #2996 from MagmaRam/gunshow

2017-02-14 17:00:28 -06:00

random_map

if you don't rename all of something, bad things happen m'kay kids

2017-02-04 15:46:03 +00:00

reagents

Merge pull request #2989 from MagmaRam/sandwich

2017-02-09 21:24:03 -06:00

recycling

…

research

Surgical tools will no longer cause damage on help intent

2017-01-21 18:34:05 -06:00

scripting

…

security levels

…

shieldgen

…

shuttles

…

spells

…

supermatter

…

surgery

Surgical tools will no longer cause damage on help intent

2017-01-21 18:34:05 -06:00

tables

…

vehicles

…

ventcrawl

…

virus2

…

xenoarcheaology

Surgical tools will no longer cause damage on help intent

2017-01-21 18:34:05 -06:00

xenobio2

Xenotaser should work now

2017-01-18 17:47:38 -06:00

xgm

…