phil235 029bc65b93 Merge branch 'master' of https://github.com/tgstation/-tg-station into Color_washing ...

# Conflicts:
#	code/game/atoms.dm
#	code/game/gamemodes/nuclear/nuclearbomb.dm

2016-10-19 01:56:02 +02:00

..

effects

Adding var/list/atom_colours to /atom .

2016-10-19 01:51:30 +02:00

items

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

2016-10-19 01:56:02 +02:00

structures

Adding var/list/atom_colours to /atom .

2016-10-19 01:51:30 +02:00

buckling.dm

Some preliminary changes before the damage refactor PR. The changes here do absolutely nothing gamewise.

2016-09-27 22:33:08 +02:00

empulse.dm

Replaces yet more istypes with helpers (#20806)

2016-10-10 17:48:35 +13:00

explosion.dm

Adds a few turf istype helpers (#20754)

2016-10-01 19:25:46 +02:00

items.dm

Merge pull request #20962 from phil235/hit_message

2016-10-18 09:17:41 +13:00

obj_defense.dm

Merge pull request #20962 from phil235/hit_message

2016-10-18 09:17:41 +13:00

objs.dm

Remove an unused proc #20825

2016-10-10 11:47:14 +13:00

radiation.dm

Replaces yet more istypes with helpers (#20806)

2016-10-10 17:48:35 +13:00

structures.dm

Revert "Makes drag/drop that dont have any use call click"

2016-10-16 12:41:42 -07:00

weapons.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00