From 27c49b3f34717e1b9361fe3776d7fa02cf46b5e9 Mon Sep 17 00:00:00 2001 From: The0bserver Date: Tue, 13 Apr 2021 23:38:50 -0400 Subject: [PATCH] fox fix --- code/game/objects/items/storage/fancy.dm | 2 +- code/modules/projectiles/boxes_magazines/internal/derringer.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm index 43b24aa556..0185a445fa 100644 --- a/code/game/objects/items/storage/fancy.dm +++ b/code/game/objects/items/storage/fancy.dm @@ -411,7 +411,7 @@ name = "\improper Shady Jim's Super Slims packet" desc = "If you get caught with this, we don't know you, capiche?" icon_state = "shadyjim" - spawn_type = /obj/item/ballistic/derringer + spawn_type = /obj/item/gun/ballistic/derringer /obj/item/storage/fancy/cigarettes/derringer/smuggled/PopulateContents() new spawn_type(src) diff --git a/code/modules/projectiles/boxes_magazines/internal/derringer.dm b/code/modules/projectiles/boxes_magazines/internal/derringer.dm index 356f7627e0..7cedd8b10b 100644 --- a/code/modules/projectiles/boxes_magazines/internal/derringer.dm +++ b/code/modules/projectiles/boxes_magazines/internal/derringer.dm @@ -18,7 +18,7 @@ /obj/item/ammo_box/magazine/internal/derringer/a357 name = "\improper derringer muzzle" ammo_type = /obj/item/ammo_casing/a357 - caliber = ("38","357") + caliber = list("38","357") max_ammo = 2 multiload = FALSE