Hornygranny 02e527e938 Merge branch 'smoothaliens' ...

Conflicts:
	code/_onclick/hud/screen_objects.dm
	code/modules/mob/living/carbon/alien/alien.dm

2014-09-07 21:33:48 -07:00

..

_defines.dm

Merge branch 'smoothaliens'

2014-09-07 21:33:48 -07:00

ai.dm

Silicon Medical and Security HUDs!

2014-08-21 22:59:30 -05:00

alien_larva.dm

more icons for stuff, nightvision for aliens with hud icon button and toggle verb

2014-08-27 15:16:28 -07:00

alien.dm

more icons for stuff, nightvision for aliens with hud icon button and toggle verb

2014-08-27 15:16:28 -07:00

hud.dm

more icons for stuff, nightvision for aliens with hud icon button and toggle verb

2014-08-27 15:16:28 -07:00

human.dm

Initial pass to convert LF to CRLF

2014-03-24 08:53:40 +00:00

monkey.dm

* Added a "stop pulling" button to monkeys and alien larva

2014-05-28 16:28:53 +02:00

other_mobs.dm

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

2014-07-07 13:42:31 -04:00

robot.dm

Giacom's suggestions + Borg HUD tweak

2014-09-02 18:32:06 -05:00

screen_objects.dm

Merge branch 'smoothaliens'

2014-09-07 21:33:48 -07:00