xxalpha 22474094ae Merge remote-tracking branch 'upstream/master' into hot_or_not ...

Conflicts:
	code/modules/mob/living/simple_animal/simple_animal.dm

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

..

glasses

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

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

gloves

RemieRichards wins the technical code semantics fight today

2015-07-30 17:55:35 -04:00

head

removes a bunch of .0

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

masks

removes a bunch of .0

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

outfits

Admin equipment & ERT outfits

2015-09-07 01:06:09 +02:00

shoes

Merge pull request #11787 from bgobandit/theywanttherandd

2015-09-19 14:20:09 +01:00

spacesuits

MinorAntagArmourBuff

2015-09-09 12:00:46 +08:00

suits

SecBioSuit

2015-09-22 23:17:49 +08:00

under

Merge remote-tracking branch 'tgstation/master' into point-zero

2015-09-12 21:07:40 +09:00

cloaks.dm

FEATURES SIX AND SEVEN: Suicide msg's and cloaks

2015-06-10 14:17:38 -04:00

clothing.dm

removes a bunch of .0

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