mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 10:12:45 +00:00
[MIRROR] gunshot residue should only be on clothing/human (#9222)
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com> Co-authored-by: Kashargul <KashL@t-online.de>
This commit is contained in:
@@ -461,7 +461,6 @@ 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 // CHOMPRemove no bandaids
|
||||
|
||||
/obj/item/communicator/watch/update_icon()
|
||||
if(video_source)
|
||||
|
||||
@@ -80,8 +80,6 @@ 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))
|
||||
|
||||
@@ -86,7 +86,7 @@
|
||||
if(chambered.leaves_residue)
|
||||
var/mob/living/carbon/human/H = loc
|
||||
if(istype(H))
|
||||
if(!istype(H.gloves, /obj/item/clothing)) // CHOMPEdit
|
||||
if(!istype(H.gloves, /obj/item/clothing))
|
||||
H.gunshot_residue = chambered.caliber
|
||||
else
|
||||
var/obj/item/clothing/G = H.gloves
|
||||
|
||||
Reference in New Issue
Block a user