Zuhayr bb82f80885 Added get_bodytype() species proc as groundwork for subspecies. ...

Conflicts:
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/organs/organ_icon.dm

2015-08-22 02:53:16 +09:30

..

energy

Reverses stunrevolver buff

2015-06-17 09:59:39 -04:00

launcher

Fixes #10314

2015-08-02 00:01:10 -04:00

projectile

Formatting

2015-07-04 22:39:09 -04:00

alien.dm

Added get_bodytype() species proc as groundwork for subspecies.

2015-08-22 02:53:16 +09:30

energy.dm

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

2015-05-22 08:26:13 +02:00

launcher.dm

…

projectile.dm

…