Merge pull request #6772 from Zuhayr/master

Fixes
This commit is contained in:
Chinsky
2014-10-19 01:42:36 +04:00
13 changed files with 80 additions and 37 deletions

View File

@@ -635,17 +635,17 @@ var/global/list/gear_datums = list()
/datum/gear/blipstick
display_name = "lipstick, black"
path = /obj/item/weapon/lipstick
path = /obj/item/weapon/lipstick/black
cost = 1
/datum/gear/jlipstick
display_name = "lipstick, jade"
path = /obj/item/weapon/lipstick
path = /obj/item/weapon/lipstick/jade
cost = 1
/datum/gear/plipstick
display_name = "lipstick, purple"
path = /obj/item/weapon/lipstick
path = /obj/item/weapon/lipstick/purple
cost = 1
/datum/gear/rlipstick