shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Final test, fixes and parent calls.

Browse Source
This commit is contained in:
Ghommie
2020-04-14 01:23:26 +02:00
parent 616d482cf6
commit 42ff9b1d35
16 changed files with 42 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/antagonists/clockcult/clock_items/clockwork_slab.dm
+1 -1
View File
@@ -122,7 +122,7 @@
addtimer(CALLBACK(src, .proc/check_on_mob, user), 1) //dropped is called before the item is out of the slot, so we need to check slightly later
/obj/item/clockwork/slab/worn_overlays(isinhands = FALSE, icon_file, used_state, style_flags = NONE)
. = list()
. = ..()
if(isinhands && item_state && inhand_overlay)
var/mutable_appearance/M = mutable_appearance(icon_file, "slab_[inhand_overlay]")
. += M
code/modules/antagonists/cult/cult_items.dm
+1 -1
View File
@@ -452,7 +452,7 @@
return BLOCK_NONE
/obj/item/clothing/suit/hooded/cultrobes/cult_shield/worn_overlays(isinhands, icon_file, used_state, style_flags = NONE)
. = list()
. = ..()
if(!isinhands && current_charges)
. += mutable_appearance('icons/effects/cult_effects.dmi', "shield-cult", MOB_LAYER + 0.01)
code/modules/clothing/glasses/_glasses.dm
+1 -1
View File
@@ -347,7 +347,7 @@
colored_before = TRUE
/obj/item/clothing/glasses/sunglasses/blindfold/white/worn_overlays(isinhands = FALSE, icon_file, used_state, style_flags = NONE)
. = list()
. = ..()
if(!isinhands && ishuman(loc) && !colored_before)
var/mob/living/carbon/human/H = loc
var/mutable_appearance/M = mutable_appearance('icons/mob/clothing/eyes.dmi', "blindfoldwhite")
code/modules/clothing/gloves/_gloves.dm
+1 -1
View File
@@ -27,7 +27,7 @@
return OXYLOSS
/obj/item/clothing/gloves/worn_overlays(isinhands = FALSE, icon_file, used_state, style_flags = NONE)
. = list()
. = ..()
if(!isinhands)
if(damaged_clothes)
. += mutable_appearance('icons/effects/item_damage.dmi', "damagedgloves")
code/modules/clothing/head/_head.dm
+1 -1
View File
@@ -49,7 +49,7 @@
/obj/item/clothing/head/worn_overlays(isinhands = FALSE, icon_file, used_state, style_flags = NONE)
. = list()
. = ..()
if(!isinhands)
if(damaged_clothes)
. += mutable_appearance('icons/effects/item_damage.dmi', "damagedhelmet")
code/modules/clothing/head/misc_special.dm
+1 -1
View File
@@ -205,7 +205,7 @@
icon_state = S.icon_state
/obj/item/clothing/head/wig/worn_overlays(isinhands = FALSE, icon_file, used_state, style_flags = NONE)
. = list()
. = ..()
if(!isinhands)
var/datum/sprite_accessory/S = GLOB.hair_styles_list[hair_style]
if(!S)
code/modules/clothing/masks/_masks.dm
+1 -1
View File
@@ -29,7 +29,7 @@
/obj/item/clothing/mask/proc/handle_speech()
/obj/item/clothing/mask/worn_overlays(isinhands = FALSE, icon_file, used_state, style_flags = NONE)
. = list()
. = ..()
if(!isinhands)
if(body_parts_covered & HEAD)
if(damaged_clothes)
code/modules/clothing/neck/_neck.dm
+1 -1
View File
@@ -7,7 +7,7 @@
equip_delay_other = 40
/obj/item/clothing/neck/worn_overlays(isinhands = FALSE, icon_file, used_state, style_flags = NONE)
. = list()
. = ..()
if(!isinhands)
if(body_parts_covered & HEAD)
if(damaged_clothes)
code/modules/clothing/shoes/_shoes.dm
+1 -1
View File
@@ -50,7 +50,7 @@
last_blood_DNA = blood_dna[blood_dna.len]
/obj/item/clothing/shoes/worn_overlays(isinhands = FALSE, icon_file, used_state, style_flags = NONE)
. = list()
. = ..()
if(!isinhands)
var/bloody = FALSE
if(blood_DNA)
code/modules/food_and_drinks/pizzabox.dm
+1 -1
View File
@@ -87,7 +87,7 @@
add_overlay(tag_overlay)
/obj/item/pizzabox/worn_overlays(isinhands, icon_file, used_state, style_flags = NONE)
. = list()
. = ..()
var/current_offset = 2
if(isinhands)
for(var/V in boxes) //add EXTRA BOX per box