From ab3c0e033274630cc682fa8dd9437efb6bd80369 Mon Sep 17 00:00:00 2001 From: EdgeLordExe <42111655+EdgeLordExe@users.noreply.github.com> Date: Fri, 25 Dec 2020 21:37:47 +0100 Subject: [PATCH] [Fuck Shotties] Makes shotguns specialist weaponry. (#55663) Shotgun slugs can no longer be made in an autolathe. Buckshot rounds can no longer be made in an autolathe. Frag12 rounds deal less direct damage, since they fucking explode. Pulse shot rounds deal less damage. Increased the cooldown on riot shotguns. Removed buckshot rounds from all maps. Combat shotguns start with beanbags. Why It's Good For The Game Shotguns have been overpowered for too long. NT is lasers , syndicate is ballistics. --- _maps/map_files/Deltastation/DeltaStation2.dmm | 1 - _maps/map_files/IceBoxStation/IceBoxStation.dmm | 1 - _maps/map_files/KiloStation/KiloStation.dmm | 1 - _maps/map_files/MetaStation/MetaStation.dmm | 1 - .../crates_lockers/closets/secure/security.dm | 10 ---------- code/modules/cargo/packs.dm | 5 +---- .../boxes_magazines/internal/shotgun.dm | 2 +- .../projectiles/guns/ballistic/shotgun.dm | 2 +- code/modules/projectiles/projectile/beams.dm | 2 +- .../projectiles/projectile/bullets/shotgun.dm | 6 +++--- .../research/designs/autolathe_designs.dm | 16 ---------------- 11 files changed, 7 insertions(+), 40 deletions(-) diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index e0664f080e6..acc345796e1 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -53380,7 +53380,6 @@ /turf/open/floor/plasteel, /area/ai_monitored/security/armory) "bZY" = ( -/obj/structure/closet/secure_closet/lethalshots, /obj/machinery/light{ dir = 4 }, diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index f3ab8c268ad..368d2b3152d 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -782,7 +782,6 @@ /turf/open/floor/plasteel, /area/quartermaster/qm) "abN" = ( -/obj/structure/closet/secure_closet/lethalshots, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) "abO" = ( diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 45878c3525d..d5ceafa06ef 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -6144,7 +6144,6 @@ /turf/open/floor/plasteel/showroomfloor, /area/science/mixing) "akC" = ( -/obj/structure/closet/secure_closet/lethalshots, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ dir = 8 diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index b7c089541a9..0faf7beceed 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -6534,7 +6534,6 @@ /turf/open/space/basic, /area/space/nearstation) "aoy" = ( -/obj/structure/closet/secure_closet/lethalshots, /obj/effect/turf_decal/tile/red{ dir = 1 }, diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 642a48d0839..d109fb4c66d 100755 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -299,16 +299,6 @@ new /obj/item/clothing/mask/gas/sechailer(src) new /obj/item/clothing/suit/armor/bulletproof(src) -/obj/structure/closet/secure_closet/lethalshots - name = "shotgun lethal rounds" - req_access = list(ACCESS_ARMORY) - icon_state = "tac" - -/obj/structure/closet/secure_closet/lethalshots/PopulateContents() - ..() - for(var/i in 1 to 3) - new /obj/item/storage/box/lethalshot(src) - /obj/structure/closet/secure_closet/labor_camp_security name = "labor camp security locker" req_access = list(ACCESS_SECURITY) diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index a29c93fe6a1..f45b06f1fe1 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -260,14 +260,11 @@ /datum/supply_pack/security/ammo name = "Ammo Crate" - desc = "Contains two 20-round magazines for the WT-550 Auto Rifle, three boxes of buckshot ammo, three boxes of rubber ammo and special .38 speedloarders. Requires Security access to open." + desc = "Contains two 20-round magazines for the WT-550 Auto Rifle, three boxes of rubber ammo and special .38 speedloarders. Requires Security access to open." cost = CARGO_CRATE_VALUE * 8 access_view = ACCESS_ARMORY contains = list(/obj/item/ammo_box/magazine/wt550m9, /obj/item/ammo_box/magazine/wt550m9, - /obj/item/storage/box/lethalshot, - /obj/item/storage/box/lethalshot, - /obj/item/storage/box/lethalshot, /obj/item/storage/box/rubbershot, /obj/item/storage/box/rubbershot, /obj/item/storage/box/rubbershot, diff --git a/code/modules/projectiles/boxes_magazines/internal/shotgun.dm b/code/modules/projectiles/boxes_magazines/internal/shotgun.dm index 2f215e7d6be..d925e383b76 100644 --- a/code/modules/projectiles/boxes_magazines/internal/shotgun.dm +++ b/code/modules/projectiles/boxes_magazines/internal/shotgun.dm @@ -15,7 +15,7 @@ /obj/item/ammo_box/magazine/internal/shot/com name = "combat shotgun internal magazine" - ammo_type = /obj/item/ammo_casing/shotgun/buckshot + ammo_type = /obj/item/ammo_casing/shotgun/beanbag max_ammo = 6 /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 38f9ee7eee5..f7d4a39defe 100644 --- a/code/modules/projectiles/guns/ballistic/shotgun.dm +++ b/code/modules/projectiles/guns/ballistic/shotgun.dm @@ -44,7 +44,7 @@ desc = "A sturdy shotgun with a longer magazine and a fixed tactical stock designed for non-lethal riot control." icon_state = "riotshotgun" inhand_icon_state = "shotgun" - fire_delay = 7 + fire_delay = 8 mag_type = /obj/item/ammo_box/magazine/internal/shot/riot sawn_desc = "Come with me if you want to live." can_be_sawn_off = TRUE diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm index 1a2445187b5..8156a923a63 100644 --- a/code/modules/projectiles/projectile/beams.dm +++ b/code/modules/projectiles/projectile/beams.dm @@ -119,7 +119,7 @@ SSexplosions.medturf += target /obj/projectile/beam/pulse/shotgun - damage = 40 + damage = 30 /obj/projectile/beam/pulse/heavy name = "heavy pulse laser" diff --git a/code/modules/projectiles/projectile/bullets/shotgun.dm b/code/modules/projectiles/projectile/bullets/shotgun.dm index 323be9158c7..14ded37adc3 100644 --- a/code/modules/projectiles/projectile/bullets/shotgun.dm +++ b/code/modules/projectiles/projectile/bullets/shotgun.dm @@ -1,6 +1,6 @@ /obj/projectile/bullet/shotgun_slug name = "12g shotgun slug" - damage = 50 + damage = 30 sharpness = SHARP_POINTY wound_bonus = 0 @@ -63,8 +63,8 @@ /obj/projectile/bullet/shotgun_frag12 name ="frag12 slug" - damage = 25 - paralyze = 50 + damage = 15 + paralyze = 10 /obj/projectile/bullet/shotgun_frag12/on_hit(atom/target, blocked = FALSE) ..() diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm index 7e0491c36a9..14089517e66 100644 --- a/code/modules/research/designs/autolathe_designs.dm +++ b/code/modules/research/designs/autolathe_designs.dm @@ -847,22 +847,6 @@ build_path = /obj/item/weaponcrafting/receiver category = list("hacked", "Security") -/datum/design/shotgun_slug - name = "Shotgun Slug" - id = "shotgun_slug" - build_type = AUTOLATHE - materials = list(/datum/material/iron = 4000) - build_path = /obj/item/ammo_casing/shotgun - category = list("hacked", "Security") - -/datum/design/buckshot_shell - name = "Buckshot Shell" - id = "buckshot_shell" - build_type = AUTOLATHE - materials = list(/datum/material/iron = 4000) - build_path = /obj/item/ammo_casing/shotgun/buckshot - category = list("hacked", "Security") - /datum/design/shotgun_dart name = "Shotgun Dart" id = "shotgun_dart"