Merge branch 'master' into kk-adminships

This commit is contained in:
Novacat
2020-09-27 17:02:08 -04:00
committed by GitHub
746 changed files with 49441 additions and 38323 deletions
+2 -2
View File
@@ -403,8 +403,8 @@
no_variants = FALSE
pass_color = TRUE
strict_color_stacking = TRUE
drop_sound = 'sound/items/drop/cloth.ogg'
pickup_sound = 'sound/items/pickup/cloth.ogg'
drop_sound = 'sound/items/drop/clothing.ogg'
pickup_sound = 'sound/items/pickup/clothing.ogg'
/obj/item/stack/material/cloth/diyaab
color = "#c6ccf0"