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

..

combat

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

2014-11-04 18:24:52 +01:00

equipment

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

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

medical

Includes antag HUDs in the datum hud overhaul

2014-11-20 15:43:51 -03:00

working

A lot of stuff

2015-03-31 18:30:09 +12:00

mech_bay.dm

attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.

2015-02-19 13:02:43 +00:00

mech_fabricator.dm

attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.

2015-02-19 13:02:43 +00:00

mecha_construction_paths.dm

Phazon construction nerf

2015-03-30 13:38:31 -04:00

mecha_control_console.dm

bitch says she wanna keep her throat warm

2015-03-26 21:16:25 -05:00

mecha_parts.dm

attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.

2015-02-19 13:02:43 +00:00

mecha_wreckage.dm

attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.

2015-02-19 13:02:43 +00:00

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