diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index dc8c798f8cb..8026d30bbfb 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -251,5 +251,6 @@ /obj/item/clothing/head/crown name = "bananium crown" icon_state = "crown" + item_state = "crown" desc = "A gliterring bananium crown with spessjewels in it. Swaggy." flags = FPRINT | TABLEPASS | BLOCKHAIR \ No newline at end of file diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm index f8d643d5e32..70c58dda707 100644 --- a/code/modules/clothing/masks/gasmask.dm +++ b/code/modules/clothing/masks/gasmask.dm @@ -51,6 +51,7 @@ desc = "A true prankster's facial attire. A clown is incomplete without his wig and mask." icon_state = "clown" item_state = "clown_hat" + flags = FPRINT | TABLEPASS | MASKCOVERSMOUTH | MASKCOVERSEYES | BLOCK_GAS_SMOKE_EFFECT | MASKINTERNALS | BLOCKHAIR /obj/item/clothing/mask/gas/sexyclown name = "sexy-clown wig and mask" diff --git a/code/modules/mob/new_player/sprite_accessories.dm b/code/modules/mob/new_player/sprite_accessories.dm index b2dcda34f3f..3ecd8a6ac3e 100644 --- a/code/modules/mob/new_player/sprite_accessories.dm +++ b/code/modules/mob/new_player/sprite_accessories.dm @@ -521,7 +521,6 @@ name = "Short Vox Quills" icon_state = "vox_shortquills" species_allowed = list("Vox") - do_colouration = 0 /datum/sprite_accessory/facial_hair diff --git a/code/modules/reagents/dartgun.dm b/code/modules/reagents/dartgun.dm index 33e29dc809f..a79a181e729 100644 --- a/code/modules/reagents/dartgun.dm +++ b/code/modules/reagents/dartgun.dm @@ -29,7 +29,7 @@ var/obj/item/weapon/dart_cartridge/cartridge = null //Container of darts. var/max_beakers = 3 var/dart_reagent_amount = 15 - var/container_type = /obj/item/weapon/reagent_containers/glass/beaker/vial + var/container_type = /obj/item/weapon/reagent_containers/glass/beaker var/list/starting_chems = null /obj/item/weapon/gun/dartgun/update_icon() @@ -51,7 +51,7 @@ ..() if(starting_chems) for(var/chem in starting_chems) - var/obj/item/weapon/reagent_containers/glass/beaker/vial/B = new(src) + var/obj/B = new container_type(src) B.reagents.add_reagent(chem, 50) beakers += B cartridge = new /obj/item/weapon/dart_cartridge(src) @@ -97,7 +97,7 @@ user << "\blue [I] doesn't seem to fit into [src]." return if(beakers.len >= max_beakers) - user << "\blue [src] already has [max_beakers] vials in it - another one isn't going to fit!" + user << "\blue [src] already has [max_beakers] beakers in it - another one isn't going to fit!" return var/obj/item/weapon/reagent_containers/glass/beaker/B = I user.drop_item() diff --git a/icons/mob/back.dmi b/icons/mob/back.dmi index 09fddf83205..afa8ebdb335 100644 Binary files a/icons/mob/back.dmi and b/icons/mob/back.dmi differ diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 294b4321fa9..f15cde4355f 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/mask.dmi b/icons/mob/mask.dmi index 9affa59a53a..80787281fe0 100644 Binary files a/icons/mob/mask.dmi and b/icons/mob/mask.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 3bd02994293..4c3329e0964 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ