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

[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
4 changed files with 41 additions and 2 deletions
+14 -1
View File
@@ -75,6 +75,19 @@
containername = "Shotgun crate"
access = access_armory
/* VOREStation edit -- This is a bad idea. -- So is this.
/datum/supply_pack/munitions/shotgunsemi
name = "Weapons - Semi-Automatic Shotgun crate"
contains = list(
/obj/item/ammo_magazine/ammo_box/b12g,
/obj/item/ammo_magazine/ammo_box/b12g/pellet,
/obj/item/weapon/gun/projectile/shotgun/semi = 2
)
cost = 100
containertype = /obj/structure/closet/crate/secure/weapon
containername = "Semi-Auto Shotgun crate"
access = access_armory
/datum/supply_pack/munitions/erifle
name = "Weapons - Energy marksman"
contains = list(/obj/item/weapon/gun/energy/sniperrifle = 2)
@@ -307,4 +320,4 @@
cost = 500
containertype = /obj/structure/closet/crate/secure
containername = "Light machine gun crate"
access = access_armory
access = access_armory
+5
View File
@@ -139,6 +139,11 @@
item_cost = 75
path = /obj/item/weapon/gun/projectile/shotgun/pump/combat
/datum/uplink_item/item/visible_weapons/semishotgun
name = "Semi-Automatic Shotgun"
item_cost = 100
path = /obj/item/weapon/gun/projectile/shotgun/semi
/datum/uplink_item/item/visible_weapons/leveraction
name = "Lever Action Rifle"
item_cost = 50