Merge pull request #5349 from Woodratt/WR6112018_clothingfix
Clothing Bug Fixes
@@ -20,27 +20,32 @@
|
||||
|
||||
/obj/item/clothing/head/pin/pink
|
||||
icon_state = "pinkpin"
|
||||
addblends = null
|
||||
name = "pink hair hat"
|
||||
|
||||
/obj/item/clothing/head/pin/clover
|
||||
icon_state = "cloverpin"
|
||||
name = "clover pin"
|
||||
addblends = null
|
||||
desc = "A hair pin in the shape of a clover leaf."
|
||||
|
||||
/obj/item/clothing/head/pin/butterfly
|
||||
icon_state = "butterflypin"
|
||||
name = "butterfly pin"
|
||||
addblends = null
|
||||
desc = "A hair pin in the shape of a bright blue butterfly."
|
||||
|
||||
/obj/item/clothing/head/pin/magnetic
|
||||
icon_state = "magnetpin"
|
||||
name = "magnetic 'pin'"
|
||||
addblends = null
|
||||
desc = "Finally, a hair pin even a Morpheus chassis can use."
|
||||
matter = list(DEFAULT_WALL_MATERIAL = 10)
|
||||
|
||||
/obj/item/clothing/head/pin/flower
|
||||
name = "red flower pin"
|
||||
icon_state = "hairflower"
|
||||
addblends = null
|
||||
desc = "Smells nice."
|
||||
|
||||
/obj/item/clothing/head/pin/flower/blue
|
||||
@@ -82,6 +87,7 @@
|
||||
/obj/item/clothing/head/pin/bow/big/red
|
||||
icon_state = "redribbon"
|
||||
name = "red ribbon"
|
||||
addblends = null
|
||||
|
||||
/obj/item/clothing/head/powdered_wig
|
||||
name = "powdered wig"
|
||||
|
||||
@@ -27,6 +27,12 @@
|
||||
|
||||
return gas_filtered
|
||||
|
||||
/obj/item/clothing/mask/gas/clear
|
||||
name = "gas mask"
|
||||
desc = "A face-covering mask with a transparent faceplate that can be connected to an air supply."
|
||||
icon_state = "gas_clear"
|
||||
flags_inv = null
|
||||
|
||||
/obj/item/clothing/mask/gas/half
|
||||
name = "face mask"
|
||||
desc = "A compact, durable gas mask that can be connected to an air supply."
|
||||
|
||||
@@ -78,7 +78,7 @@
|
||||
name = "Radiation Hood"
|
||||
icon_state = "rad"
|
||||
desc = "A hood with radiation protective properties. Label: Made with lead, do not eat insulation"
|
||||
// flags_inv = BLOCKHAIR
|
||||
flags_inv = BLOCKHAIR
|
||||
item_flags = THICKMATERIAL
|
||||
body_parts_covered = HEAD|FACE|EYES
|
||||
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 60, rad = 100)
|
||||
|
||||
|
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 15 KiB |
|
Before Width: | Height: | Size: 29 KiB After Width: | Height: | Size: 30 KiB |
|
Before Width: | Height: | Size: 141 KiB After Width: | Height: | Size: 148 KiB |
|
Before Width: | Height: | Size: 352 KiB After Width: | Height: | Size: 352 KiB |
|
Before Width: | Height: | Size: 381 KiB After Width: | Height: | Size: 381 KiB |
|
Before Width: | Height: | Size: 21 KiB After Width: | Height: | Size: 22 KiB |