PsiOmega cee5f1a057 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/game/objects/items.dm

2015-07-06 18:33:09 +02:00

..

_defines.dm

Ported action button system from Paradise/tg

2015-06-02 17:17:13 +09:30

action.dm

Used some defines. No idea if this is what they are for but they have the same values #yolo

2015-06-02 17:20:10 +09:30

alien_larva.dm

…

hud.dm

Merge remote-tracking branch 'upstream/dev' into span_class=notice

2015-06-02 17:33:20 +01:00

human.dm

Ported action button system from Paradise/tg

2015-06-02 17:17:13 +09:30

monkey.dm

Adds a toggle for allowing a target to use a radio (handheld or headset.)

2015-04-03 17:42:16 -04:00

movable_screen_objects.dm

Ported action button system from Paradise/tg

2015-06-02 17:17:13 +09:30

other_mobs.dm

Ports /vg/'s Nas-Sie remake.

2015-04-12 16:19:16 +02:00

robot.dm

Merge remote-tracking branch 'upstream/master' into dev-freeze

2015-07-06 17:31:41 +02:00

screen_objects.dm

Ported action button system from Paradise/tg

2015-06-02 17:17:13 +09:30

spell_screen_objects.dm

Ports /vg/'s spell system for the sake of cult porting.

2015-04-09 20:08:06 +02:00