DZD 3939abaf5d Fix Conflicts and Sync with Upstream ...

Fixes conflict in icons/obj/gun.dmi by importing sprites added by #172

2015-01-16 17:07:22 -05:00

..

camera

…

dead

…

living

Fix Conflicts and Sync with Upstream

2015-01-16 17:07:22 -05:00

new_player

Major map overhaul, remove customs officer/nanotrasen recruiter

2015-01-12 02:23:45 +01:00

spirit

…

abilities.dm

Properly Removes Slime Person Ventcrawl

2014-12-10 21:45:05 -05:00

death.dm

…

emote.dm

…

holder.dm

…

inventory.dm

…

language.dm

Bot fixes, disease runtime fix, vending menu fix

2014-12-02 19:46:34 +01:00

login.dm

…

logout.dm

…

mob_cleanup.dm

…

mob_defines.dm

Healthdoll

2014-12-14 16:43:06 -05:00

mob_grab.dm

…

mob_helpers.dm

Xenos gamemode rework

2014-12-13 02:08:22 +01:00

mob_movement.dm

Tweaking of Movement Speed

2015-01-16 15:28:03 -05:00

mob_transformation_simple.dm

…

mob.dm

Bug fixes

2015-01-08 02:16:09 +01:00

say.dm

…

transform_procs.dm

Bug fixes

2015-01-08 02:16:09 +01:00

update_icons.dm

…