Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions code/modules/projectiles/ammunition/ballistic/shotgun.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
4 changes: 2 additions & 2 deletions code/modules/projectiles/boxes_magazines/external/shotgun.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)"
Expand Down
4 changes: 4 additions & 0 deletions code/modules/projectiles/projectile/bullets/shotgun.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down