Lo6a4evskiy 98e04ca52e Merge remote-tracking branch 'upstream/master' into Armor_stripping_delay ...

Conflicts:
	code/modules/clothing/spacesuits/miscellaneous.dm

2014-10-08 16:45:22 +04:00

..

camera

…

dead

Revert "Changes a few green crosses to blue on sprites that I missed last time"

2014-10-04 19:22:10 -05:00

living

Merge remote-tracking branch 'upstream/master' into Armor_stripping_delay

2014-10-08 16:45:22 +04:00

new_player

Merge pull request #4900 from MrStonedOne/erroageinjudgement

2014-09-26 23:41:37 +01:00

death.dm

…

inventory.dm

…

login.dm

Removing many instances of the no longer used second argument of message_admins() proc.

2014-10-05 01:29:30 +02:00

logout.dm

…

mob_cleanup.dm

…

mob_defines.dm

The rest of the junk

2014-09-05 18:14:02 +04:00

mob_grab.dm

Fixes two runtimes related to the grab object.

2014-09-12 06:39:31 -03:00

mob_helpers.dm

Removing many instances of the no longer used second argument of message_admins() proc.

2014-10-05 01:29:30 +02:00

mob_movement.dm

PASSMOB created

2014-09-18 12:24:11 -07:00

mob_transformation_simple.dm

The rest of the junk

2014-09-05 18:14:02 +04:00

mob.dm

Merge to master - sole conflicting file was ninja.dm FUCK NINJAS

2014-10-04 01:45:39 -07:00

say_readme.dm

The rest of the junk

2014-09-05 18:14:02 +04:00

say.dm

Revert "Changes a few green crosses to blue on sprites that I missed last time"

2014-10-04 19:22:10 -05:00

transform_procs.dm

Makes Robotize() work properly again. Fixed #4834

2014-09-15 18:01:26 +02:00

update_icons.dm

…