FlattestGuitar 81f5ea440f Merge branch 'master' into more-fluff ...

# Conflicts:
#	icons/obj/custom_items.dmi

2017-09-11 22:25:54 +02:00

..

item_defines.dm

Merge branch 'master' into more-fluff

2017-09-11 22:25:54 +02:00

item_spawning.dm

Adds sanitization to custom item queries

2016-08-19 20:34:44 -04:00