bgobandit 607170a9ef g merge conflicts. remote-tracking branch 'upstream/master' into dronepax ...

Conflicts:
	code/modules/mob/living/simple_animal/revenant/revenant.dm
	code/modules/mob/living/simple_animal/slaughter/slaughter.dm

2015-08-28 02:54:43 -04:00

..

camera

Fixes action button not updating correctly sometimes (b/c the change from del to qdel means the button wasn't null after Removal which fucks with the action update procs)

2015-08-23 14:47:44 +02:00

dead

Changed cloning ghost notifications to be less copypasta

2015-07-31 18:42:03 +03:00

living

g merge conflicts. remote-tracking branch 'upstream/master' into dronepax

2015-08-28 02:54:43 -04:00

new_player

Fixes bartender uniform not appearing in security record photo.

2015-07-31 16:20:21 +02:00

death.dm

…

interactive.dm

…

inventory.dm

Merge pull request #10736 from xxalpha/shakeitoff

2015-07-24 06:59:23 -03:00

login.dm

Changes a lot of del() to qdel()

2015-08-16 23:33:22 +02:00

logout.dm

…

mob_cleanup.dm

…

mob_defines.dm

Fixes slipping on water while riding janicart.

2015-08-13 23:49:02 +02:00

mob_grab.dm

…

mob_helpers.dm

-First revision of Swarmer mob, hud, icons, etc

2015-08-25 03:24:34 -07:00

mob_movement.dm

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

2015-07-19 21:53:39 +02:00

mob_transformation_simple.dm

…

mob.dm

Fixes pulling bug that led to FUN!

2015-08-18 21:12:08 -07:00

say_readme.dm

…

say.dm

…

transform_procs.dm

Merge pull request #10957 from Core0verload/surgery-organs-implants

2015-08-04 21:45:02 +10:00

update_icons.dm

…