cyberpresidentvanellope/Citadel-Station-13-RP
1
0
Fork 0
mirror of https://github.com/Citadel-Station-13/Citadel-Station-13-RP.git synced 2026-08-22 22:37:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

renames a lot of item flags, organizes flags, introduces item_persist_flags (#5070)

Browse Source 
Co-authored-by: silicons <no@you.cat>
This commit is contained in:
silicons
2023-03-08 12:28:26 -06:00
committed by GitHub
co-authored by silicons
parent 00a30b3cb6
commit 257d52c83d
129 changed files with 1002 additions and 1002 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/organs/external/_external.dm
Vendored
+2 -2
View File
@@ -1329,11 +1329,11 @@ Note that amputating the affected organ does in fact remove the infection from t
if(owner)
var/list/protective_gear = list(owner.head, owner.wear_mask, owner.wear_suit, owner.w_uniform, owner.gloves, owner.shoes, owner.glasses)
for(var/obj/item/clothing/gear in protective_gear)
if(gear.body_parts_covered & target_covering)
if(gear.body_cover_flags & target_covering)
covering_clothing |= gear
if(LAZYLEN(gear.accessories))
for(var/obj/item/clothing/accessory/bling in gear.accessories)
if(bling.body_parts_covered & src.body_part)
if(bling.body_cover_flags & src.body_part)
covering_clothing |= bling
return covering_clothing
code/modules/organs/external/_external_icons.dm
Vendored
+1 -1
View File
@@ -130,7 +130,7 @@ GLOBAL_LIST_EMPTY(limb_icon_cache)
if(owner.h_style)
var/style = owner.h_style
var/datum/sprite_accessory/hair/hair_style = GLOB.legacy_hair_lookup[style]
if(owner.head && (owner.head.flags_inv & BLOCKHEADHAIR))
if(owner.head && (owner.head.inv_hide_flags & BLOCKHEADHAIR))
if(!(hair_style.hair_flags & HAIR_VERY_SHORT))
hair_style = GLOB.legacy_hair_lookup["Short Hair"]
if(hair_style && (!hair_style.apply_restrictions || (species.get_bodytype_legacy(owner) in hair_style.species_allowed)))
code/modules/organs/external/standard_vr.dm
Vendored
+1 -1
View File
@@ -42,7 +42,7 @@
facial_s.Blend(rgb(owner.r_facial, owner.g_facial, owner.b_facial), ICON_ADD)
overlays_to_add.Add(image(facial_s, "pixel_y" = head_offset))
if(owner.h_style && !(owner.head && (owner.head.flags_inv & BLOCKHEADHAIR)))
if(owner.h_style && !(owner.head && (owner.head.inv_hide_flags & BLOCKHEADHAIR)))
var/datum/sprite_accessory/hair_style = GLOB.legacy_hair_lookup[owner.h_style]
if(hair_style && (!hair_style.apply_restrictions || (species.get_bodytype_legacy(owner) in hair_style.species_allowed)))
var/icon/hair_s = new/icon("icon" = hair_style.icon, "icon_state" = "[hair_style.icon_state]_s")