Aranclanos a4a13681f3 Merge branch 'master' of https://github.com/Razharas/-tg-station into ImGonnaStingYa ...

Conflicts:
	code/game/gamemodes/changeling/changeling_powers.dm

2013-12-05 07:01:09 -03:00

..

_defines.dm

Rewrote stings

2013-11-21 20:36:08 +04:00

alien_larva.dm

Click code rework

2013-09-17 18:15:54 -04:00

alien.dm

Moved plasma counter to right. Flipped sprite for it, named Power Display2 in screen_gen.dmi

2013-11-07 00:08:48 -05:00

hud.dm

Rewrote stings

2013-11-21 20:36:08 +04:00

human.dm

Rewrote stings

2013-11-21 20:36:08 +04:00

monkey.dm

Rewrote stings

2013-11-21 20:36:08 +04:00

other_mobs.dm

Click code rework

2013-09-17 18:15:54 -04:00

robot.dm

Click code rework

2013-09-17 18:15:54 -04:00

screen_objects.dm

Merge branch 'master' of https://github.com/Razharas/-tg-station into ImGonnaStingYa

2013-12-05 07:01:09 -03:00