Tkdrg 8fce742d0a Merge remote-tracking branch 'upstream/master' into fuk ...

Conflicts:
	data/mode.txt
	icons/mob/mob.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/gloves.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/shoes.dmi
	icons/obj/clothing/suits.dmi

2015-11-07 15:56:39 -03:00

..

sheets

Merge remote-tracking branch 'upstream/master' into hog-mergeconflicts

2015-11-02 01:06:30 -03:00

tiles

Fixed bad origin_tech values.

2015-11-05 15:32:25 -05:00

cash.dm

removes a bunch of .0

2015-09-10 20:57:30 +09:00

medical.dm

Allows monkeys to use ointments and brute packs.

2015-10-28 00:10:11 +02:00

rods.dm

removes a bunch of .0

2015-09-10 20:57:30 +09:00

stack.dm

Fixed a couple of bugs with cable coils.

2015-09-01 22:35:04 +01:00