Cheridan cba8a9a325 Merge branch 'c4runtimeFix' of git://github.com/phil235/-tg-station into phil235-c4runtimeFix ...

Conflicts:
	code/modules/mob/mob.dm

2015-11-18 01:44:29 -06:00

..

devices

Merge pull request #12950 from phil235/AIMechStunFix

2015-11-11 16:34:24 -06:00

robot

Hand of God Fixes/Tweaks

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

stacks

Crossing a glass shard in space without shoes won't hurt and stun the user anymore.

2015-11-15 17:19:07 +02:00

weapons

Merge branch 'c4runtimeFix' of git://github.com/phil235/-tg-station into phil235-c4runtimeFix

2015-11-18 01:44:29 -06: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

…

candle.dm

Replaced refactored is_hot() to be an atom proc.

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

crayons.dm

Made it possible to paint windows to make them opaque.

2015-11-01 16:26:54 +00:00

dehy_carp.dm

So I must bury it.

2015-11-10 23:46:17 +00:00

documents.dm

…

holotape.dm

…

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

…

toys.dm

Merge pull request #13015 from SuperSayu/Holodecker

2015-11-16 04:51:49 +03:00

trash.dm

…