phil235 2399ecc455 Merge branch 'master' of https://github.com/tgstation/-tg-station into ChemistryManual ...

Conflicts:
	icons/obj/library.dmi

2015-11-05 17:03:24 +01: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

Merge pull request #12630 from KorPhaeron/Reflector

2015-11-01 21:46:29 +00:00

weapons

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

2015-11-05 17:03:24 +01: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

…

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