diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index 74c89ea1..d4997ade 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -483,6 +483,22 @@ CIGARETTE PACKETS ARE IN FANCY.DM icon_on = "zippoon" icon_off = "zippo" +/obj/item/weapon/lighter/green + icon_on = "lighter-g-on" + icon_off = "lighter-g" + +/obj/item/weapon/lighter/red + icon_on = "lighter-r-on" + icon_off = "lighter-r" + +/obj/item/weapon/lighter/yellow + icon_on = "lighter-y-on" + icon_off = "lighter-y" + +/obj/item/weapon/lighter/cyan + icon_on = "lighter-c-on" + icon_off = "lighter-c" + /obj/item/weapon/lighter/random New() var/color = pick("r","c","y","g") diff --git a/code/modules/client/preferences_gear.dm b/code/modules/client/preferences_gear.dm index 142e7a01..c0d0457b 100644 --- a/code/modules/client/preferences_gear.dm +++ b/code/modules/client/preferences_gear.dm @@ -232,23 +232,63 @@ proc/populate_gear_list() cost = 1 // slot = slot_gloves +/datum/gear/black_gloves_unathi + display_name = "black gloves, unathi" + path = /obj/item/clothing/gloves/black/unathi + cost = 1 + +/datum/gear/black_gloves_tajara + display_name = "black gloves, tajaran" + path = /obj/item/clothing/gloves/black/tajara + cost = 1 + /datum/gear/red_gloves display_name = "red gloves" path = /obj/item/clothing/gloves/red cost = 1 // slot = slot_gloves +/datum/gear/red_gloves_unathi + display_name = "red gloves, unathi" + path = /obj/item/clothing/gloves/red/unathi + cost = 1 + +/datum/gear/red_gloves_tajaran + display_name = "red gloves, tajaran" + path = /obj/item/clothing/gloves/red/tajara + cost = 1 + /datum/gear/blue_gloves display_name = "blue gloves" path = /obj/item/clothing/gloves/blue cost = 1 // slot = slot_gloves +/datum/gear/blue_gloves_unathi + display_name = "blue gloves, unathi" + path = /obj/item/clothing/gloves/blue/unathi + cost = 1 + +/datum/gear/blue_gloves_tajaran + display_name = "blue gloves, tajaran" + path = /obj/item/clothing/gloves/blue/tajara + cost = 1 + /datum/gear/orange_gloves display_name = "orange gloves" path = /obj/item/clothing/gloves/orange cost = 1 -// slot = slot_gloves + // slot = slot_gloves + +/datum/gear/orange_gloves_unathi + display_name = "orange gloves, unathi" + path = /obj/item/clothing/gloves/orange/unathi + cost = 1 + +/datum/gear/orange_gloves_tajaran + display_name = "orange gloves, tajaran" + path = /obj/item/clothing/gloves/orange/tajara + cost = 1 /datum/gear/purple_gloves display_name = "purple gloves" @@ -256,24 +296,64 @@ proc/populate_gear_list() cost = 1 // slot = slot_gloves +/datum/gear/purple_gloves_unathi + display_name = "purple gloves, unathi" + path = /obj/item/clothing/gloves/purple/unathi + cost = 1 + +/datum/gear/purple_gloves_tajaran + display_name = "purple gloves, tajaran" + path = /obj/item/clothing/gloves/purple/tajara + cost = 1 + /datum/gear/brown_gloves display_name = "brown gloves" path = /obj/item/clothing/gloves/brown cost = 1 // slot = slot_gloves +/datum/gear/brown_gloves_unathi + display_name = "brown gloves, unathi" + path = /obj/item/clothing/gloves/brown/unathi + cost = 1 + +/datum/gear/brown_gloves_tajaran + display_name = "brown gloves, tajaran" + path = /obj/item/clothing/gloves/brown/tajara + cost = 1 + /datum/gear/green_gloves display_name = "green gloves" path = /obj/item/clothing/gloves/green cost = 1 // slot = slot_gloves +/datum/gear/green_gloves_unathi + display_name = "green gloves, unathi" + path = /obj/item/clothing/gloves/green/unathi + cost = 1 + +/datum/gear/green_gloves_tajaran + display_name = "green gloves, tajaran" + path = /obj/item/clothing/gloves/green/tajara + cost = 1 + /datum/gear/white_gloves display_name = "white gloves" path = /obj/item/clothing/gloves/white cost = 1 // slot = slot_gloves +/datum/gear/white_gloves_unathi + display_name = "white gloves, unathi" + path = /obj/item/clothing/gloves/white/unathi + cost = 1 + +/datum/gear/white_gloves_tajaran + display_name = "white gloves, tajaran" + path = /obj/item/clothing/gloves/white/tajara + cost = 1 + /datum/gear/black_shoes display_name = "black shoes" path = /obj/item/clothing/shoes/black @@ -374,6 +454,11 @@ proc/populate_gear_list() path = /obj/item/clothing/tie/armband/medgreen cost = 1 +/datum/gear/armband_iac + display_name = "IAC armband" + path = /obj/item/clothing/tie/armband/iac_armband + cost = 1 + /datum/gear/skirt_blue display_name = "blue plaid skirt" path = /obj/item/clothing/under/dress/plaid_blue @@ -592,4 +677,66 @@ proc/populate_gear_list() /datum/gear/cigar_case display_name = "cigar case" path = /obj/item/weapon/storage/fancy/cigars - cost = 3 + cost = 2 + +/datum/gear/smoking_pipe + display_name = "smoking pipe" + path = /obj/item/clothing/mask/cigarette/pipe + cost = 2 + +/datum/gear/cigarettes + display_name = "pack of DromedaryCo cigarettes" + path = /obj/item/weapon/storage/fancy/cigarettes/dromedaryco + cost = 2 + +/datum/gear/red_lipstick + display_name = "lipstick, red" + path = /obj/item/weapon/lipstick + cost = 1 + +/datum/gear/purple_lipstick + display_name = "lipstick, purple" + path = /obj/item/weapon/lipstick/purple + cost = 1 + +/datum/gear/jade_lipstick + display_name = "lipstick, jade" + path = /obj/item/weapon/lipstick/jade + cost = 1 + +/datum/gear/black_lipstick + display_name = "lipstick, black" + path = /obj/item/weapon/lipstick/black + cost = 1 + +/datum/gear/cigarettes + display_name = "pack of cigarettes" + path = /obj/item/weapon/storage/fancy/cigarettes + cost = 1 + +datum/gear/lighterg + display_name = "lighter, green" + path = /obj/item/weapon/lighter/green + cost = 1 + +/datum/gear/lighterr + display_name = "lighter, red" + path = /obj/item/weapon/lighter/red + cost = 1 + +/datum/gear/lightery + display_name = "lighter, yellow" + path = /obj/item/weapon/lighter/yellow + cost = 1 + +/datum/gear/lighterc + display_name = "lighter, cyan" + path = /obj/item/weapon/lighter/cyan + cost = 1 + +datum/gear/matches + display_name = "matchbook" + path = /obj/item/weapon/storage/box/matches + cost = 1 + + diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm index 26eaf5fb..ba3dd00b 100644 --- a/code/modules/clothing/gloves/color.dm +++ b/code/modules/clothing/gloves/color.dm @@ -136,10 +136,80 @@ /obj/item/clothing/gloves/black/unathi name = "black gloves" - desc = "black gloves made for Unathi use." + desc = "Black gloves made for Unathi use." species_restricted = list("Unathi") /obj/item/clothing/gloves/black/tajara name = "black gloves" - desc = "black gloves made for Tajara use." + desc = "Black gloves made for Tajaran use." + species_restricted = list("Tajaran") + +/obj/item/clothing/gloves/red/unathi + name = "red gloves" + desc = "Red gloves made for Unathi use." + species_restricted = list("Unathi") + +/obj/item/clothing/gloves/red/tajara + name = "red gloves" + desc = "Red gloves made for Tajaran use." + species_restricted = list("Tajaran") + +/obj/item/clothing/gloves/blue/unathi + name = "blue gloves" + desc = "Blue gloves made for Unathi use." + species_restricted = list("Unathi") + +/obj/item/clothing/gloves/blue/tajara + name = "blue gloves" + desc = "Blue gloves made for Tajaran use." + species_restricted = list("Tajaran") + +/obj/item/clothing/gloves/orange/unathi + name = "orange gloves" + desc = "Orange gloves made for Unathi use." + species_restricted = list("Unathi") + +/obj/item/clothing/gloves/orange/tajara + name = "orange gloves" + desc = "Orange gloves made for Tajaran use." + species_restricted = list("Tajaran") + +/obj/item/clothing/gloves/purple/unathi + name = "purple gloves" + desc = "Purple gloves made for Unathi use." + species_restricted = list("Unathi") + +/obj/item/clothing/gloves/purple/tajara + name = "purple gloves" + desc = "Purple gloves made for Tajaran use." + species_restricted = list("Tajaran") + +/obj/item/clothing/gloves/brown/unathi + name = "brown gloves" + desc = "Brown gloves made for Unathi use." + species_restricted = list("Unathi") + +/obj/item/clothing/gloves/brown/tajara + name = "brown gloves" + desc = "Brown gloves made for Tajaran use." + species_restricted = list("Tajaran") + +/obj/item/clothing/gloves/green/unathi + name = "green gloves" + desc = "Green gloves made for Unathi use." + species_restricted = list("Unathi") + +/obj/item/clothing/gloves/green/tajara + name = "green gloves" + desc = "Green gloves made for Tajaran use." + species_restricted = list("Tajaran") + +/obj/item/clothing/gloves/white/unathi + name = "white gloves" + desc = "White gloves made for Unathi use." + species_restricted = list("Unathi") + +/obj/item/clothing/gloves/white/tajara + name = "white gloves" + desc = "White gloves made for Tajaran use." species_restricted = list("Tajaran") \ No newline at end of file