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

Belt colors (#11050)

Browse Source 
rscadd: "Adds colorable belts."
    tweak: "Fannypacks are now recolorable."
    rscadd: "Belts now have a dedicated loadout section.
This commit is contained in:
Wowzewow (Wezzy)
2021-02-07 16:45:36 +02:00
committed by GitHub
parent bf459a089d
commit 0dbad15736
11 changed files with 149 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout_belt.dm
+18
View File
@@ -0,0 +1,18 @@
/datum/gear/belt
display_name = "belt"
path = /obj/item/storage/belt/generic
slot = slot_belt
sort_category = "Belts"
flags = GEAR_HAS_COLOR_SELECTION
/datum/gear/belt/fannypack
display_name = "fannypack"
cost = 2
path = /obj/item/storage/belt/fannypack/recolorable
/datum/gear/belt/toolbelt_alt
display_name = "tool-belt, alt"
cost = 0
path = /obj/item/storage/belt/utility/alt
allowed_roles = list("Station Engineer", "Atmospheric Technician", "Chief Engineer", "Engineering Apprentice", "Roboticist")
flags = null
code/modules/client/preference_setup/loadout/loadout_utility.dm
-26
View File
@@ -79,32 +79,6 @@
display_name = "camera"
path = /obj/item/device/camera
/datum/gear/utility/fannypack
display_name = "fannypack selection"
cost = 2
path = /obj/item/storage/belt/fannypack
/datum/gear/utility/fannypack/New()
..()
var/list/fannys = list()
fannys["leather fannypack"] = /obj/item/storage/belt/fannypack
fannys["black fannypack"] = /obj/item/storage/belt/fannypack/black
fannys["blue fannypack"] = /obj/item/storage/belt/fannypack/blue
fannys["cyan fannypack"] = /obj/item/storage/belt/fannypack/cyan
fannys["green fannypack"] = /obj/item/storage/belt/fannypack/green
fannys["orange fannypack"] = /obj/item/storage/belt/fannypack/orange
fannys["purple fannypack"] = /obj/item/storage/belt/fannypack/purple
fannys["red fannypack"] = /obj/item/storage/belt/fannypack/red
fannys["white fannypack"] = /obj/item/storage/belt/fannypack/white
fannys["yellow fannypack"] = /obj/item/storage/belt/fannypack/yellow
gear_tweaks += new/datum/gear_tweak/path(fannys)
/datum/gear/utility/toolbelt_alt
display_name = "tool-belt, alt"
cost = 0
path = /obj/item/storage/belt/utility/alt
allowed_roles = list("Station Engineer", "Atmospheric Technician", "Chief Engineer", "Engineering Apprentice", "Roboticist")
/datum/gear/utility/himeo_kit
display_name = "himean voidsuit kit"
path = /obj/item/himeo_kit
code/modules/mob/living/carbon/human/update_icons.dm
+36 -21
View File
@@ -959,35 +959,42 @@ There are several things that need to be remembered:
if (QDELING(src))
return
overlays_raw[BELT_LAYER] = null
overlays_raw[BELT_LAYER_ALT] = null
if(belt)
belt.screen_loc = ui_belt //TODO
var/t_state = belt.item_state
var/t_icon = belt.icon || belt.icon_state
var/image/standing
belt.screen_loc = ui_belt
var/image/result_layer = null
//Determine the icon to use
var/t_icon = INV_BELT_DEF_ICON
if(belt.contained_sprite)
belt.auto_adapt_species(src)
t_state = "[UNDERSCORE_OR_NULL(belt.icon_species_tag)][belt.item_state][WORN_BELT]"
if(belt.icon_override)
t_icon = belt.icon_override
var/t_state = "[UNDERSCORE_OR_NULL(belt.icon_species_tag)][belt.item_state][WORN_BELT]"
result_layer = image(belt.icon_override || belt.icon, t_state)
else if(belt.icon_override)
t_icon = belt.icon_override
else if(belt.sprite_sheets && belt.sprite_sheets[GET_BODY_TYPE])
t_icon = belt.sprite_sheets[GET_BODY_TYPE]
else if(belt.item_icons && (slot_belt_str in belt.item_icons))
t_icon = belt.item_icons[slot_belt_str]
else
t_icon = 'icons/mob/belt.dmi'
t_icon = INV_BELT_DEF_ICON
if(!result_layer) //Create the image
result_layer = image(t_icon, belt.icon_state)
if(belt.color)
result_layer.color = belt.color
result_layer.appearance_flags = RESET_ALPHA
var/image/worn_overlays = belt.worn_overlays(t_icon)
if(worn_overlays)
result_layer.overlays.Add(worn_overlays)
standing = image(t_icon, t_state)
standing.appearance_flags = RESET_ALPHA
var/list/ovr
if(belt.contents.len && istype(belt, /obj/item/storage/belt))
ovr = list(standing)
ovr = list(result_layer)
for(var/obj/item/i in belt.contents)
var/c_state
var/c_icon
@@ -995,23 +1002,31 @@ There are several things that need to be remembered:
c_state = "[UNDERSCORE_OR_NULL(i.icon_species_tag)][i.item_state][WORN_BELT]"
c_icon = belt.icon_override || belt.icon
else
c_icon = 'icons/mob/belt.dmi'
c_icon = INV_BELT_DEF_ICON
c_state = i.item_state || i.icon_state
var/image/belt_item_image = image(c_icon, c_state)
if(i.color)
belt_item_image.color = i.color
belt_item_image.appearance_flags = RESET_ALPHA
ovr += image(c_icon, c_state)
var/beltlayer = BELT_LAYER
var/belt_layer = BELT_LAYER
if(istype(belt, /obj/item/storage/belt))
var/obj/item/storage/belt/ubelt = belt
if(ubelt.show_above_suit)
beltlayer = BELT_LAYER_ALT
var/obj/item/storage/belt/B = belt
if(B.show_above_suit)
belt_layer = BELT_LAYER_ALT
overlays_raw[beltlayer] = ovr || standing
overlays_raw[belt_layer] = ovr || result_layer
else
overlays_raw[BELT_LAYER] = null
overlays_raw[BELT_LAYER_ALT] = null
if(update_icons)
update_icon()
if (QDELING(src))
return
/mob/living/carbon/human/update_inv_wear_suit(var/update_icons=1)
if (QDELING(src))
return