diff --git a/code/game/objects/items/devices/communicator/communicator.dm b/code/game/objects/items/devices/communicator/communicator.dm index 338fd532c5..b056f93e61 100644 --- a/code/game/objects/items/devices/communicator/communicator.dm +++ b/code/game/objects/items/devices/communicator/communicator.dm @@ -461,7 +461,7 @@ var/global/list/obj/item/communicator/all_communicators = list() icon = 'icons/obj/device.dmi' icon_state = "commwatch" slot_flags = SLOT_GLOVES | SLOT_ID | SLOT_BELT //CHOMPEDIT, Commwatches and Wrtist PDAs can go on ID and belt slots - var/gunshot_residue //CHOMPEDIT - Fixes a bug where guns cannot be operated while wearing a watch + // var/gunshot_residue //CHOMPEDIT - Fixes a bug where guns cannot be operated while wearing a watch // CHOMPRemove no bandaids /obj/item/communicator/watch/update_icon() if(video_source) diff --git a/code/modules/pda/pda.dm b/code/modules/pda/pda.dm index 10fdc2e053..e7edda75b4 100644 --- a/code/modules/pda/pda.dm +++ b/code/modules/pda/pda.dm @@ -80,6 +80,8 @@ var/global/list/obj/item/pda/PDAs = list() var/list/notifying_programs = list() var/retro_mode = 0 + // var/gunshot_residue // VOREstation edit: prevents wrist PDA from preventing gun use // CHOMPRemove no bandaids + /obj/item/pda/examine(mob/user) . = ..() if(Adjacent(user)) diff --git a/code/modules/projectiles/guns/projectile.dm b/code/modules/projectiles/guns/projectile.dm index 20fb358a74..f8b2be6ab1 100644 --- a/code/modules/projectiles/guns/projectile.dm +++ b/code/modules/projectiles/guns/projectile.dm @@ -86,7 +86,7 @@ if(chambered.leaves_residue) var/mob/living/carbon/human/H = loc if(istype(H)) - if(!H.gloves) + if(!istype(H.gloves, /obj/item/clothing)) // CHOMPEdit H.gunshot_residue = chambered.caliber else var/obj/item/clothing/G = H.gloves diff --git a/code/modules/projectiles/guns/projectile_ch.dm b/code/modules/projectiles/guns/projectile_ch.dm index e65aefe8b4..aa184cdb12 100644 --- a/code/modules/projectiles/guns/projectile_ch.dm +++ b/code/modules/projectiles/guns/projectile_ch.dm @@ -202,9 +202,9 @@ if(chambered.leaves_residue) var/mob/living/carbon/human/H = loc if(istype(H)) - if(!H.gloves) + if(!istype(H.gloves, /obj/item/clothing)) H.gunshot_residue = chambered.caliber - else if (istype(H.gloves, /obj/item/clothing)) + else var/obj/item/clothing/G = H.gloves G.gunshot_residue = chambered.caliber