cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2981 from Verkister/patch-42

Browse Source 
Fixes micro holder runtime
This commit is contained in:
Nadyr
2021-09-20 18:28:14 -04:00
committed by GitHub
parent 6ca7b08acf 514f931cf4
commit d84d2dcbb1
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/vore/resizing/holder_micro_ch.dm
View File

@@ -5,7 +5,7 @@
/obj/item/weapon/holder/micro/Initialize(mapload, mob/held) /obj/item/weapon/holder/micro/Initialize(mapload, mob/held)
. = ..() . = ..()
var/mob/living/carbon/human/H = held_mob var/mob/living/carbon/human/H = held_mob
if(H.species.name == SPECIES_TESHARI) if(istype(H) && H.species.name == SPECIES_TESHARI)
item_icons = list( item_icons = list(
slot_l_hand_str = 'icons/mob/items/lefthand_toys_yw.dmi', slot_l_hand_str = 'icons/mob/items/lefthand_toys_yw.dmi',
slot_r_hand_str = 'icons/mob/items/righthand_toys_yw.dmi', slot_r_hand_str = 'icons/mob/items/righthand_toys_yw.dmi',
@@ -23,7 +23,7 @@
/obj/item/weapon/holder/micro/make_worn_icon(var/body_type,var/slot_name,var/inhands,var/default_icon,var/default_layer,var/icon/clip_mask = null) /obj/item/weapon/holder/micro/make_worn_icon(var/body_type,var/slot_name,var/inhands,var/default_icon,var/default_layer,var/icon/clip_mask = null)
var/mob/living/carbon/human/H = held_mob var/mob/living/carbon/human/H = held_mob
// Only proceed if dealing with a tesh // Only proceed if dealing with a tesh
if ( H.species.name == SPECIES_TESHARI ) if(istype(H) && H.species.name == SPECIES_TESHARI)
var/colortemp = color //save original color var to a temp var var/colortemp = color //save original color var to a temp var
//convert numerical RGB to Hex #000000 format - is this necessary? //convert numerical RGB to Hex #000000 format - is this necessary?
//then 'inject' changed color (from skin color) into original proc call //then 'inject' changed color (from skin color) into original proc call