Clown crown and cape fixes

This commit is contained in:
ZomgPonies
2013-10-20 00:41:36 -04:00
parent 9235bbd222
commit ad3322a436
8 changed files with 5 additions and 4 deletions
+1
View File
@@ -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
+1
View File
@@ -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"
@@ -521,7 +521,6 @@
name = "Short Vox Quills"
icon_state = "vox_shortquills"
species_allowed = list("Vox")
do_colouration = 0
/datum/sprite_accessory/facial_hair
+3 -3
View File
@@ -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()