phil235 6807b1ae48 Merge branch 'master' of https://github.com/tgstation/-tg-station into AlienNestPixelFix ...

Conflicts:
	code/modules/mob/living/carbon/alien/humanoid/humanoid.dm

2015-04-16 23:44:12 +02:00

..

humanoid

woops

2015-04-14 20:30:02 +02:00

larva

Fixes broken ui action button for toggling chef apron's sleeves and owl's wings.

2015-04-14 13:54:36 +02:00

special

Remove SpeciesCanConsume() proc, replaced by iscarbon checks.

2015-04-11 22:16:42 +02:00

alien_defense.dm

More work on slime procs.

2015-03-21 16:37:37 +01:00

alien.dm

Fixes alien nest overlay appearing above standing mobs. Also fixes lying mobs appearing in front of standing mobs.

2015-04-14 14:55:05 +02:00

death.dm

* Refactored gib() and dust()

2013-12-23 17:56:58 +00:00

life.dm

- Turns alien abilites into proc holders

2015-04-08 16:56:43 +02:00

login.dm

Alien Icon Fixed and revamped

2014-08-01 04:16:43 +08:00

logout.dm

Alien Icon Fixed and revamped

2014-08-01 04:16:43 +08:00

say.dm

Revert "Changes a few green crosses to blue on sprites that I missed last time"

2014-10-04 19:22:10 -05:00

screen.dm

Larvas won't try to use their non-existant plasma display and runtime to hell anymore.

2013-11-29 08:33:24 -03:00