PsiOmegaDelta 405131a54e Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/projectiles/guns/energy/stun.dm
	code/modules/projectiles/guns/projectile/pistol.dm
	code/modules/projectiles/guns/projectile/revolver.dm

2015-06-20 20:40:06 +02:00

..

ashtray.dm

Compile fix.

2015-06-20 23:14:09 +09:30

bats.dm

Updated force vars on bats.

2015-05-21 00:52:17 +09:30

kitchen.dm

code/game/objects, code/game/machinery merge fix

2015-06-02 20:18:45 +01:00

knives.dm

code/game/objects, code/game/machinery merge fix

2015-06-02 20:18:45 +01:00

material_weapons.dm

Comments out fire and rads for material objects since they are very imbalanced atm.

2015-06-20 22:48:08 +09:30

misc.dm

…

shards.dm

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

2015-06-20 20:40:06 +02:00

swords.dm

…

thrown.dm

…

twohanded.dm

code/game/objects, code/game/machinery merge fix

2015-06-02 20:18:45 +01:00

twohanded.dm.orig

…