kingofkosmos 7a952b9310 Merge branch 'master' of https://github.com/tgstation/-tg-station into blendershake ...

Conflicts:
	code/modules/food&drinks/kitchen machinery/gibber.dm
	code/modules/food&drinks/kitchen machinery/processor.dm

2015-06-10 20:48:22 +03:00

..

__DEFINES

upgrades the HARDFEET species flag to PIERCEIMMUNE

2015-05-31 18:54:30 -04:00

__HELPERS

Faster get_turf(), by LummoxJr

2015-06-07 17:11:46 +01:00

_globalvars

…

_onclick

Updates more paths, for example obj/stuff to /obj/stuff

2015-05-31 17:48:33 +02:00

ATMOSPHERICS

Updates more paths, for example obj/stuff to /obj/stuff

2015-05-31 17:48:33 +02:00

controllers

Merge pull request #9696 from Incoming5643/why_cant_we_be_friends

2015-06-05 17:16:11 -05:00

datums

Merge pull request #9824 from Incoming5643/all_my_old_shit_breaks_because_of_my_new_shit

2015-06-09 16:07:33 -05:00

game

Merge pull request #9821 from Cheridan/just_cuff_my_shit_up

2015-06-10 01:17:35 +03:00

js

Updates more paths, for example obj/stuff to /obj/stuff

2015-05-31 17:48:33 +02:00

LINDA

Pressure_resistance Tweaks

2015-06-03 23:22:25 -05:00

modules

Merge branch 'master' of https://github.com/tgstation/-tg-station into blendershake

2015-06-10 20:48:22 +03:00

orphaned procs

Updates more paths, for example obj/stuff to /obj/stuff

2015-05-31 17:48:33 +02:00

_compile_options.dm

…

hub.dm

…

world.dm

Merge pull request #9735 from Jordie0608/whyevenhavetwoverbs

2015-06-05 16:43:13 -05:00