cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-19 02:56:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11408 from VOREStation/upstream-merge-8178

Browse Source 
[MIRROR] Stun Revolver Update
This commit is contained in:
Aronai Sieyes
2021-08-15 01:00:11 -04:00
committed by GitHub
parent 0b8305ff4a 98163fd3fa
commit fd8da95ec7
7 changed files with 54 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/storage/belt.dm
+1
View File
@@ -167,6 +167,7 @@
/obj/item/weapon/melee/baton,
/obj/item/weapon/gun/energy/taser,
/obj/item/weapon/gun/energy/stunrevolver,
/obj/item/weapon/gun/energy/stunrevolver/vintage,
/obj/item/weapon/gun/magnetic/railgun/heater/pistol,
/obj/item/weapon/gun/energy/gun,
/obj/item/weapon/flame/lighter,
code/game/objects/random/guns_and_ammo.dm
+1
View File
@@ -31,6 +31,7 @@
prob(4);/obj/item/weapon/gun/energy/taser,
prob(2);/obj/item/weapon/gun/energy/crossbow/largecrossbow,
prob(4);/obj/item/weapon/gun/energy/stunrevolver,
prob(2);/obj/item/weapon/gun/energy/stunrevolver/vintage,
prob(3);/obj/item/weapon/gun/energy/gun/compact)
/obj/random/energy/sec
code/game/objects/structures/crates_lockers/closets/secure/security.dm
+2 -1
View File
@@ -231,7 +231,8 @@
starts_with = list(
/obj/item/clothing/accessory/badge/holo/detective,
/obj/item/clothing/gloves/black,
///obj/item/gunbox, //VOREStation Removal,
///obj/item/gunbox, // VOREStation Removal
///obj/item/weapon/gun/energy/stunrevolver/vintage, // VOREStation Removal
/obj/item/weapon/storage/belt/detective,
/obj/item/weapon/storage/box/evidence,
/obj/item/device/radio/headset/headset_sec,