From 93de2c5526646e5349709f89142dd00891d1bdaf Mon Sep 17 00:00:00 2001 From: LDip999 Date: Tue, 26 Aug 2025 01:22:22 +0200 Subject: [PATCH] Please start dropping weapons --- code/game/objects/items/storage/wallets.dm | 61 ++++++++- code/modules/cargo/packs/sec_supply.dm | 2 +- code/modules/clothing/factions/ramzi.dm | 28 +++++ .../mob/living/simple_animal/corpse.dm | 117 +++++++++++++++--- .../corpse_spawners/frontiersman.dm | 33 ++++- .../simple_animal/hostile/human/syndicate.dm | 16 ++- .../projectiles/guns/ballistic/marksman.dm | 1 + .../manufacturer/scarborough/ballistics.dm | 13 ++ 8 files changed, 249 insertions(+), 22 deletions(-) diff --git a/code/game/objects/items/storage/wallets.dm b/code/game/objects/items/storage/wallets.dm index aa3a4c5dfd05..f19c7bd319e8 100644 --- a/code/game/objects/items/storage/wallets.dm +++ b/code/game/objects/items/storage/wallets.dm @@ -10,7 +10,7 @@ var/obj/item/card/id/front_id = null var/list/combined_access var/cached_flat_icon - + var/list/startingbits = list() /obj/item/storage/wallet/ComponentInitialize() . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage/concrete/wallet) @@ -125,3 +125,62 @@ /obj/item/storage/wallet/random/PopulateContents() new /obj/effect/spawner/random/entertainment/wallet_storage(src) icon_state = "wallet" + +/obj/item/storage/wallet/drop/PopulateContents() + generate_items_inside(startingbits,src) + . = ..() + +/obj/item/storage/wallet/drop/poor/PopulateContents() + startingbits += list(/obj/item/spacecash/bundle/smallrand = 1) + . = ..() + +/obj/item/storage/wallet/drop/poor/generic/PopulateContents() + startingbits += list(/obj/item/card/id = 1) + . = ..() + +/obj/item/storage/wallet/drop/poor/solgov/PopulateContents() + startingbits += list(/obj/item/card/id/solgov = 1) + . = ..() + +/obj/item/storage/wallet/drop/poor/syndicate/PopulateContents() + startingbits += list(/obj/item/card/id/syndicate = 1) + . = ..() + +/obj/item/storage/wallet/drop/welloff/PopulateContents() + startingbits += list(/obj/item/spacecash/bundle/smallrand = 1) + startingbits += list(/obj/item/spacecash/bundle/smallrand = 1) + . = ..() + +/obj/item/storage/wallet/drop/welloff/generic/PopulateContents() + startingbits += list(/obj/item/card/id = 1) + . = ..() + +/obj/item/storage/wallet/drop/welloff/solgov/PopulateContents() + startingbits += list(/obj/item/card/id/solgov = 1) + . = ..() + + +/obj/item/storage/wallet/drop/welloff/syndicate/PopulateContents() + startingbits += list(/obj/item/card/id/syndicate = 1) + + . = ..() + +/obj/item/storage/wallet/drop/rich/PopulateContents() + startingbits += list(/obj/item/spacecash/bundle/mediumrand = 1) + . = ..() + +/obj/item/storage/wallet/drop/rich/generic/PopulateContents() + startingbits += list(/obj/item/card/id = 1) + . = ..() + +/obj/item/storage/wallet/drop/rich/solgov/PopulateContents() + startingbits += list(/obj/item/card/id/solgov = 1) + . = ..() + + +/obj/item/storage/wallet/drop/rich/syndicate/PopulateContents() + startingbits += list(/obj/item/card/id/syndicate = 1) + + . = ..() + + diff --git a/code/modules/cargo/packs/sec_supply.dm b/code/modules/cargo/packs/sec_supply.dm index b9f698209463..34573214c3f8 100644 --- a/code/modules/cargo/packs/sec_supply.dm +++ b/code/modules/cargo/packs/sec_supply.dm @@ -37,7 +37,7 @@ name = "Firearm Maintenance Kit" desc = "Contains a five-use firearm maintenance kit, useful for cleaning blood, sand, and mud out of guns." contains = list(/obj/item/gun_maint_kit) - cost = 100 //Price check this later. It's probably fine but it might be okay if it's a little more expensive + cost = 1000 crate_name = "maintenance kit crate" /datum/supply_pack/sec_supply/flashbangs diff --git a/code/modules/clothing/factions/ramzi.dm b/code/modules/clothing/factions/ramzi.dm index d90a5cf582e1..8e018e1ee7c0 100644 --- a/code/modules/clothing/factions/ramzi.dm +++ b/code/modules/clothing/factions/ramzi.dm @@ -244,3 +244,31 @@ desc = "A quick-access drop pouch harness used by cells of the Ramzi Clique." icon_state = "ramzi_harness" item_state = "ramzi_harness" + + + +/obj/item/storage/belt/security/webbing/ramzi/ringneck/PopulateContents() + for(var/i in 1 to 4) + new /obj/item/ammo_box/magazine/m10mm_ringneck(src) + new /obj/item/grenade/frag(src) + +/obj/item/storage/belt/security/webbing/ramzi/cobra/PopulateContents() + for(var/i in 1 to 2) + new /obj/item/ammo_box/magazine/m45_cobra(src) + new /obj/item/grenade/frag(src) + +/obj/item/storage/belt/security/webbing/ramzi/bulldog/PopulateContents() + for(var/i in 1 to 2) + new /obj/item/ammo_box/magazine/m12g_bulldog(src) + new /obj/item/grenade/frag(src) + +/obj/item/storage/belt/security/webbing/ramzi/boomslang/PopulateContents() + for(var/i in 1 to 2) + new /obj/item/ammo_box/magazine/boomslang(src) + new /obj/item/grenade/frag(src) + +/obj/item/storage/belt/security/webbing/ramzi/rattlesnake/PopulateContents() + for(var/i in 1 to 2) + new /obj/item/ammo_box/magazine/m9mm_rattlesnake(src) + new /obj/item/grenade/frag(src) + \ No newline at end of file diff --git a/code/modules/mob/living/simple_animal/corpse.dm b/code/modules/mob/living/simple_animal/corpse.dm index baedd9049577..5cf5117e3779 100644 --- a/code/modules/mob/living/simple_animal/corpse.dm +++ b/code/modules/mob/living/simple_animal/corpse.dm @@ -24,7 +24,7 @@ head = /obj/item/clothing/head/helmet/ramzi back = /obj/item/storage/backpack neck = /obj/item/clothing/neck/dogtag/ramzi - id = /obj/item/card/id/syndicate + id = /obj/item/storage/wallet/drop/poor/syndicate /obj/effect/mob_spawn/human/corpse/ramzi/space name = "Ramzi Hardsuit" @@ -37,6 +37,33 @@ suit = /obj/item/clothing/suit/space/hardsuit/syndi/ramzi back = /obj/item/tank/jetpack/oxygen r_pocket = /obj/item/tank/internals/emergency_oxygen + id = /obj/item/storage/wallet/drop/welloff + belt = /obj/item/storage/belt/security/webbing/ramzi/ringneck + +/obj/effect/mob_spawn/human/corpse/ramzi/space/smg + name = "Ramzi Hardsuit" + outfit = /datum/outfit/ramzi/commando/smg + + + +/datum/outfit/ramzi/commando/smg + belt = /obj/item/storage/belt/security/webbing/ramzi/cobra + l_hand = /obj/item/gun/ballistic/automatic/smg/cobra/worn + +/obj/effect/mob_spawn/human/corpse/ramzi/space/shotgun + outfit = /datum/outfit/ramzi/commando/shotgun + +/datum/outfit/ramzi/commando/shotgun + belt = /obj/item/storage/belt/security/webbing/ramzi/bulldog + l_hand = /obj/item/gun/ballistic/shotgun/automatic/bulldog/worn + +/obj/effect/mob_spawn/human/corpse/ramzi/space/sniper + outfit = /datum/outfit/ramzi/commando/sniper + +/datum/outfit/ramzi/commando/sniper + + belt = /obj/item/storage/belt/security/webbing/ramzi/boomslang + l_hand = /obj/item/gun/ballistic/automatic/marksman/boomslang/worn /obj/effect/mob_spawn/human/corpse/ramzi/space/soft name = "Ramzi Softsuit" @@ -50,6 +77,15 @@ back = /obj/item/tank/jetpack/oxygen r_pocket = /obj/item/tank/internals/emergency_oxygen +/obj/effect/mob_spawn/human/corpse/ramzi/space/soft/smg + name = "Ramzi Softsuit" + outfit = /datum/outfit/ramzi/soft/smg + +/datum/outfit/ramzi/soft/smg + belt = /obj/item/storage/belt/security/webbing/ramzi/cobra + l_hand = /obj/item/gun/ballistic/automatic/smg/cobra/worn + + /obj/effect/mob_spawn/human/corpse/ramzi/space/soft/surplus name = "Ramzi Softsuit Surplus" outfit = /datum/outfit/ramzi/soft/surplus @@ -62,6 +98,48 @@ back = /obj/item/storage/backpack r_pocket = /obj/item/tank/internals/emergency_oxygen +/obj/effect/mob_spawn/human/corpse/ramzi/knife + l_hand = /obj/item/melee/knife/combat + +/obj/effect/mob_spawn/human/corpse/ramzi/ranged/pistol + name = "Ramzi Operative" + id_job = "Operative" + outfit = /datum/outfit/ramzi/ranged/pistol + +/datum/outfit/ramzi/ranged/pistol + backpack_contents = list(/obj/item/ammo_box/magazine/m10mm_ringneck=4) + l_hand =/obj/item/gun/ballistic/automatic/pistol/ringneck/worn + +/obj/effect/mob_spawn/human/corpse/ramzi/ranged/smg + name = "Ramzi Operative" + id_job = "Operative" + outfit = /datum/outfit/ramzi/ranged/smg + +/datum/outfit/ramzi/ranged/smg + backpack_contents = list(/obj/item/ammo_box/magazine/m45_cobra=2) + l_hand = /obj/item/gun/ballistic/automatic/smg/cobra/worn + + +/obj/effect/mob_spawn/human/corpse/ramzi/ranged/shotgun + name = "Ramzi Operative" + id_job = "Operative" + outfit = /datum/outfit/ramzi/ranged/shotgun + +/datum/outfit/ramzi/ranged/shotgun + backpack_contents = list(/obj/item/ammo_box/magazine/m12g_bulldog=2) + l_hand = /obj/item/gun/ballistic/shotgun/automatic/bulldog/worn + +/obj/effect/mob_spawn/human/corpse/ramzi/ranged/sniper + name = "Ramzi Operative" + id_job = "Operative" + outfit = /datum/outfit/ramzi/ranged/sniper + +/datum/outfit/ramzi/ranged/sniper + backpack_contents = list(/obj/item/ammo_box/magazine/boomslang=2) + l_hand = /obj/item/gun/ballistic/automatic/marksman/boomslang/worn + + + /obj/effect/mob_spawn/human/corpse/ramzi/stormtrooper name = "Ramzi Clique Trooper" id_job = "Operative" @@ -74,6 +152,15 @@ head = /obj/item/clothing/head/helmet/space/hardsuit/syndi/ramzi/elite mask = /obj/item/clothing/mask/gas/ramzi back = /obj/item/tank/jetpack/oxygen/harness + l_hand = /obj/item/gun/ballistic/automatic/pistol/rattlesnake + belt = /obj/item/storage/belt/security/webbing/ramzi/rattlesnake + +/obj/effect/mob_spawn/human/corpse/syndicatecaptain + name = "Syndicate Captain" + id_job = "Syndicate Base Commander" + outfit = /datum/outfit/syndicatecaptaincorpse + hairstyle = "Bald" + facial_hairstyle = "Shaved" /datum/outfit/syndicatecaptaincorpse name = "Syndicate Captain Corpse" @@ -83,15 +170,16 @@ gloves = /obj/item/clothing/gloves/combat ears = /obj/item/radio/headset/syndicate head = /obj/item/clothing/head/HoS/syndicate - id = /obj/item/card/id + id = /obj/item/storage/wallet/drop/rich/syndicate -/obj/effect/mob_spawn/human/corpse/syndicatecaptain - name = "Syndicate Captain" - id_job = "Syndicate Base Commander" - outfit = /datum/outfit/syndicatecaptaincorpse +/obj/effect/mob_spawn/human/corpse/cybersunmedicaldirector + name = "Cybersun Medical Director Corpse" + id_job = "Cybersun Medical Director" + outfit = /datum/outfit/cybersunmedicaldirectorcorpse hairstyle = "Bald" facial_hairstyle = "Shaved" + /datum/outfit/cybersunmedicaldirectorcorpse name = "Cybersun Medical Director Corpse" uniform = /obj/item/clothing/under/rank/medical/chief_medical_officer/cybersun @@ -101,14 +189,8 @@ ears = /obj/item/radio/headset/syndicate belt = /obj/item/gun/ballistic/automatic/pistol/commander head = /obj/item/clothing/head/soft/cybersun/medical - id = /obj/item/card/id + id = /obj/item/storage/wallet/drop/rich/syndicate -/obj/effect/mob_spawn/human/corpse/cybersunmedicaldirector - name = "Cybersun Medical Director Corpse" - id_job = "Cybersun Medical Director" - outfit = /datum/outfit/cybersunmedicaldirectorcorpse - hairstyle = "Bald" - facial_hairstyle = "Shaved" /datum/outfit/cybersunfieldmediccorpse name = "Cybersun Field Medic Corpse" @@ -120,7 +202,7 @@ belt = /obj/item/storage/belt/medical/paramedic head = /obj/item/clothing/head/soft/cybersun/medical back = /obj/item/storage/backpack/messenger - id = /obj/item/card/id + id = /obj/item/storage/wallet/drop/welloff /obj/effect/mob_spawn/human/corpse/cybersunfieldmedic name = "Cybersun Field Medic" @@ -140,6 +222,7 @@ shoes = /obj/item/clothing/shoes/jackboots glasses = /obj/item/clothing/glasses/eyepatch head = /obj/item/clothing/head/bandana + id = /obj/item/storage/wallet/drop/poor /obj/effect/mob_spawn/human/corpse/pirate/ranged @@ -150,6 +233,7 @@ name = "Pirate Gunner Corpse" suit = /obj/item/clothing/suit/pirate head = /obj/item/clothing/head/pirate + l_pocket = /obj/item/stock_parts/cell/gun /obj/effect/mob_spawn/human/corpse/wizard name = "Space Wizard Corpse" @@ -176,7 +260,7 @@ mask = /obj/item/clothing/mask/gas/vigilitas head = /obj/item/clothing/head/nanotrasen/cap/security back = /obj/item/storage/backpack/messenger - id = /obj/item/card/id + id = /obj/item/storage/wallet/drop/welloff/generic /datum/outfit/vigilitas/space name = "VI Responder" @@ -189,12 +273,14 @@ suit = /obj/item/clothing/suit/space/hardsuit/security/hos head = /obj/item/clothing/head/helmet/space/hardsuit/security/hos back = /obj/item/tank/jetpack/carbondioxide + id = /obj/item/storage/wallet/drop/rich/generic /datum/outfit/vigilitas/director name = "VI director" uniform = /obj/item/clothing/under/nanotrasen/security/director suit = /obj/item/clothing/suit/armor/nanotrasen/sec_director head = /obj/item/clothing/head/nanotrasen/beret/security/command + id = /obj/item/storage/wallet/drop/rich/generic /datum/outfit/vigilitas/private name = "VI Private" @@ -227,6 +313,7 @@ back = /obj/item/storage/backpack/security gloves = /obj/item/clothing/gloves/combat + /obj/effect/mob_spawn/human/corpse/vigilitas_hos name = "VI Breacher" id_job = "Vigilitas Assault Force" diff --git a/code/modules/mob/living/simple_animal/corpse_spawners/frontiersman.dm b/code/modules/mob/living/simple_animal/corpse_spawners/frontiersman.dm index 5a461bfe9a68..81daabbac2d8 100644 --- a/code/modules/mob/living/simple_animal/corpse_spawners/frontiersman.dm +++ b/code/modules/mob/living/simple_animal/corpse_spawners/frontiersman.dm @@ -13,6 +13,8 @@ head = /obj/item/clothing/head/beret/sec/frontier gloves = /obj/item/clothing/gloves/color/black neck = /obj/item/clothing/neck/dogtag/frontier + id = /obj/item/storage/wallet/drop/poor/generic + r_hand = /obj/item/melee/knife/survival /datum/outfit/frontier/internals name = "Frontiersman Corpse Internals" @@ -20,7 +22,12 @@ l_pocket = /obj/item/tank/internals/emergency_oxygen/engi /obj/effect/mob_spawn/human/corpse/frontier/ranged - outfit = /datum/outfit/frontier + outfit = /datum/outfit/frontier/ranged + +/datum/outfit/frontier/ranged + r_hand = /obj/item/gun/ballistic/automatic/pistol/mauler/regular + belt = /obj/item/storage/belt/security/military/frontiersmen/mauler_mp_ammo + /obj/effect/mob_spawn/human/corpse/frontier/space outfit = /datum/outfit/frontier/trooper/space @@ -28,16 +35,23 @@ /obj/effect/mob_spawn/human/corpse/frontier/ranged/internals outfit = /datum/outfit/frontier/internals +/datum/outfit/frontier/ranged/internals + mask = /obj/item/clothing/mask/gas/sechailer + l_pocket = /obj/item/tank/internals/emergency_oxygen/engi + /obj/effect/mob_spawn/human/corpse/frontier/surgeon outfit = /datum/outfit/job/frontiersmen/doctor/corpse + /obj/effect/mob_spawn/human/corpse/frontier/surgeon/internals outfit = /datum/outfit/job/frontiersmen/doctor/corpse/internals /datum/outfit/job/frontiersmen/doctor/corpse name = "Frontiersmen Surgeon Corpse" - r_pocket = null - ears = null + r_hand = /obj/item/gun/syringe + id = /obj/item/storage/wallet/drop/welloff/generic + belt = /obj/item/storage/belt/medical/webbing/frontiersmen/combat + /datum/outfit/job/frontiersmen/doctor/corpse/internals name = "Frontiersmen Surgeon Corpse Internals" @@ -57,6 +71,8 @@ gloves = /obj/item/clothing/gloves/tackler/combat ears = /obj/item/radio/headset head = /obj/item/clothing/head/helmet/bulletproof/x11/frontier + r_hand = /obj/item/gun/ballistic/shotgun/brimstone + belt = /obj/item/storage/box/ammo/a12g_buckshot /datum/outfit/frontier/trooper/space name = "Frontiersman Armored Space Corpse" @@ -73,6 +89,7 @@ /obj/effect/mob_spawn/human/corpse/frontier/ranged/officer name = "Frontiersman Officer" outfit = /datum/outfit/frontier/officer + /datum/outfit/frontier/officer name = "Frontiersman Officer Corpse" @@ -81,11 +98,15 @@ shoes = /obj/item/clothing/shoes/combat ears = /obj/item/radio/headset head = /obj/item/clothing/head/frontier/peaked + r_hand = /obj/item/gun/ballistic/automatic/pistol/mauler + belt = /obj/item/storage/belt/security/military/frontiersmen/mauler_mp_ammo + id = /obj/item/storage/wallet/drop/rich/generic /obj/effect/mob_spawn/human/corpse/frontier/ranged/officer/internals name = "Frontiersman Officer Corpse Internals" outfit = /datum/outfit/frontier/officer/internals + /datum/outfit/frontier/officer/internals name = "Frontiersman Officer Corpse Internals" mask = /obj/item/clothing/mask/gas/frontiersmen @@ -98,6 +119,9 @@ name = "Frontiersman Heavy Corpse" suit = /obj/item/clothing/suit/space/hardsuit/security/independent/frontier head = /obj/item/clothing/head/beret/sec/frontier/officer + id = /obj/item/storage/wallet/drop/welloff/generic + r_hand = /obj/item/gun/ballistic/automatic/hmg/shredder + belt = /obj/item/ammo_box/magazine/m12_shredder /obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper/heavy/internals outfit = /datum/outfit/frontier/trooper/heavy/internals @@ -114,7 +138,8 @@ name = "Frontiersman Flametrooper Corpse" ears = null back = null - belt = /obj/item/storage/belt/security/military/frontiersmen + belt = /obj/item/storage/belt/security/military/frontiersmen/flamer l_hand = null backpack_contents = null box = null + r_hand = /obj/item/flamethrower diff --git a/code/modules/mob/living/simple_animal/hostile/human/syndicate.dm b/code/modules/mob/living/simple_animal/hostile/human/syndicate.dm index 4a6de5deeda7..2c2029c6eeba 100644 --- a/code/modules/mob/living/simple_animal/hostile/human/syndicate.dm +++ b/code/modules/mob/living/simple_animal/hostile/human/syndicate.dm @@ -137,7 +137,6 @@ mob_spawner = /obj/effect/mob_spawn/human/corpse/ramzi/space armor_base = /obj/item/clothing/suit/space/hardsuit/syndi/ramzi - l_hand =/obj/item/melee/knife/combat melee_damage_lower = 20 @@ -247,8 +246,11 @@ icon_living = "syndicate_pistol" casingtype = /obj/item/ammo_casing/c10mm projectilesound = 'sound/weapons/gun/pistol/shot.ogg' + mob_spawner = /obj/effect/mob_spawn/human/corpse/ramzi/ranged/pistol rapid_melee = 1 l_hand =/obj/item/gun/ballistic/automatic/pistol/ringneck + + loot = list(/obj/item/gun/ballistic/automatic/pistol/ringneck/worn = 1) /mob/living/simple_animal/hostile/human/ramzi/ranged/smg name = "Ramzi Clique Commando" @@ -259,6 +261,9 @@ casingtype = /obj/item/ammo_casing/c45 projectilesound = 'sound/weapons/gun/smg/shot.ogg' l_hand =/obj/item/gun/ballistic/automatic/smg/cobra + mob_spawner = /obj/effect/mob_spawn/human/corpse/ramzi/ranged/smg + + loot = list(/obj/item/gun/ballistic/automatic/smg/cobra/worn = 1) /mob/living/simple_animal/hostile/human/ramzi/ranged/shotgun name = "Ramzi Clique Breacher" @@ -271,7 +276,10 @@ icon_living = "syndicate_shotgun" casingtype = /obj/item/ammo_casing/shotgun/buckshot //buckshot fired in a two-round burst. This will two-tap unarmored players. l_hand =/obj/item/gun/ballistic/shotgun/automatic/bulldog + mob_spawner = /obj/effect/mob_spawn/human/corpse/ramzi/ranged/shotgun shoot_point_blank = TRUE + loot = list(/obj/item/gun/ballistic/shotgun/automatic/bulldog/worn = 1) + /mob/living/simple_animal/hostile/human/ramzi/ranged/shotgun/incendiary name = "Ramzi Clique Firestarter" @@ -303,6 +311,7 @@ speed = 1 armor_base = /obj/item/clothing/suit/space/hardsuit/syndi/ramzi mob_spawner = /obj/effect/mob_spawn/human/corpse/ramzi/space + loot = list(/obj/item/gun/ballistic/shotgun/automatic/pistol/ringneck = 1) /mob/living/simple_animal/hostile/human/ramzi/ranged/space/Initialize() . = ..() @@ -329,6 +338,7 @@ r_hand = /obj/item/gun/ballistic/automatic/smg/cobra rapid = 3 casingtype = /obj/item/ammo_casing/c45 + mob_spawner = /obj/effect/mob_spawn/human/corpse/ramzi/space/soft/smg /mob/living/simple_animal/hostile/human/ramzi/ranged/space/smg name = "Ramzi Clique Commando" @@ -336,6 +346,7 @@ icon_state = "syndicate_space_smg" icon_living = "syndicate_space_smg" l_hand =/obj/item/gun/ballistic/automatic/smg/cobra + mob_spawner = /obj/effect/mob_spawn/human/corpse/ramzi/space/smg rapid = 3 casingtype = /obj/item/ammo_casing/c45 @@ -348,11 +359,13 @@ casingtype = /obj/item/ammo_casing/shotgun/buckshot l_hand =/obj/item/gun/ballistic/shotgun/automatic/bulldog rapid = 2 + mob_spawner = /obj/effect/mob_spawn/human/corpse/ramzi/space/shotgun rapid_fire_delay = 6 retreat_distance = 2 minimum_distance = 2 shoot_point_blank = TRUE + /mob/living/simple_animal/hostile/human/ramzi/ranged/space/sniper name = "Ramzi Clique Deadeye" desc = "A deserter from the Gorlex Marauders turned pirate. The cold expressionless helmet betrays nothing but contempt as they await their next target." @@ -361,6 +374,7 @@ aggro_vision_range = 14 icon_state = "syndicate_space_shotgun" icon_living = "syndicate__space_shotgun" + casingtype = /obj/item/ammo_casing/a65clip l_hand = /obj/item/gun/ballistic/automatic/marksman/boomslang diff --git a/code/modules/projectiles/guns/ballistic/marksman.dm b/code/modules/projectiles/guns/ballistic/marksman.dm index 15f7f7da79c9..5bfebf4dd84e 100644 --- a/code/modules/projectiles/guns/ballistic/marksman.dm +++ b/code/modules/projectiles/guns/ballistic/marksman.dm @@ -13,3 +13,4 @@ min_recoil = 0.1 light_range = 2 + diff --git a/code/modules/projectiles/guns/manufacturer/scarborough/ballistics.dm b/code/modules/projectiles/guns/manufacturer/scarborough/ballistics.dm index 701fb700f7ee..7e1a5f2d1017 100644 --- a/code/modules/projectiles/guns/manufacturer/scarborough/ballistics.dm +++ b/code/modules/projectiles/guns/manufacturer/scarborough/ballistics.dm @@ -56,6 +56,9 @@ spread_unwielded = 9 recoil_unwielded = 2 +/obj/item/gun/ballistic/automatic/pistol/ringneck/worn + gun_wear = 100 + NO_MAG_GUN_HELPER(automatic/pistol/ringneck) /obj/item/gun/ballistic/automatic/pistol/ringneck/indie @@ -435,6 +438,8 @@ NO_MAG_GUN_HELPER(automatic/smg/cobra) NO_MAG_GUN_HELPER(automatic/smg/cobra/indie) +/obj/item/gun/ballistic/automatic/smg/cobra/worn + gun_wear = 100 /obj/item/ammo_box/magazine/m45_cobra @@ -606,6 +611,12 @@ NO_MAG_GUN_HELPER(automatic/marksman/boomslang) NO_MAG_GUN_HELPER(automatic/marksman/boomslang/indie) + +/obj/item/gun/ballistic/automatic/marksman/boomslang/worn + gun_wear = 100 + +NO_MAG_GUN_HELPER(automatic/marksman/boomslang/worn) + /obj/item/ammo_box/magazine/boomslang name = "\improper Boomslang Magazine (6.5mm CLIP)" desc = "A large 10-round box magazine for Boomslang sniper rifles. These rounds deal amazing damage and can pierce protective equipment, excluding armored vehicles." @@ -945,6 +956,8 @@ NO_MAG_GUN_HELPER(automatic/assault/hydra/dmr) /obj/item/gun/ballistic/shotgun/automatic/bulldog/drum default_ammo_type = /obj/item/ammo_box/magazine/m12g_bulldog/drum +/obj/item/gun/ballistic/shotgun/automatic/bulldog/worn + gun_wear = 100 NO_MAG_GUN_HELPER(shotgun/automatic/bulldog) /obj/item/ammo_box/magazine/m12g_bulldog