mwerezak 5740f52964 Merge branch 'guns' into gun-rewrite ...

Conflicts:
	code/modules/clothing/suits/armor.dm
	code/modules/clothing/under/ties.dm
	code/modules/projectiles/gun.dm
	code/modules/projectiles/guns/energy/laser.dm
	code/modules/projectiles/guns/energy/nuclear.dm
	code/modules/projectiles/guns/energy/pulse.dm
	code/modules/projectiles/guns/energy/special.dm
	code/modules/projectiles/guns/projectile.dm
	code/modules/projectiles/guns/projectile/automatic.dm
	code/modules/projectiles/guns/projectile/launcher.dm
	code/modules/projectiles/guns/projectile/shotgun.dm

2015-02-11 18:08:43 -05:00

..

dead

Merge remote-tracking branch 'upstream/dev' into GhostSight

2015-02-03 22:28:53 +01:00

living

Merge branch 'guns' into gun-rewrite

2015-02-11 18:08:43 -05:00

new_player

AI latejoin

2015-02-02 17:59:57 +00:00

death.dm

Readds moonwalking.

2015-01-20 19:16:36 +10:30

emote.dm

correction of all copytext(sanitize(..)) to sanitize(copytext(..))

2015-02-01 22:54:56 +03:00

hear_say.dm

Timestamped speech for silicons.

2015-02-04 10:12:01 +01:00

holder.dm

Fixes #7976

2015-01-29 11:15:18 +10:30

inventory.dm

…

language.dm

Merge pull request #7581 from Baystation12/dev-freeze

2014-12-30 18:53:20 +10:30

login.dm

…

logout.dm

…

mob_cleanup.dm

…

mob_defines.dm

Readds moonwalking.

2015-01-20 19:16:36 +10:30

mob_grab.dm

Adds species-specific comfort tweaks, skrell nutrition changes.

2015-01-20 19:12:35 +10:30

mob_helpers.dm

Conflict fix

2015-02-03 23:29:08 +03:00

mob_movement.dm

More cargo train fixes

2015-01-03 01:27:10 +13:00

mob_transformation_simple.dm

…

mob.dm

Merge pull request #7801 from Mloc/bs12-glowypipes

2015-02-03 18:12:09 +03:00

say.dm

Reverted "say" error helper

2015-01-09 03:56:58 +01:00

transform_procs.dm

AI latejoin

2015-02-02 17:59:57 +00:00

typing_indicator.dm

…

update_icons.dm

…