Bad Moon on the Rise: A Farewell to Arms edition (#9715)

This commit is contained in:
Alberyk
2020-08-22 06:22:56 -03:00
committed by GitHub
parent 2da2e50644
commit 59a3ed600b
28 changed files with 249 additions and 17 deletions
+9 -2
View File
@@ -1471,7 +1471,8 @@
/obj/item/gun/projectile/shotgun/doublebarrel/pellet = 1,
/obj/item/gun/projectile/shotgun/pump/rifle = 1,
/obj/item/gun/projectile/tanto = 1,
/obj/item/gun/projectile/gauss = 1
/obj/item/gun/projectile/gauss = 1,
/obj/item/gun/projectile/revolver/knife = 1
)
var/list/Rare = list(
@@ -1493,7 +1494,9 @@
/obj/item/gun/projectile/shotgun/doublebarrel/sawn = 1,
/obj/item/gun/projectile/shotgun/foldable = 1,
/obj/item/gun/projectile/shotgun/pump/combat = 1,
/obj/item/gun/projectile/shotgun/pump/combat/sol = 1
/obj/item/gun/projectile/shotgun/pump/combat/sol = 1,
/obj/item/gun/projectile/automatic/rifle/adhomian = 1,
/obj/item/gun/projectile/musket = 0.5
)
var/list/Epic = list(
@@ -1535,6 +1538,10 @@
var/obj/item/ammo_magazine/am = spawned.magazine_type
new am(spawned.loc)
new am(spawned.loc)
if(istype(spawned, /obj/item/gun/projectile/musket))
new /obj/item/reagent_containers/powder_horn(spawned.loc)
else if(istype(spawned, /obj/item/gun/projectile/shotgun) && spawned.caliber == "shotgun")
if(istype(spawned.loc, /obj/item/storage/box))
spawned.loc.icon_state = "largebox"