commit names arent important right?
@@ -259,6 +259,15 @@
|
||||
name = "Collar Key"
|
||||
desc = "A key for a tiny lock on a collar or bag."
|
||||
|
||||
/obj/item/clothing/neck/maid
|
||||
name = "polychromic maid collar"
|
||||
desc = "A collar that goes with the polychromic maid outfit."
|
||||
icon_state = "maid_neck"
|
||||
|
||||
/obj/item/clothing/neck/maid/ComponentInitialize()
|
||||
. = ..()
|
||||
AddElement(/datum/element/polychromic, list("#333333", "#FFFFFF"), 2)
|
||||
|
||||
//////////////
|
||||
//DOPE BLING//
|
||||
//////////////
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
if(istype(U) && U.attached_accessory)
|
||||
var/obj/item/clothing/accessory/A = U.attached_accessory
|
||||
if(A.above_suit)
|
||||
. += U.accessory_overlay
|
||||
. += U.accessory_overlays
|
||||
|
||||
/obj/item/clothing/suit/update_clothes_damaged_state()
|
||||
..()
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
var/alt_covers_chest = FALSE // for adjusted/rolled-down jumpsuits, FALSE = exposes chest and arms, TRUE = exposes arms only
|
||||
var/dummy_thick = FALSE // is able to hold accessories on its item
|
||||
var/obj/item/clothing/accessory/attached_accessory
|
||||
var/mutable_appearance/accessory_overlay
|
||||
var/list/accessory_overlays
|
||||
|
||||
/obj/item/clothing/under/worn_overlays(isinhands = FALSE, icon_file, used_state, style_flags = NONE)
|
||||
. = ..()
|
||||
@@ -30,8 +30,8 @@
|
||||
. += mutable_appearance('icons/effects/item_damage.dmi', "damageduniform")
|
||||
if(blood_DNA)
|
||||
. += mutable_appearance('icons/effects/blood.dmi', "uniformblood", color = blood_DNA_to_color(), blend_mode = blood_DNA_to_blend())
|
||||
if(accessory_overlay)
|
||||
. += accessory_overlay
|
||||
if(length(accessory_overlays))
|
||||
. += accessory_overlays
|
||||
|
||||
/obj/item/clothing/under/attackby(obj/item/I, mob/user, params)
|
||||
if((sensordamage || (has_sensor < HAS_SENSORS && has_sensor != NO_SENSORS)) && istype(I, /obj/item/stack/cable_coil))
|
||||
@@ -154,9 +154,15 @@
|
||||
if((flags_inv & HIDEACCESSORY) || (A.flags_inv & HIDEACCESSORY))
|
||||
return TRUE
|
||||
|
||||
accessory_overlay = mutable_appearance('icons/mob/clothing/accessories.dmi', attached_accessory.icon_state)
|
||||
accessory_overlay.alpha = attached_accessory.alpha
|
||||
accessory_overlay.color = attached_accessory.color
|
||||
var/datum/element/polychromic/polychromic = LAZYACCESS(attached_accessory.comp_lookup, "item_worn_overlays")
|
||||
if(!polychromic)
|
||||
var/mutable_appearance/accessory_overlay = mutable_appearance('icons/mob/clothing/accessories.dmi', attached_accessory.icon_state)
|
||||
accessory_overlay.alpha = attached_accessory.alpha
|
||||
accessory_overlay.color = attached_accessory.color
|
||||
accessory_overlays = list(accessory_overlay)
|
||||
else
|
||||
accessory_overlays = list()
|
||||
polychromic.apply_worn_overlays(I, FALSE, 'icons/mob/clothing/accessories.dmi', item_state || icon_state, NONE, accessory_overlays)
|
||||
|
||||
if(ishuman(loc))
|
||||
var/mob/living/carbon/human/H = loc
|
||||
|
||||
@@ -57,7 +57,7 @@
|
||||
plane = initial(plane)
|
||||
U.cut_overlays()
|
||||
U.attached_accessory = null
|
||||
U.accessory_overlay = null
|
||||
U.accessory_overlays = null
|
||||
|
||||
/obj/item/clothing/accessory/proc/on_uniform_equip(obj/item/clothing/under/U, user)
|
||||
return
|
||||
|
||||
|
Before Width: | Height: | Size: 29 KiB After Width: | Height: | Size: 29 KiB |
|
Before Width: | Height: | Size: 55 KiB After Width: | Height: | Size: 55 KiB |
|
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 17 KiB |
|
Before Width: | Height: | Size: 3.1 KiB After Width: | Height: | Size: 3.2 KiB |
@@ -177,7 +177,7 @@
|
||||
path = /obj/item/clothing/accessory/necklace
|
||||
|
||||
/datum/gear/backpack/polymaidapron //this is ALSO here because loadout doesn't support proper accessories
|
||||
name = "A renameable necklace"
|
||||
name = "Polychromic maid apron"
|
||||
path = /obj/item/clothing/accessory/maidapron/polychromic
|
||||
loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION | LOADOUT_CAN_COLOR_POLYCHROMIC
|
||||
loadout_initial_colors = list("#333333", "#FFFFFF")
|
||||
|
||||
@@ -106,3 +106,9 @@
|
||||
path = /obj/item/clothing/neck/cloak/cancloak/polychromic
|
||||
loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION | LOADOUT_CAN_COLOR_POLYCHROMIC
|
||||
loadout_initial_colors = list("#585858", "#373737", "#BEBEBE")
|
||||
|
||||
/datum/gear/neck/maid
|
||||
name = "Polychromatic Maid Collar"
|
||||
path = /obj/item/clothing/neck/maid
|
||||
loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION | LOADOUT_CAN_COLOR_POLYCHROMIC
|
||||
loadout_initial_colors = list("#333333", "#FFFFFF")
|
||||
|
||||