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

Conflicts:
	icons/mob/uniform.dmi
	icons/obj/clothing/uniforms.dmi

2015-02-05 17:44:22 -08:00

..

effects

Merge pull request #7239 from paprka/ointmentandshit

2015-02-03 16:30:42 -06:00

items

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

2015-02-05 17:44:22 -08:00

structures

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

2015-02-05 17:44:22 -08:00

buckling.dm

in order to help doctors keep up, since they now need a lot more to heal people, the nanomeds have been stocked with a lot of extra stuff.

2015-01-20 22:26:13 -06:00

empulse.dm

…

explosion.dm

SubSystem rewrite

2014-12-31 13:25:41 +00:00

items.dm

new hood system

2015-01-25 00:22:52 -08:00

objs.dm

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

2015-01-04 01:52:14 +00:00

structures.dm

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

2014-12-05 22:02:01 +01:00

weapons.dm

…