Jack Edge aaefe844c1 Merge branch 'master' into my-best-friend-is-a-holocarp ...

Conflicts:
	code/_globalvars/lists/names.dm
	code/modules/mob/living/simple_animal/guardian/types/explosive.dm
	code/modules/mob/living/simple_animal/guardian/types/protector.dm
	code/modules/mob/living/simple_animal/guardian/types/ranged.dm
	code/modules/mob/living/simple_animal/guardian/types/standard.dm
	code/modules/mob/living/simple_animal/guardian/types/support.dm

2016-04-07 22:56:08 +01:00

..

flavor_misc.dm

Brighter ghost hair and new preferences.

2016-03-23 20:41:36 +01:00

mapping.dm

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

2016-01-31 21:12:18 +00:00

mobs.dm

Adds a framework for alternate appearances (override images), the Cardborg costume now makes you look like a real Standard Cyborg

2016-04-02 20:52:00 +01:00

names.dm

Merge branch 'master' into my-best-friend-is-a-holocarp

2016-04-07 22:56:08 +01:00

objects.dm

Nuke Tiles

2016-02-04 09:16:56 -06:00