tkdrg 77a6df36f7 Merge remote-tracking branch 'upstream/master' into moarfloors ...

Conflicts:
	_maps/map_files/MetaStation.v39K.dmm
	_maps/map_files/MiniStation/MiniStation.dmm
	_maps/map_files/tgstation.2.1.3.dmm
	code/game/machinery/bots/floorbot.dm

2014-11-14 15:23:35 -03:00

..

camera

…

dead

Fixes ghost pointing

2014-11-02 15:24:03 -03:00

living

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

2014-11-14 15:23:35 -03:00

new_player

Merge pull request #5630 from GunHog/Soft_Silky_Hair

2014-11-03 17:37:55 -08: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

Cuts /disease variables from 28 to 23 (includes new ones)

2014-10-30 06:21:14 +00:00

mob_defines.dm

Space movement rewrite to allow everything to drift

2014-10-25 23:19:46 -07:00

mob_grab.dm

Fixes being able to phase through windows using grabs. Fixed #3957

2014-11-08 13:21:55 +01:00

mob_helpers.dm

Fixes whisper formatting hopefully maybe. Fixed #5140

2014-10-12 14:36:20 +02:00

mob_movement.dm

Throwing bugfixes

2014-11-09 00:29:20 -08:00

mob_transformation_simple.dm

The rest of the junk

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

mob.dm

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

2014-11-04 18:55:07 +01: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

Logic fix + Tweaks

2014-10-28 10:23:56 -05:00

update_icons.dm

…