From 593dd3ea793b0a5a378c1e2aef185d23b54b9dff Mon Sep 17 00:00:00 2001 From: Chompstation Bot Date: Tue, 24 Aug 2021 23:58:41 +0000 Subject: [PATCH] Stun Revolver Fix --- .../crates_lockers/closets/secure/security.dm | 10 ++++++++++ code/modules/projectiles/guns/energy/stun_vr.dm | 1 - 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 0e05016224..f73ad26e5b 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -238,8 +238,18 @@ starts_with = list( /obj/item/clothing/accessory/badge/holo/detective, +<<<<<<< HEAD /obj/item/clothing/gloves/forensic, //CHOMP Edit replaces black gloves /obj/item/gunbox, //CHOMP Edit undoes vorestation removal and adds back gunbox +||||||| parent of 9c2f8d371d... Merge pull request #11464 from GhostActual/stunrevolver_fix + /obj/item/clothing/gloves/black, + ///obj/item/gunbox, // VOREStation Removal + ///obj/item/weapon/gun/energy/stunrevolver/vintage, // VOREStation Removal +======= + /obj/item/clothing/gloves/black, + ///obj/item/gunbox, // VOREStation Removal + /obj/item/weapon/gun/energy/stunrevolver/vintage, +>>>>>>> 9c2f8d371d... Merge pull request #11464 from GhostActual/stunrevolver_fix /obj/item/weapon/storage/belt/detective, /obj/item/weapon/storage/box/evidence, /obj/item/device/radio/headset/headset_sec, diff --git a/code/modules/projectiles/guns/energy/stun_vr.dm b/code/modules/projectiles/guns/energy/stun_vr.dm index db038e58fd..b0bfd53e46 100644 --- a/code/modules/projectiles/guns/energy/stun_vr.dm +++ b/code/modules/projectiles/guns/energy/stun_vr.dm @@ -3,5 +3,4 @@ fire_delay = 4 /obj/item/weapon/gun/energy/stunrevolver - icon = 'icons/obj/gun_vr.dmi' charge_cost = 400 \ No newline at end of file