MrPerson 24dcf08b2e Merge branch 'master' of https://github.com/tgstation/-tg-station into alert_alert_ur_a_faget ...

Conflicts:
	code/modules/mob/living/carbon/alien/humanoid/life.dm
	code/modules/mob/living/carbon/alien/larva/life.dm
	code/modules/mob/living/carbon/alien/life.dm
	code/modules/mob/living/carbon/monkey/life.dm
	icons/mob/screen_alien.dmi

2015-03-02 12:04:38 -08:00

..

secure

Merge pull request #7726 from xxalpha/traymesons

2015-03-02 19:24:06 +01:00

coffin.dm

More file structuring.

2012-09-05 22:44:48 +00:00

crittercrate.dm

Fixes the horrible injustice of getting too many pets

2015-02-14 23:54:20 -05:00

fireaxe.dm

attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.

2015-02-19 13:02:43 +00:00

fitness.dm

Adds purple shorts.

2015-02-04 01:23:58 -06:00

gimmick.dm

reverts some sechailer and other feature things

2014-12-13 00:09:58 -08:00

job_closets.dm

Merge pull request #6634 from paprka/chefuniform

2014-12-30 03:45:13 -03:00

l3closet.dm

Removed hilarious but useless sleep() in closets/boxes New()

2014-11-10 01:59:32 +01:00

malfunction.dm

Removed hilarious but useless sleep() in closets/boxes New()

2014-11-10 01:59:32 +01:00

statue.dm

On screen alert system

2015-03-01 17:31:26 -08:00

syndicate.dm

updates to ERT stuff

2015-02-02 03:33:37 -08:00

utility_closets.dm

Repath all non jetpack tank types to tank/internals

2015-02-01 18:25:39 +00:00

wardrobe.dm

Merge pull request #8055 from xxalpha/xxmas

2015-03-01 20:04:52 -06:00