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

..

alien.dm

…

armor.dm

Adds four mercenary vests to the merc base, tweaks

2015-03-09 03:15:45 -04:00

bio.dm

Removes FPRINT and TABLEPASS flags

2015-01-23 22:27:32 +03:00

jobs.dm

Converted over hatchets and scythes.

2015-05-17 00:15:46 +09:30

labcoat.dm

Fixed typo that broke everything

2014-11-16 03:31:22 -05:00

miscellaneous.dm

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

2015-05-18 17:50:48 +02:00

storage.dm

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

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

utility.dm

Merge remote-tracking branch 'refs/remotes/origin/dev' into dev

2015-02-04 04:44:09 +06:00

wiz_robe.dm

Ports /vg/'s spell system for the sake of cult porting.

2015-04-09 20:08:06 +02:00