From 6ad704e5328de06431ff1fe70c0eaa5c88fe463e Mon Sep 17 00:00:00 2001 From: Chemlight Date: Thu, 24 Sep 2020 21:23:41 -0700 Subject: [PATCH] Round start Warden shotgun "Due to unfortunate events with mishandling equipment in the security departments, we have exchanged the mutinition found in the compact shotgun found in the warden's locker due to a 'workplace hazard'," --- code/modules/projectiles/boxes_magazines/internal/shotgun.dm | 2 +- code/modules/projectiles/guns/ballistic/shotgun.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/projectiles/boxes_magazines/internal/shotgun.dm b/code/modules/projectiles/boxes_magazines/internal/shotgun.dm index 09d056a5..13c6e647 100644 --- a/code/modules/projectiles/boxes_magazines/internal/shotgun.dm +++ b/code/modules/projectiles/boxes_magazines/internal/shotgun.dm @@ -30,7 +30,7 @@ /obj/item/ammo_box/magazine/internal/shot/com/compact name = "compact combat shotgun internal magazine" - ammo_type = /obj/item/ammo_casing/shotgun/buckshot + ammo_type = /obj/item/ammo_casing/shotgun/rubbershot max_ammo = 4 /obj/item/ammo_box/magazine/internal/shot/dual diff --git a/code/modules/projectiles/guns/ballistic/shotgun.dm b/code/modules/projectiles/guns/ballistic/shotgun.dm index 035a6cde..43295baf 100644 --- a/code/modules/projectiles/guns/ballistic/shotgun.dm +++ b/code/modules/projectiles/guns/ballistic/shotgun.dm @@ -215,7 +215,7 @@ desc = "A modified version of the semi automatic combat shotgun with a collapsible stock. For close encounters." icon_state = "cshotgunc" item_state = "combatshotgun" - mag_type = /obj/item/ammo_box/magazine/internal/shot/com + mag_type = /obj/item/ammo_box/magazine/internal/shot/com/compact w_class = WEIGHT_CLASS_NORMAL var/stock = FALSE recoil = 5