GunHog bc11259282 Merge remote-tracking branch 'remotes/upstream/master' into AI_STOLE_MY_BIKE ...

Conflicts:
	code/game/machinery/computer/aifixer.dm

2015-06-15 11:27:11 -05:00

..

_defines.dm

- Adds generic action and action buttons system

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

action.dm

- Made hide/show button mesh better

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

ai.dm

Turns /obj/screen/Click() into subtypes

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

alert.dm

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

2015-06-09 03:23:18 -07:00

alien_larva.dm

Moved all pull icon updating to update_icon(), to reduce copy+paste.

2015-03-13 12:10:13 -07:00

alien.dm

- Turns alien abilites into proc holders

2015-04-08 16:56:43 +02:00

drones.dm

Moved all pull icon updating to update_icon(), to reduce copy+paste.

2015-03-13 12:10:13 -07:00

hud.dm

Merge remote-tracking branch 'remotes/upstream/master' into AI_STOLE_MY_BIKE

2015-06-04 08:40:42 -05:00

human.dm

- Adds generic action and action buttons system

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

monkey.dm

Monkeys can now wear hats! Monkeys can now also wear all masks, instead of the select few they had icons for (which have been removed, since they are no longer needed)

2015-03-26 15:23:52 +00:00

movable_screen_objects.dm

- Adds generic action and action buttons system

2015-04-11 17:06:43 +02: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

Moved all pull icon updating to update_icon(), to reduce copy+paste.

2015-03-13 12:10:13 -07:00

screen_objects.dm

- Adds generic action and action buttons system

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