xxalpha 3d15d791fb Merge branch 'edgy' into hot_or_not ...

Conflicts:
	code/__HELPERS/unsorted.dm

2015-09-24 03:12:08 +01:00

..

effects

Replaced refactored is_hot() to be an atom proc.

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

items

Merge branch 'edgy' into hot_or_not

2015-09-24 03:12:08 +01:00

structures

Replaced refactored is_hot() to be an atom proc.

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

buckling.dm

buckling text span fix.

2015-09-09 09:29:51 +02:00

empulse.dm

…

explosion.dm

STOP BOMBING THE FUCKING BLOB, ASSHOLE

2015-08-30 19:54:55 -04:00

items.dm

Replaced /proc/is_sharp() with /obj/item/proc/is_sharp().

2015-09-24 03:08:28 +01:00

objs.dm

removes a bunch of .0

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

structures.dm

Removes update_triggers.dm and moves the code inside of it to their respective procs. Most of the procs on this file were duplicated.

2015-09-16 21:52:25 -03:00

weapons.dm

Fixes proc arguments

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