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

..

carbon

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

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

silicon

Fixes malf powers being broken because canusetopic was never a thing for AIs before this point

2015-04-13 17:40:28 -04:00

simple_animal

Merge pull request #8967 from phil235/BundleFix1

2015-04-16 18:18:53 +10:00

damage_procs.dm

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

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

death.dm

Fixes alien nest not blocking the victim from instantly unbuckling. The victim now needs to click the nest or resist, then wait 2 minutes before being free.

2015-03-28 23:02:44 +01:00

emote.dm

removes feedback msg, fixes checks

2015-03-31 20:13:09 -07:00

life.dm

- Made hide/show button mesh better

2015-04-11 17:06:45 +02:00

living_defense.dm

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

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

living_defines.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

living.dm

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

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

login.dm

…

logout.dm

…

say.dm

Makes the sayspan rewrite not runtime everything to fuck.

2015-03-19 20:42:33 +01:00