cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-22 04:22:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Colourable Chokhas (#11570)

Browse Source
This commit is contained in:
Geeves
2021-04-10 18:32:15 +02:00
committed by GitHub
parent d22cbec9c4
commit 016cba448f
12 changed files with 39 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/cargo/random_stock/t3_rare.dm
+2 -2
View File
@@ -132,8 +132,8 @@ STOCK_ITEM_RARE(rare_clothing, 1)
/obj/item/clothing/suit/acapjacket,
/obj/item/clothing/head/acapcap,
/obj/item/clothing/suit/storage/toggle/himeo,
/obj/item/clothing/suit/storage/vysoka_f,
/obj/item/clothing/suit/storage/vysoka_m,
/obj/item/clothing/suit/storage/vysoka/f,
/obj/item/clothing/suit/storage/vysoka,
/obj/item/clothing/under/rank/iacjumpsuit,
/obj/item/clothing/under/rank/fatigues/marine,
/obj/item/clothing/under/rank/dress/subofficer,
code/modules/client/preference_setup/loadout/loadout_suit.dm
+6 -6
View File
@@ -392,15 +392,15 @@
/datum/gear/suit/vysoka
display_name = "chokha selection"
description = "A selection of Vysokan chokhas."
path = /obj/item/clothing/suit/storage/vysoka_m
flags = GEAR_HAS_DESC_SELECTION
path = /obj/item/clothing/suit/storage/vysoka
flags = GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
/datum/gear/suit/vysoka/New()
..()
var/coat = list()
coat["feminine chokha"] = /obj/item/clothing/suit/storage/vysoka_f
coat["masculine chokha"] = /obj/item/clothing/suit/storage/vysoka_m
gear_tweaks += new/datum/gear_tweak/path(coat)
var/list/coat = list()
coat["feminine chokha"] = /obj/item/clothing/suit/storage/vysoka/f
coat["masculine chokha"] = /obj/item/clothing/suit/storage/vysoka
gear_tweaks += new /datum/gear_tweak/path(coat)
/datum/gear/suit/submariner
display_name = "submariner jacket"
code/modules/clothing/clothing.dm
+3 -1
View File
@@ -39,6 +39,7 @@
for(var/T in starting_accessories)
var/obj/item/clothing/accessory/tie = new T(src)
src.attach_accessory(null, tie)
update_icon()
/obj/item/clothing/Destroy()
STOP_PROCESSING(SSprocessing, src)
@@ -534,7 +535,6 @@
return our_image
/obj/item/clothing/head/update_icon(var/mob/user)
cut_overlays()
var/mob/living/carbon/human/H
if(istype(user,/mob/living/carbon/human))
@@ -552,6 +552,8 @@
var/use_icon = 'icons/mob/light_overlays.dmi'
SSicon_cache.light_overlay_cache[cache_key] = image("icon" = use_icon, "icon_state" = "[light_overlay]")
..()
if(H)
H.update_inv_head()
code/modules/clothing/factions/vysoka.dm
+5 -6
View File
@@ -1,16 +1,15 @@
/obj/item/clothing/suit/storage/vysoka_m
/obj/item/clothing/suit/storage/vysoka
name = "chokha"
desc = " A woolen coat with a high neck commonly worn on Vysoka."
desc = "A woolen coat with a high neck commonly worn on Vysoka."
desc_fluff = "Chokhas are a common choice of outerwear for men and women on Vysoka, and are often colored differently based on their city - or host - of origin. The chokha has become something of a cultural symbol of Vysoka, and is often worn off-world by its citizens."
icon = 'icons/clothing/suits/coats/vysoka_chokha_male.dmi'
icon_state = "chokha_vysoka_m"
item_state = "chokha_vysoka_m"
contained_sprite = TRUE
build_from_parts = TRUE
worn_overlay = "accessories"
/obj/item/clothing/suit/storage/vysoka_f
name = "chokha"
desc = " A woolen coat with a high neck commonly worn on Vysoka."
desc_fluff = "Chokhas are a common choice of outerwear for men and women on Vysoka, and are often colored differently based on their city - or host - of origin. The chokha has become something of a cultural symbol of Vysoka, and is often worn off-world by its citizens."
/obj/item/clothing/suit/storage/vysoka/f
icon = 'icons/clothing/suits/coats/vysoka_chokha_female.dmi'
icon_state = "chokha_vysoka_f"
item_state = "chokha_vysoka_f"
code/modules/clothing/suits/hoodies.dm
+4 -14
View File
@@ -248,23 +248,13 @@
item_state = "coatwinter_w"
build_from_parts = TRUE
hoodtype = /obj/item/clothing/head/winterhood/colorable
worn_overlay = "collar_su"
/obj/item/clothing/suit/storage/hooded/wintercoat/colorable/Initialize()
. = ..()
update_icon()
/obj/item/clothing/suit/storage/hooded/wintercoat/colorable/update_icon()
. = ..()
cut_overlays()
add_overlay(overlay_image(icon, "[icon_state]_collar", flags=RESET_COLOR))
worn_overlay = "collar"
/obj/item/clothing/head/winterhood/colorable
icon_state = "coatwinter_w_hood"
build_from_parts = TRUE
worn_overlay = "collar_he"
worn_overlay = "collar"
/obj/item/clothing/head/winterhood/colorable/update_icon()
/obj/item/clothing/head/winterhood/colorable/update_icon(mob/user)
. = ..()
cut_overlays()
add_overlay(overlay_image(icon, "[icon_state]_collar", flags=RESET_COLOR))
code/modules/clothing/suits/overlay.dm
+1 -9
View File
@@ -2,14 +2,6 @@
// Could possibly make it so clothing has TWO kinds of customisable coloring for contrasting colors, more customisation and other stuff, but that requires loadout code I can't do. -Wezzy
/obj/item/clothing/suit/storage/toggle/overlay/Initialize()
. = ..()
update_icon()
/obj/item/clothing/suit/storage/toggle/overlay/toggle_open()
. = ..()
update_icon()
/obj/item/clothing/suit/storage/toggle/overlay/submariner
name = "submariner's coat"
desc = "A leather jacket with a synthetic fur collar. It looks comfortable, if a bit warm for the station."
@@ -17,4 +9,4 @@
icon_state = "submariner_coat"
item_state = "submariner_coat"
build_from_parts = TRUE
worn_overlay = "collar"
worn_overlay = "collar"
code/modules/clothing/suits/storage.dm
+1
View File
@@ -55,6 +55,7 @@
playsound(src, /decl/sound_category/rustle_sound, EQUIP_SOUND_VOLUME, TRUE)
icon_state = "[initial(icon_state)][opened ? "_open" : ""]"
item_state = icon_state
update_icon()
update_clothing_icon()
/obj/item/clothing/suit/storage/toggle/Initialize()
code/modules/mob/living/carbon/human/update_icons.dm
+11 -11
View File
@@ -248,10 +248,10 @@ There are several things that need to be remembered:
//Overlays for the worn overlay so you can overlay while you overlay
//eg: ammo counters, primed grenade flashing, etc.
//"icon_file" is used automatically for inhands etc. to make sure it gets the correct inhand file
/obj/item/proc/worn_overlays(icon_file)
/obj/item/proc/worn_overlays(icon_file, var/contained_flag = "")
. = list()
if(build_from_parts)
var/mutable_appearance/M = mutable_appearance(icon_file, "[item_state]_[worn_overlay]")
var/mutable_appearance/M = mutable_appearance(icon_file, "[item_state][contained_flag]_[worn_overlay]")
M.appearance_flags = RESET_COLOR|RESET_ALPHA
. += M
@@ -746,7 +746,7 @@ There are several things that need to be remembered:
if(l_ear.color)
result_layer.color = l_ear.color
var/image/worn_overlays = l_ear.worn_overlays(t_icon)
var/image/worn_overlays = l_ear.worn_overlays(t_icon, l_ear.contained_sprite ? WORN_LEAR : null)
if(worn_overlays)
result_layer.overlays.Add(worn_overlays)
@@ -789,7 +789,7 @@ There are several things that need to be remembered:
if(r_ear.color)
result_layer.color = r_ear.color
var/image/worn_overlays = r_ear.worn_overlays(t_icon)
var/image/worn_overlays = r_ear.worn_overlays(t_icon, r_ear.contained_sprite ? WORN_REAR : null)
if(worn_overlays)
result_layer.overlays.Add(worn_overlays)
@@ -830,7 +830,7 @@ There are several things that need to be remembered:
if(shoes.color)
result_layer.color = shoes.color
var/image/worn_overlays = shoes.worn_overlays(t_icon)
var/image/worn_overlays = shoes.worn_overlays(t_icon, shoes.contained_sprite ? WORN_SHOES : null)
if(worn_overlays)
result_layer.overlays.Add(worn_overlays)
@@ -923,7 +923,7 @@ There are several things that need to be remembered:
standing.color = head.color
standing.appearance_flags = RESET_ALPHA
var/image/worn_overlays = head.worn_overlays(t_icon)
var/image/worn_overlays = head.worn_overlays(t_icon, head.contained_sprite ? WORN_HEAD : null)
if(worn_overlays)
standing.overlays.Add(worn_overlays)
@@ -979,7 +979,7 @@ There are several things that need to be remembered:
result_layer.color = belt.color
result_layer.appearance_flags = RESET_ALPHA
var/image/worn_overlays = belt.worn_overlays(t_icon)
var/image/worn_overlays = belt.worn_overlays(t_icon, belt.contained_sprite ? WORN_BELT : null)
if(worn_overlays)
result_layer.add_overlay(worn_overlays)
@@ -1045,7 +1045,7 @@ There are several things that need to be remembered:
result_layer.color = wear_suit.color
result_layer.appearance_flags = RESET_ALPHA
var/image/worn_overlays = wear_suit.worn_overlays(t_icon)
var/image/worn_overlays = wear_suit.worn_overlays(t_icon, wear_suit.contained_sprite ? WORN_SUIT : null)
if(worn_overlays)
result_layer.overlays.Add(worn_overlays)
@@ -1288,7 +1288,7 @@ There are several things that need to be remembered:
if(l_hand.color)
result_layer.color = l_hand.color
var/image/worn_overlays = l_hand.worn_overlays(t_icon)
var/image/worn_overlays = l_hand.worn_overlays(t_icon, l_hand.contained_sprite ? WORN_LHAND : null)
if(worn_overlays)
result_layer.overlays.Add(worn_overlays)
@@ -1338,7 +1338,7 @@ There are several things that need to be remembered:
if(r_hand.color)
result_layer.color = r_hand.color
var/image/worn_overlays = r_hand.worn_overlays(t_icon)
var/image/worn_overlays = r_hand.worn_overlays(t_icon, r_hand.contained_sprite ? WORN_RHAND : null)
if(worn_overlays)
result_layer.overlays.Add(worn_overlays)
@@ -1388,7 +1388,7 @@ There are several things that need to be remembered:
if(wrists.color)
result_layer.color = wrists.color
var/image/worn_overlays = wrists.worn_overlays(t_icon)
var/image/worn_overlays = wrists.worn_overlays(t_icon, wrists.contained_sprite ? WORN_WRISTS : null)
if(worn_overlays)
result_layer.overlays.Add(worn_overlays)