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

Stun Revolver Fix

Browse Source
This commit is contained in:
Chompstation Bot
2021-08-24 23:58:41 +00:00
parent 9fa44f50ce
commit 593dd3ea79
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/game/objects/structures/crates_lockers/closets/secure/security.dm
View File

@@ -238,8 +238,18 @@
starts_with = list( starts_with = list(
/obj/item/clothing/accessory/badge/holo/detective, /obj/item/clothing/accessory/badge/holo/detective,
<<<<<<< HEAD
/obj/item/clothing/gloves/forensic, //CHOMP Edit replaces black gloves /obj/item/clothing/gloves/forensic, //CHOMP Edit replaces black gloves
/obj/item/gunbox, //CHOMP Edit undoes vorestation removal and adds back gunbox /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/belt/detective,
/obj/item/weapon/storage/box/evidence, /obj/item/weapon/storage/box/evidence,
/obj/item/device/radio/headset/headset_sec, /obj/item/device/radio/headset/headset_sec,

1
code/modules/projectiles/guns/energy/stun_vr.dm
View File

@@ -3,5 +3,4 @@
fire_delay = 4 fire_delay = 4
/obj/item/weapon/gun/energy/stunrevolver /obj/item/weapon/gun/energy/stunrevolver
icon = 'icons/obj/gun_vr.dmi'
charge_cost = 400 charge_cost = 400