From 90b0f9cc3a00cb8098c7a462500f9d7026a3c605 Mon Sep 17 00:00:00 2001 From: TheRyeGuyWhoWillNowDie <70169560+TheRyeGuyWhoWillNowDie@users.noreply.github.com> Date: Thu, 16 Jun 2022 20:12:28 -0400 Subject: [PATCH 1/3] Update shotgun.dm --- code/modules/projectiles/projectile/bullets/shotgun.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/modules/projectiles/projectile/bullets/shotgun.dm b/code/modules/projectiles/projectile/bullets/shotgun.dm index 7b3a39fadc73..dca3fad7fef5 100644 --- a/code/modules/projectiles/projectile/bullets/shotgun.dm +++ b/code/modules/projectiles/projectile/bullets/shotgun.dm @@ -4,6 +4,10 @@ sharpness = SHARP_POINTY wound_bonus = -30 +/obj/item/projectile/bullet/shotgun_slug/syndie + name = "12g syndicate shotgun slug" + damage = 60 + /obj/item/projectile/bullet/shotgun_beanbag name = "beanbag slug" damage = 5 From 5ba4a16e1464605bca0e8ae6a45baf93282ea86c Mon Sep 17 00:00:00 2001 From: TheRyeGuyWhoWillNowDie <70169560+TheRyeGuyWhoWillNowDie@users.noreply.github.com> Date: Thu, 16 Jun 2022 20:16:59 -0400 Subject: [PATCH 2/3] Update shotgun.dm --- code/modules/projectiles/ammunition/ballistic/shotgun.dm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/code/modules/projectiles/ammunition/ballistic/shotgun.dm b/code/modules/projectiles/ammunition/ballistic/shotgun.dm index a8f463e4ca5a..34701ed54017 100644 --- a/code/modules/projectiles/ammunition/ballistic/shotgun.dm +++ b/code/modules/projectiles/ammunition/ballistic/shotgun.dm @@ -8,6 +8,11 @@ projectile_type = /obj/item/projectile/bullet/shotgun_slug materials = list(/datum/material/iron=4000) +/obj/item/ammo_casing/shotgun/syndie + name = "syndicate shotgun slug" + desc = "An illegal type of ammunition used by the syndicate for their bulldog shotguns. Hopefully you're not the one on the receiving end." + projectile_type = /obj/item/projectile/bullet/shotgun_slug/syndie + /obj/item/ammo_casing/shotgun/beanbag name = "beanbag slug" desc = "A weak beanbag slug for riot control." From 58c5df4aa285bfb8c25b75d9b7bcde31825a526d Mon Sep 17 00:00:00 2001 From: TheRyeGuyWhoWillNowDie <70169560+TheRyeGuyWhoWillNowDie@users.noreply.github.com> Date: Thu, 16 Jun 2022 20:18:16 -0400 Subject: [PATCH 3/3] Update shotgun.dm --- code/modules/projectiles/boxes_magazines/external/shotgun.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/projectiles/boxes_magazines/external/shotgun.dm b/code/modules/projectiles/boxes_magazines/external/shotgun.dm index 2123d76c857c..268b6dbc0b00 100644 --- a/code/modules/projectiles/boxes_magazines/external/shotgun.dm +++ b/code/modules/projectiles/boxes_magazines/external/shotgun.dm @@ -16,9 +16,9 @@ ammo_type = /obj/item/ammo_casing/shotgun/stunslug /obj/item/ammo_box/magazine/m12g/slug - name = "shotgun magazine (12g slugs)" + name = "shotgun magazine (12g syndicate slugs)" icon_state = "m12gb" //this may need an unique sprite - ammo_type = /obj/item/ammo_casing/shotgun + ammo_type = /obj/item/ammo_casing/shotgun/syndie /obj/item/ammo_box/magazine/m12g/dragon name = "shotgun magazine (12g dragon's breath)"