cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-26 22:57:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5011 from CHOMPStation2/upstream-merge-12899

Browse Source 
[MIRROR] [MIRROR] Adds Sjorgen Inertial Shotgun (by H-H) (ABLE TO BE MERGED)
This commit is contained in:
Razgriz
2022-09-22 22:17:56 -07:00
committed by GitHub
parent 64a7d9a36d 0a3deac50c
commit ddb814a248
4 changed files with 41 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/random/guns_and_ammo.dm
+7 -1
View File
@@ -98,6 +98,7 @@
prob(2);/obj/item/weapon/gun/projectile/shotgun/pump/combat,
prob(4);/obj/item/weapon/gun/projectile/shotgun/pump/rifle,
prob(3);/obj/item/weapon/gun/projectile/shotgun/pump/rifle/lever,
prob(2);/obj/item/weapon/gun/projectile/shotgun/semi,
prob(2);/obj/item/weapon/gun/projectile/silenced)
/obj/random/projectile/sec
@@ -119,7 +120,8 @@
return pick(prob(4);/obj/item/weapon/gun/projectile/shotgun/doublebarrel,
prob(3);/obj/item/weapon/gun/projectile/shotgun/doublebarrel/sawn,
prob(3);/obj/item/weapon/gun/projectile/shotgun/pump,
prob(1);/obj/item/weapon/gun/projectile/shotgun/pump/combat)
prob(1);/obj/item/weapon/gun/projectile/shotgun/pump/combat,
prob(1);/obj/item/weapon/gun/projectile/shotgun/semi)
/obj/random/handgun
name = "Random Handgun"
@@ -494,6 +496,10 @@
prob(1);list(
/obj/item/weapon/gun/projectile/shotgun/pump/combat,
/obj/item/ammo_magazine/ammo_box/b12g
),
prob(1);list(
/obj/item/weapon/gun/projectile/shotgun/semi,
/obj/item/ammo_magazine/ammo_box/b12g
)
)