Incoming 74f00a016d Merge branch 'master' of https://github.com/tgstation/-tg-station into supermatter_sword ...

Conflicts:
	icons/mob/inhands/items_lefthand.dmi
	icons/mob/inhands/items_righthand.dmi
	icons/obj/weapons.dmi

2015-10-31 19:56:13 -04:00

..

devices

Merge pull request #12497 from bgobandit/ayyyfixes

2015-10-27 18:28:48 +03:00

robot

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

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

stacks

Allows monkeys to use ointments and brute packs.

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

weapons

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

2015-10-31 19:56:13 -04: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

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

2015-07-16 04:27:25 -06: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

Adds more feedback to traitor dehydrated space carp. Fixes spelling.

2015-07-26 00:00:04 -04:00

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