MrPerson 24dcf08b2e Merge branch 'master' of https://github.com/tgstation/-tg-station into alert_alert_ur_a_faget ...

Conflicts:
	code/modules/mob/living/carbon/alien/humanoid/life.dm
	code/modules/mob/living/carbon/alien/larva/life.dm
	code/modules/mob/living/carbon/alien/life.dm
	code/modules/mob/living/carbon/monkey/life.dm
	icons/mob/screen_alien.dmi

2015-03-02 12:04:38 -08:00

..

_defines.dm

On screen alert system

2015-03-01 17:31:26 -08:00

ai.dm

Turns /obj/screen/Click() into subtypes

2014-10-30 15:49:38 -04:00

alert.dm

On screen alert system

2015-03-01 17:31:26 -08:00

alien_larva.dm

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

2015-03-02 12:04:38 -08:00

alien.dm

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

2015-03-02 12:04:38 -08:00

drones.dm

Revert "Adds mouse pointers for different ui styles"

2014-12-31 02:17:50 -03:00

hud.dm

On screen alert system

2015-03-01 17:31:26 -08:00

human.dm

On screen alert system

2015-03-01 17:31:26 -08:00

monkey.dm

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

2015-03-02 12:04:38 -08:00

movable_screen_objects.dm

Prevents movable and snap UI elements from being placed outside the screen region, resulting in runtimes.

2015-02-06 22:37:18 +00:00

other_mobs.dm

Fixes a lot of duplicated code in life and its subprocs for carbon mobs.

2015-02-21 00:37:04 +01:00

robot.dm

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

2015-03-02 12:04:38 -08:00

screen_objects.dm

remember to test your fixes before you act snarky

2015-02-27 04:35:46 -08:00