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

..

devices

Fixed bad origin_tech values.

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

robot

Hand of God Fixes/Tweaks

2015-11-07 15:25:28 -03:00

stacks

Merge remote-tracking branch 'upstream/master' into fuk

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

weapons

Merge remote-tracking branch 'upstream/master' into fuk

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

apc_frame.dm

f u c k c o n f l i c t s

2015-09-25 14:35:44 +03:00

blueprints.dm

Slime blueprints

2015-10-30 04:42:20 -05:00

body_egg.dm

I screwed up that merge

2015-08-14 21:36:35 -06:00

bodybag.dm

Adds large cardboard boxes to the game, constructable from five sheets of cardboard.

2015-09-10 19:29:19 -04:00

candle.dm

Replaced refactored is_hot() to be an atom proc.

2015-09-24 01:12:38 +01:00

crayons.dm

Fixes runtimes with augmented_eyesight refund, atom/movable/Bump(), fleshmend, spraycans, PDA messaging, remove_from_storage(), and gun burstfiring.

2015-10-11 17:18:31 +02:00

dehy_carp.dm

…

documents.dm

removes a bunch of .0

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

holotape.dm

Merge pull request #11787 from bgobandit/theywanttherandd

2015-09-19 14:20:09 +01:00

latexballoon.dm

Replaced refactored is_hot() to be an atom proc.

2015-09-24 01:12:38 +01:00

nuke_tools.dm

Radiation changes

2015-09-26 13:33:27 -04:00

shooting_range.dm

Adds extra HONK. Tweaks sprite.

2015-09-09 16:27:21 -04:00

toys.dm

Makes effect system code more OOP.

2015-10-21 23:28:29 +02:00

trash.dm

removes a bunch of .0

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