Remie Richards 97de4b2ebe Merge branch 'master' of https://github.com/tgstation/-tg-station into HandOfGod-Resurgence ...

Conflicts:
	code/modules/mob/living/simple_animal/guardian/guardian.dm
	icons/mob/head.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/suits.dmi
	icons/obj/storage.dmi

2015-10-07 22:24:53 +01:00

..

admin

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

2015-10-07 22:24:53 +01:00

assembly

Merge remote-tracking branch 'upstream/master' into hot_or_not

2015-09-24 03:14:04 +01:00

awaymissions

fixes #11870; removes every last out of place del() call or definition

2015-10-04 08:03:04 -06:00

client

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

2015-10-07 22:24:53 +01:00

clothing

Merge pull request #12083 from KorPhaeron/candycornvampire

2015-10-07 13:36:35 +02:00

crafting

…

detectivework

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

2015-09-19 22:34:30 +02:00

emoji

…

events

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

2015-10-07 22:24:53 +01:00

flufftext

…

food&drinks

Implements hunger drain + changelog

2015-09-29 23:12:45 -04:00

games

…

holiday

…

html_interface

…

hydroponics

Replaced /proc/is_sharp() with /obj/item/proc/is_sharp().

2015-09-24 03:08:28 +01:00

library

removes a bunch of .0

2015-09-10 20:57:30 +09:00

lighting

…

mining

VOMIT GENERALIZATION

2015-10-04 17:09:07 -04:00

mob

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

2015-10-07 22:24:53 +01:00

nano

…

ninja

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

2015-10-07 22:24:53 +01:00

paperwork

Replaced refactored is_hot() to be an atom proc.

2015-09-24 01:12:38 +01:00

power

Disables gravgen rad pulses showing up in asay/logs

2015-09-30 13:39:10 -04:00

procedural mapping

…

projectiles

Merge pull request #12137 from Xhuis/sleeping_carp_buff_2_please_dont_ban_me_from_the_repo

2015-10-07 22:25:11 +03:00

reagents

fixes #12143

2015-10-04 07:33:32 -06:00

recycling

Merge pull request #11899 from kingofkosmos/altclickrotatepipe

2015-09-24 01:59:04 +03:00

research

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

2015-10-07 22:24:53 +01:00

security levels

removes a bunch of .0

2015-09-10 20:57:30 +09:00

shuttle

…

space transition

Use defines instead of magic

2015-09-08 21:58:05 +03:00

surgery

Organs update 3

2015-09-25 22:26:15 +03:00

telesci

removes a bunch of .0

2015-09-10 20:57:30 +09:00