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

..

alien

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

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

brain

Makes projectile non dense. Projectile hitting a dense obj/turf will now also hit one of the mob sitting on that turf/obj's turf.

2015-04-01 20:59:42 +02:00

human

* Fixes observers not seeing abductor hivemind

2015-04-16 12:15:41 +02:00

monkey

Remove SpeciesCanConsume() proc, replaced by iscarbon checks.

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

carbon_defense.dm

Merge pull request #8551 from MrPerson/surgery_fun_removal

2015-03-27 11:52:00 -07:00

carbon_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

carbon.dm

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

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

death.dm

slime from carbon to simple animal

2015-03-14 23:40:57 +01:00

emote.dm

Moves chat toggles into their own variable.

2015-03-05 18:38:07 +01:00

inventory.dm

Fixes Hat removal code by reticking carbon/inventory and moving carbon inventory code back there. (Mystery coder who undid this, Curse you!)

2015-03-29 14:45:09 +01:00

life.dm

- Adds generic action and action buttons system

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

say.dm

HAAAWWWW!! Fixed #4753

2014-09-13 13:33:18 +02:00

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