Rumia29 600bf077f5 Updated file; fixed conflicts

2014-03-01 15:20:03 -05:00

..

camera

…

dead

…

living

Updated file; fixed conflicts

2014-03-01 15:20:03 -05:00

new_player

…

death.dm

…

inventory.dm

u_equip is now called unEquip PANIC

2014-02-13 20:58:33 +01:00

login.dm

…

logout.dm

…

mob_cleanup.dm

…

mob_defines.dm

Merge pull request #2803 from Rockdtben/SyndCardDesc

2014-02-23 13:46:10 -02:00

mob_grab.dm

…

mob_helpers.dm

…

mob_movement.dm

…

mob_transformation_simple.dm

…

mob.dm

Fixed more NODROP runtimes

2014-02-23 19:34:49 +01:00

say.dm

…

transform_procs.dm

DONT PANIC DONT PANIC DONT PANIC

2014-02-18 18:50:32 +01:00

update_icons.dm

…