Hornygranny 72a8a82c7e Merge remote-tracking branch 'remotes/upstream/master' into OOPgularity ...

Conflicts:
	code/modules/mob/living/living.dm

2014-10-22 13:26:35 -07:00

..

camera

…

dead

Merge branch 'master' of https://github.com/tgstation/-tg-station into DisplacedGirderFix

2014-10-15 18:23:40 +02:00

living

Merge remote-tracking branch 'remotes/upstream/master' into OOPgularity

2014-10-22 13:26:35 -07:00

new_player

Changes the preview satchel for the CMO, MD and virologist from norm to med.

2014-10-18 04:55:40 -05: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

Alien hunters can now leap, Hitting a mob stuns it, Hitting anything dense stuns the alien for a short time

2014-10-11 02:40:27 +01:00

mob_grab.dm

Keep the define around as that is a good idea

2014-10-20 22:49:06 +13:00

mob_helpers.dm

big commit, handcuff overhaul

2014-10-08 13:19:54 -07:00

mob_movement.dm

Removing the fourth argument (air_group) of CanPass() everywhere, because it isn't used anywhere.

2014-10-15 18:03:06 +02:00

mob_transformation_simple.dm

The rest of the junk

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

mob.dm

Drone tweaks

2014-10-11 01:13:51 -04: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

…