cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Fixes wrist PDA runtiming when firing guns (#9156)

Browse Source 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
Co-authored-by: Kashargul <KashL@t-online.de>
This commit is contained in:
CHOMPStation2
2024-10-04 15:19:52 -07:00
committed by GitHub
parent c9cff325a4
commit 4acb710cfe
4 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/objects/items/devices/communicator/communicator.dm
View File

@@ -461,7 +461,7 @@ var/global/list/obj/item/communicator/all_communicators = list()
icon = 'icons/obj/device.dmi' icon = 'icons/obj/device.dmi'
icon_state = "commwatch" icon_state = "commwatch"
slot_flags = SLOT_GLOVES | SLOT_ID | SLOT_BELT //CHOMPEDIT, Commwatches and Wrtist PDAs can go on ID and belt slots 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() /obj/item/communicator/watch/update_icon()
if(video_source) if(video_source)

2
code/modules/pda/pda.dm
View File

@@ -80,6 +80,8 @@ var/global/list/obj/item/pda/PDAs = list()
var/list/notifying_programs = list() var/list/notifying_programs = list()
var/retro_mode = 0 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) /obj/item/pda/examine(mob/user)
. = ..() . = ..()
if(Adjacent(user)) if(Adjacent(user))

2
code/modules/projectiles/guns/projectile.dm
View File

@@ -86,7 +86,7 @@
if(chambered.leaves_residue) if(chambered.leaves_residue)
var/mob/living/carbon/human/H = loc var/mob/living/carbon/human/H = loc
if(istype(H)) if(istype(H))
if(!H.gloves) if(!istype(H.gloves, /obj/item/clothing)) // CHOMPEdit
H.gunshot_residue = chambered.caliber H.gunshot_residue = chambered.caliber
else else
var/obj/item/clothing/G = H.gloves var/obj/item/clothing/G = H.gloves

4
code/modules/projectiles/guns/projectile_ch.dm
View File

@@ -202,9 +202,9 @@
if(chambered.leaves_residue) if(chambered.leaves_residue)
var/mob/living/carbon/human/H = loc var/mob/living/carbon/human/H = loc
if(istype(H)) if(istype(H))
if(!H.gloves) if(!istype(H.gloves, /obj/item/clothing))
H.gunshot_residue = chambered.caliber H.gunshot_residue = chambered.caliber
else if (istype(H.gloves, /obj/item/clothing)) else
var/obj/item/clothing/G = H.gloves var/obj/item/clothing/G = H.gloves
G.gunshot_residue = chambered.caliber G.gunshot_residue = chambered.caliber