Perakp 9f43935f89 Trying to fix mob.dm merge conflicts ...

I’ll do this over and over again until it works

2014-02-19 00:28:22 +02:00

..

camera

* Telescience now works on bluespace crystals, which are special crystals which unlock power settings from the telescience computer.

2013-11-12 14:24:56 +00:00

dead

Made the follow verb less buggy.

2014-01-05 17:44:46 +00:00

living

Merge to master

2014-02-18 23:59:59 +02:00

new_player

Removed the icon color blend operations from human's update_icons().

2014-01-16 14:33:50 +00:00

death.dm

* Refactored gib() and dust()

2013-12-23 17:56:58 +00:00

inventory.dm

u_equip is now called unEquip PANIC

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

login.dm

Moved Login/Logout to their defined files

2014-01-06 21:25:10 -05:00

logout.dm

Whoops

2014-01-06 21:27:50 -05:00

mob_cleanup.dm

Viral fix

2013-12-27 17:43:26 +12:00

mob_defines.dm

Merge to master

2014-02-18 23:59:59 +02:00

mob_grab.dm

* Monkeys no longer wonder off when being pulled or grabbed.

2013-12-19 20:41:19 +00:00

mob_helpers.dm

Slime Mob Refactor

2014-01-13 19:38:37 -05:00

mob_movement.dm

Speeds up walking from 7 delay to 4. Removes the hardcoded walk/running delays, and uses the config options instead.

2014-01-19 19:44:11 +00:00

mob_transformation_simple.dm

…

mob.dm

Trying to fix mob.dm merge conflicts

2014-02-19 00:28:22 +02:00

say.dm

…

transform_procs.dm

DONT PANIC DONT PANIC DONT PANIC

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

update_icons.dm

update_icons() uses animate() and transforms to actually turn the sprite rather than needing them pre-turned. Mobs that lie down do so with an animation rather than appearing on their side. You can lie down facing THE LEFT OH SHIT.

2013-12-23 02:19:15 -08:00