SamCroswell 5bb63a7f63 Merge Conflict Resolution ...

Conflicts:
	icons/obj/clothing/gloves.dmi

2015-03-08 15:59:20 -04:00

..

camera

…

dead

Remove qdel from ghost images, clarify qdel debug, nanoUI runtime fix

2015-03-04 15:09:12 +01:00

living

Merge Conflict Resolution

2015-03-08 15:59:20 -04:00

new_player

Merge pull request #435 from ZomgPonies/fixuns

2015-02-27 18:22:35 +01:00

spirit

…

abilities.dm

…

death.dm

…

emote.dm

Emote Cooldown System

2015-02-25 01:14:06 -05:00

hear_say.dm

Revert "Revert "Saycode/language/species port from Bay""

2015-02-20 17:46:35 +01:00

holder.dm

Adds a "params" parameter to attackby(), so it keeps track of pixel_x and pixel_y among other things

2015-02-22 22:12:11 +01:00

inventory.dm

NODROP flag addition & handling

2015-02-18 13:22:41 -05:00

language.dm

Fix position of robotic talk follow

2015-02-25 20:47:03 +01:00

login.dm

…

logout.dm

…

mob_cleanup.dm

…

mob_defines.dm

Fixing the SSD infinite sleep bug

2015-03-05 13:34:01 -05:00

mob_grab.dm

Standardize mutations

2015-02-22 19:04:43 +01:00

mob_helpers.dm

Removes Space Ninjas

2015-03-02 19:05:44 -05:00

mob_movement.dm

…

mob_transformation_simple.dm

Bug fixes, bot proces controller update

2015-02-24 01:40:43 +01:00

mob.dm

NanoUI synth airlock controller

2015-03-03 04:51:32 +01:00

say.dm

Revert "Revert "Saycode/language/species port from Bay""

2015-02-20 17:46:35 +01:00

transform_procs.dm

Bug fixes, add atmos watertank

2015-02-25 19:47:04 +01:00

typing_indicator.dm

Bug fixes, bot proces controller update

2015-02-24 01:40:43 +01:00

update_icons.dm

…