kill more conflicts.

This commit is contained in:
KasparoVy
2016-07-05 21:48:27 -04:00
74 changed files with 353 additions and 273 deletions
+1 -1
View File
@@ -418,7 +418,7 @@
icon = 'icons/obj/custom_items.dmi'
icon_state = "chronx_robe"
item_state = "chronx_robe"
flags = ONESIZEFITSALL
flags_size = ONESIZEFITSALL
action_button_name = "Transform Robes"
adjust_flavour = "untransform"
ignore_suitadjust = 0