From fd91cb3b08413c5dd554f2a89e75aac4d2965525 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Thu, 5 Jan 2023 19:10:40 -0800 Subject: [PATCH] [MDB IGNORE] ballistic gun repath & lazyinit ammo & casing flags & reorganiation (#4908) ## About The Pull Request tin ## Why It's Good For The Game memory improvements & code efficiency ## Changelog nah Co-authored-by: silicons --- _maps/away_missions/140x140/carpfarm.dmm | 2 +- _maps/away_missions/140x140/listeningpost.dmm | 2 +- _maps/away_missions/140x140/snow_outpost.dmm | 6 +- _maps/away_missions/140x140/snowfield.dmm | 2 +- _maps/away_missions/archive/Academy.dmm | 4 +- _maps/away_missions/archive/challenge.dmm | 6 +- _maps/away_missions/archive/spacebattle.dmm | 20 +- .../archive/stationCollision.dmm | 12 +- _maps/away_missions/archive/wildwest.dmm | 18 +- _maps/away_missions/archive/zresearchlabs.dmm | 6 +- .../mini_test/citadel_minitest-sector-2.dmm | 2 +- .../mini_test/citadel_minitest-sector-3.dmm | 2 +- _maps/map_files/rift/rift-04-surface1.dmm | 4 +- _maps/map_files/rift/rift-05-surface2.dmm | 30 +-- _maps/map_files/rift/rift-06-surface3.dmm | 10 +- _maps/map_files/rift/rift-07-west_base.dmm | 6 +- _maps/map_files/rift/rift-11-orbital.dmm | 34 +-- _maps/map_files/tether/tether-01-surface1.dmm | 2 +- _maps/map_files/tether/tether-02-surface2.dmm | 8 +- _maps/map_files/tether/tether-03-surface3.dmm | 6 +- _maps/map_files/tether/tether-06-station2.dmm | 2 +- _maps/map_files/triumph/triumph-02-deck2.dmm | 6 +- _maps/map_files/triumph/triumph-04-deck4.dmm | 16 +- .../map_files/triumph/triumph-05-flagship.dmm | 112 ++++----- _maps/map_levels/140x140/talon/talon1.dmm | 2 +- _maps/map_levels/140x140/tradeport.dmm | 6 +- _maps/map_levels/192x192/tradeport.dmm | 6 +- .../class_d/Possesed_mech_cave.dmm | 2 +- .../level_specific/class_d/hiddenbunkerD.dmm | 2 +- .../level_specific/class_d/landing_padD.dmm | 2 +- .../level_specific/class_d/vault5D.dmm | 4 +- .../class_h/AuxiliaryResearchFacility.dmm | 2 +- .../submaps/level_specific/class_h/farmsH.dmm | 2 +- .../level_specific/class_h/highnoonH.dmm | 4 +- .../level_specific/class_h/landing_padH.dmm | 2 +- .../submaps/level_specific/class_h/ranchH.dmm | 2 +- .../debrisfield_vr/tinycarrier.dmm | 4 +- .../virgo2/Blackshuttledown.dmm | 14 +- .../level_specific/virgo2/CrashedSmuggler.dmm | 2 +- .../level_specific/virgo2/DJOutpost1.dmm | 2 +- _maps/submaps/level_specific/virgo2/DoomP.dmm | 2 +- .../level_specific/virgo2/GovPatrol.dmm | 2 +- .../submaps/level_specific/virgo2/MCamp1.dmm | 2 +- .../level_specific/virgo2/Rockybase.dmm | 12 +- _maps/submaps/mountains/Rockb1.dmm | 2 +- _maps/submaps/mountains/prepper1.dmm | 2 +- _maps/submaps/mountains/vault5.dmm | 4 +- _maps/submaps/plains/Boathouse.dmm | 2 +- _maps/submaps/plains/Boathouse_vr.dmm | 2 +- _maps/submaps/wilderness/Blackshuttledown.dmm | 6 +- _maps/submaps/wilderness/Blueshuttledown.dmm | 6 +- _maps/submaps/wilderness/DJOutpost1.dmm | 2 +- _maps/submaps/wilderness/DoomP.dmm | 2 +- _maps/submaps/wilderness/GovPatrol.dmm | 2 +- _maps/submaps/wilderness/Rockybase.dmm | 8 +- _maps/templates/admin/dhael_centcom.dmm | 132 +++++------ _maps/templates/admin/ert.dmm | 60 ++--- _maps/templates/admin/ert_base.dmm | 28 +-- _maps/templates/admin/kk_mercship.dmm | 56 ++--- _maps/templates/admin/mercbase.dmm | 46 ++-- _maps/templates/shelters/shelter_4.dmm | 12 +- .../shuttles/overmaps/generic/abductor.dmm | 4 +- .../shuttles/overmaps/generic/bearcat.dmm | 2 +- .../shuttles/overmaps/generic/cruiser.dmm | 42 ++-- .../shuttles/overmaps/generic/curashuttle.dmm | 2 +- .../overmaps/generic/mercenarybase.dmm | 12 +- .../shuttles/overmaps/generic/mercship.dmm | 6 +- .../shuttles/overmaps/generic/shelter_6.dmm | 32 +-- citadel.dme | 16 +- code/__DEFINES/projectiles/ammo_casing.dm | 7 + code/__DEFINES/{ => projectiles}/guns.dm | 0 .../crafting/recipes/recipes_primal.dm | 2 +- .../recipes/recipes_weapon_and_ammo.dm | 8 +- code/datums/outfits/costumes/halloween.dm | 6 +- code/datums/outfits/horror_killers.dm | 2 +- code/datums/outfits/misc.dm | 2 +- code/datums/outfits/outfit.dm | 4 +- code/datums/outfits/pirates.dm | 2 +- code/datums/outfits/tournament.dm | 2 +- code/datums/uplink/visible_weapons.dm | 30 +-- code/game/antagonist/outsider/commando.dm | 2 +- code/game/antagonist/outsider/deathsquad.dm | 2 +- code/game/antagonist/outsider/raider.dm | 48 ++-- code/game/antagonist/station/renegade.dm | 52 ++-- .../game/machinery/computer/arcade/_arcade.dm | 2 +- code/game/machinery/recharger.dm | 12 +- code/game/machinery/vending.dm | 6 +- code/game/objects/items/gunbox.dm | 32 +-- code/game/objects/items/storage/belt.dm | 40 ++-- code/game/objects/items/storage/lockbox.dm | 18 +- .../game/objects/items/storage/uplink_kits.dm | 4 +- .../objects/items/weapons/gift_wrappaper.dm | 4 +- code/game/objects/random/guns_and_ammo.dm | 224 +++++++++--------- code/game/objects/random/mapping.dm | 20 +- code/game/objects/random/misc.dm | 102 ++++---- .../crates_lockers/closets/secure/explorer.dm | 4 +- .../closets/secure/guncabinet.dm | 8 +- .../crates_lockers/closets/secure/security.dm | 4 +- code/game/objects/structures/loot_piles.dm | 6 +- code/game/objects/structures/trash_pile.dm | 4 +- code/modules/admin/verbs/debug.dm | 6 +- code/modules/awaymissions/loot_vr.dm | 74 +++--- code/modules/cargo/supplypacks/contraband.dm | 12 +- code/modules/cargo/supplypacks/medical.dm | 2 +- code/modules/cargo/supplypacks/munitions.dm | 18 +- code/modules/cargo/supplypacks/recreation.dm | 4 +- code/modules/cargo/supplypacks/security.dm | 4 +- .../clothing/spacesuits/miscellaneous.dm | 2 +- code/modules/clothing/suits/armor.dm | 4 +- code/modules/clothing/suits/hooded.dm | 10 +- code/modules/clothing/suits/jobs.dm | 4 +- code/modules/clothing/suits/miscellaneous.dm | 24 +- code/modules/clothing/suits/utility.dm | 2 +- .../clothing/under/accessories/clothing.dm | 2 +- code/modules/examine/descriptions/weapons.dm | 6 +- code/modules/flufftext/Hallucination.dm | 2 +- code/modules/ghostroles/roles/ashlander.dm | 4 +- .../holidays/halloween_loadout_masquarade.dm | 2 +- .../away_missions/archive/stationCollision.dm | 12 +- .../simple_mob/subtypes/humanoid/clown.dm | 4 +- .../simple_mob/subtypes/humanoid/cultist.dm | 2 +- .../subtypes/humanoid/mercs/mercs.dm | 26 +- .../simple_mob/subtypes/humanoid/pirates.dm | 24 +- .../simple_mob/subtypes/humanoid/russian.dm | 2 +- .../projectiles/ammunition/ammo_casing.dm | 116 +++++++++ code/modules/projectiles/ammunition/rounds.dm | 15 +- .../guns/{projectile.dm => ballistic.dm} | 34 +-- code/modules/projectiles/guns/magic.dm | 6 +- .../projectiles/guns/projectile/automatic.dm | 138 +++++------ .../projectiles/guns/projectile/boltaction.dm | 38 +-- .../projectiles/guns/projectile/bow.dm | 20 +- .../projectiles/guns/projectile/caseless.dm | 8 +- .../projectiles/guns/projectile/contender.dm | 32 +-- .../projectiles/guns/projectile/dartgun.dm | 22 +- .../projectiles/guns/projectile/musket.dm | 18 +- .../projectiles/guns/projectile/pistol.dm | 132 +++++------ .../projectiles/guns/projectile/revolver.dm | 64 ++--- .../projectiles/guns/projectile/rocket.dm | 30 +-- .../projectiles/guns/projectile/semiauto.dm | 12 +- .../projectiles/guns/projectile/shotgun.dm | 68 +++--- .../projectiles/guns/projectile/sniper.dm | 24 +- .../projectile/sniper/collapsible_sniper.dm | 10 +- .../{ammunition.dm => magazines/magazine.dm} | 63 ----- .../{ammunition => magazines}/smartmag.dm | 0 .../magazines.dm => magazines/unsorted.dm} | 0 .../{ammunition => unsorted}/magic.dm | 0 .../{ammunition => unsorted}/magnetic.dm | 0 code/modules/random_map/drop/drop_types.dm | 8 +- code/modules/research/designs/weapons.dm | 8 +- code/modules/vore/fluffstuff/custom_boxes.dm | 8 +- code/modules/vore/fluffstuff/custom_guns.dm | 74 +++--- .../guns/cell_loaded/cell_loaded.dm | 22 +- .../vore/fluffstuff/guns/cell_loaded/ml3m.dm | 8 +- .../vore/fluffstuff/guns/cell_loaded/nsfw.dm | 8 +- .../modules/vore/fluffstuff/guns/crestrose.dm | 6 +- code/modules/vore/fluffstuff/guns/nsfw.dm | 2 +- .../xenoarcheaology/finds/find_spawning.dm | 2 +- 157 files changed, 1423 insertions(+), 1366 deletions(-) create mode 100644 code/__DEFINES/projectiles/ammo_casing.dm rename code/__DEFINES/{ => projectiles}/guns.dm (100%) create mode 100644 code/modules/projectiles/ammunition/ammo_casing.dm rename code/modules/projectiles/guns/{projectile.dm => ballistic.dm} (91%) rename code/modules/projectiles/{ammunition.dm => magazines/magazine.dm} (69%) rename code/modules/projectiles/{ammunition => magazines}/smartmag.dm (100%) rename code/modules/projectiles/{ammunition/magazines.dm => magazines/unsorted.dm} (100%) rename code/modules/projectiles/{ammunition => unsorted}/magic.dm (100%) rename code/modules/projectiles/{ammunition => unsorted}/magnetic.dm (100%) diff --git a/_maps/away_missions/140x140/carpfarm.dmm b/_maps/away_missions/140x140/carpfarm.dmm index 956272eadf9..13aa1f6871c 100644 --- a/_maps/away_missions/140x140/carpfarm.dmm +++ b/_maps/away_missions/140x140/carpfarm.dmm @@ -464,7 +464,7 @@ /area/awaymission/carpfarm/base) "bD" = ( /obj/structure/closet/crate/secure/weapon, -/obj/item/gun/projectile/shotgun/pump/rifle, +/obj/item/gun/ballistic/shotgun/pump/rifle, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, /area/awaymission/carpfarm/base) diff --git a/_maps/away_missions/140x140/listeningpost.dmm b/_maps/away_missions/140x140/listeningpost.dmm index 4cbf8b6366d..17a16e2d913 100644 --- a/_maps/away_missions/140x140/listeningpost.dmm +++ b/_maps/away_missions/140x140/listeningpost.dmm @@ -99,7 +99,7 @@ info = "I wonder how much longer they will accept my empty reports. They will cancel the case soon without results. When the pickup comes, I will tell them I have lost faith in our cause, and beg them to consider a diplomatic solution. How many nuclear teams have been dispatched with those nukes? I must try and prevent more from ever being sent. If they will not listen to reason, I will detonate the warehouse myself. Maybe some day in the immediate future, space will be peaceful, though I don't intend to live to see it. And that is why I write this down- it is my sacrifice that stabilised your worlds, traveller. Spare a thought for me, and please attempt to prevent nuclear proliferation, should it ever rear it's ugly head again. -Donk Co. Operative #451"; name = "odd report" }, -/obj/item/gun/projectile/pistol, +/obj/item/gun/ballistic/pistol, /obj/item/silencer, /turf/simulated/floor, /area/awaymission/listeningpost) diff --git a/_maps/away_missions/140x140/snow_outpost.dmm b/_maps/away_missions/140x140/snow_outpost.dmm index 544b78e9e42..664cf72a2aa 100644 --- a/_maps/away_missions/140x140/snow_outpost.dmm +++ b/_maps/away_missions/140x140/snow_outpost.dmm @@ -1175,8 +1175,8 @@ /area/awaymission/snow_outpost/powered) "ed" = ( /obj/structure/table/steel, -/obj/item/gun/projectile/automatic/wt550, -/obj/item/gun/projectile/automatic/p90, +/obj/item/gun/ballistic/automatic/wt550, +/obj/item/gun/ballistic/automatic/p90, /turf/simulated/floor/tiled/steel_grid, /area/awaymission/snow_outpost/powered) "ee" = ( @@ -1700,7 +1700,7 @@ /area/awaymission/snow_outpost/powered) "fJ" = ( /obj/structure/table/steel, -/obj/item/gun/projectile/pistol, +/obj/item/gun/ballistic/pistol, /obj/machinery/light/small{ dir = 4; pixel_y = 0 diff --git a/_maps/away_missions/140x140/snowfield.dmm b/_maps/away_missions/140x140/snowfield.dmm index c1b37474a6a..ec4428d6cd9 100644 --- a/_maps/away_missions/140x140/snowfield.dmm +++ b/_maps/away_missions/140x140/snowfield.dmm @@ -1434,7 +1434,7 @@ /area/awaymission/snowfield/base) "eh" = ( /obj/structure/closet/crate/secure/weapon, -/obj/item/gun/projectile/shotgun/pump/rifle, +/obj/item/gun/ballistic/shotgun/pump/rifle, /turf/simulated/floor/tiled/dark, /area/awaymission/snowfield/base) "ei" = ( diff --git a/_maps/away_missions/archive/Academy.dmm b/_maps/away_missions/archive/Academy.dmm index 1fc9614603c..67e99c5aa00 100644 --- a/_maps/away_missions/archive/Academy.dmm +++ b/_maps/away_missions/archive/Academy.dmm @@ -1485,7 +1485,7 @@ /area/awaymission/academy/academyaft) "gB" = ( /obj/structure/table/standard, -/obj/item/gun/projectile/shotgun/pump, +/obj/item/gun/ballistic/shotgun/pump, /obj/item/paper{ info = "Grade: A+ Educator's Notes: Excellent form."; name = "Summoning Midterm Exam" @@ -1496,7 +1496,7 @@ /area/awaymission/academy/classrooms) "gC" = ( /obj/structure/table/standard, -/obj/item/gun/projectile/revolver, +/obj/item/gun/ballistic/revolver, /obj/item/paper{ info = "Grade: B- Educator's Notes: Keep applying yourself, you're showing improvement."; name = "Summoning Midterm Exam" diff --git a/_maps/away_missions/archive/challenge.dmm b/_maps/away_missions/archive/challenge.dmm index 5daf9222c1b..1fde89c2629 100644 --- a/_maps/away_missions/archive/challenge.dmm +++ b/_maps/away_missions/archive/challenge.dmm @@ -617,7 +617,7 @@ /turf/simulated/floor/wood, /area/awaymission/challenge/end) "ck" = ( -/obj/item/gun/projectile/revolver/mateba, +/obj/item/gun/ballistic/revolver/mateba, /turf/simulated/floor/wood, /area/awaymission/challenge/end) "cl" = ( @@ -668,11 +668,11 @@ /turf/simulated/floor/carpet, /area/awaymission/challenge/end) "ct" = ( -/obj/item/gun/projectile/silenced, +/obj/item/gun/ballistic/silenced, /turf/simulated/floor/wood, /area/awaymission/challenge/end) "cw" = ( -/obj/item/gun/projectile/automatic/l6_saw, +/obj/item/gun/ballistic/automatic/l6_saw, /turf/simulated/floor/wood, /area/awaymission/challenge/end) "cx" = ( diff --git a/_maps/away_missions/archive/spacebattle.dmm b/_maps/away_missions/archive/spacebattle.dmm index 3a8ea9f6811..6b022c0548d 100644 --- a/_maps/away_missions/archive/spacebattle.dmm +++ b/_maps/away_missions/archive/spacebattle.dmm @@ -70,7 +70,7 @@ /area/awaymission/spacebattle/syndicate2) "au" = ( /obj/structure/table/reinforced, -/obj/item/gun/projectile/automatic/c20r, +/obj/item/gun/ballistic/automatic/c20r, /turf/simulated/floor, /area/awaymission/spacebattle/syndicate2) "av" = ( @@ -85,7 +85,7 @@ /area/awaymission/spacebattle/syndicate3) "aA" = ( /obj/structure/table/reinforced, -/obj/item/gun/projectile/silenced, +/obj/item/gun/ballistic/silenced, /turf/simulated/floor, /area/awaymission/spacebattle/syndicate2) "aB" = ( @@ -125,7 +125,7 @@ /area/awaymission/spacebattle/syndicate3) "aL" = ( /obj/structure/table/reinforced, -/obj/item/gun/projectile/deagle, +/obj/item/gun/ballistic/deagle, /turf/simulated/floor, /area/awaymission/spacebattle/syndicate3) "aM" = ( @@ -840,7 +840,7 @@ mobname = "Davis Hume"; name = "Davis Hume" }, -/obj/item/gun/projectile/shotgun/pump/combat, +/obj/item/gun/ballistic/shotgun/pump/combat, /turf/simulated/floor, /area/awaymission/spacebattle/cruiser) "eC" = ( @@ -939,7 +939,7 @@ mobname = "Kurt Kliest"; name = "Kurt Kliest" }, -/obj/item/gun/projectile/shotgun/pump/combat, +/obj/item/gun/ballistic/shotgun/pump/combat, /obj/item/ammo_casing/a12g/pellet, /turf/simulated/floor, /area/awaymission/spacebattle/cruiser) @@ -996,7 +996,7 @@ /area/awaymission/spacebattle/cruiser) "ft" = ( /obj/spawner/corpse/syndicatesoldier, -/obj/item/gun/projectile/automatic/c20r, +/obj/item/gun/ballistic/automatic/c20r, /obj/item/ammo_casing/a10mm, /obj/item/ammo_casing/a10mm, /obj/effect/debris/cleanable/blood, @@ -1007,7 +1007,7 @@ mobname = "Walter Strider"; name = "Walter Strider" }, -/obj/item/gun/projectile/shotgun/pump/combat, +/obj/item/gun/ballistic/shotgun/pump/combat, /obj/item/ammo_casing/a10mm, /obj/item/ammo_casing/a10mm, /obj/effect/debris/cleanable/blood, @@ -1016,7 +1016,7 @@ "fx" = ( /obj/item/ammo_casing/a357, /obj/item/ammo_casing/a357, -/obj/item/gun/projectile/revolver/mateba, +/obj/item/gun/ballistic/revolver/mateba, /obj/spawner/corpse/commander{ mobname = "Aaron Bowden"; name = "Aaron Bowden" @@ -1125,7 +1125,7 @@ /turf/simulated/floor/wood, /area/awaymission/spacebattle/cruiser) "gE" = ( -/obj/item/gun/projectile/shotgun/pump/combat, +/obj/item/gun/ballistic/shotgun/pump/combat, /turf/simulated/floor, /area/awaymission/spacebattle/cruiser) "gH" = ( @@ -1539,7 +1539,7 @@ /area/awaymission/spacebattle/cruiser) "iy" = ( /obj/spawner/corpse/syndicatesoldier, -/obj/item/gun/projectile/automatic/c20r, +/obj/item/gun/ballistic/automatic/c20r, /turf/simulated/floor, /area/awaymission/spacebattle/cruiser) "iA" = ( diff --git a/_maps/away_missions/archive/stationCollision.dmm b/_maps/away_missions/archive/stationCollision.dmm index 516fd5ec2fc..50263bc42a6 100644 --- a/_maps/away_missions/archive/stationCollision.dmm +++ b/_maps/away_missions/archive/stationCollision.dmm @@ -1310,7 +1310,7 @@ }, /obj/item/clothing/shoes/syndigaloshes, /obj/effect/debris/cleanable/blood/splatter, -/obj/item/gun/projectile/silenced, +/obj/item/gun/ballistic/silenced, /turf/simulated/floor/airless, /area/awaymission/northblock) "fH" = ( @@ -1627,7 +1627,7 @@ icon_state = "4-8" }, /obj/effect/debris/cleanable/blood/splatter, -/obj/item/gun/projectile/shotgun/pump, +/obj/item/gun/ballistic/shotgun/pump, /turf/simulated/floor, /area/awaymission/midblock) "gJ" = ( @@ -1863,7 +1863,7 @@ dir = 8 }, /obj/item/clothing/suit/space/syndicate, -/obj/item/gun/projectile/shotgun/pump, +/obj/item/gun/ballistic/shotgun/pump, /turf/simulated/floor, /area/awaymission/arrivalblock) "hA" = ( @@ -2107,7 +2107,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/item/gun/projectile/automatic/c20r, +/obj/item/gun/ballistic/automatic/c20r, /turf/simulated/floor, /area/awaymission/midblock) "im" = ( @@ -2174,7 +2174,7 @@ /obj/item/ammo_casing/a10mm, /obj/item/clothing/under/syndicate, /obj/effect/debris/cleanable/blood/splatter, -/obj/item/gun/projectile/automatic/c20r, +/obj/item/gun/ballistic/automatic/c20r, /turf/simulated/floor, /area/awaymission/midblock) "iC" = ( @@ -2193,7 +2193,7 @@ /obj/item/ammo_casing/a10mm, /obj/item/clothing/under/syndicate, /obj/effect/debris/cleanable/blood/splatter, -/obj/item/gun/projectile/automatic/c20r, +/obj/item/gun/ballistic/automatic/c20r, /turf/simulated/floor, /area/awaymission/midblock) "iE" = ( diff --git a/_maps/away_missions/archive/wildwest.dmm b/_maps/away_missions/archive/wildwest.dmm index a13587dbcfe..c0ce4443a25 100644 --- a/_maps/away_missions/archive/wildwest.dmm +++ b/_maps/away_missions/archive/wildwest.dmm @@ -273,7 +273,7 @@ /area/awaymission/wwmines) "bC" = ( /obj/structure/table/woodentable, -/obj/item/gun/projectile, +/obj/item/gun/ballistic, /turf/simulated/floor/wood, /area/awaymission/wwmines) "bD" = ( @@ -463,7 +463,7 @@ /area/awaymission/wwmines) "ch" = ( /obj/structure/table/woodentable, -/obj/item/gun/projectile, +/obj/item/gun/ballistic, /turf/simulated/floor{ dir = 5 }, @@ -894,7 +894,7 @@ /turf/simulated/floor/carpet, /area/awaymission/wwmines) "eq" = ( -/obj/item/gun/projectile/shotgun, +/obj/item/gun/ballistic/shotgun, /turf/simulated/floor/wood, /area/awaymission/wwmines) "er" = ( @@ -937,7 +937,7 @@ /area/awaymission/wwmines) "eE" = ( /obj/item/bedsheet/blue, -/obj/item/gun/projectile, +/obj/item/gun/ballistic, /turf/simulated/floor/wood, /area/awaymission/wwmines) "eF" = ( @@ -1200,7 +1200,7 @@ /area/awaymission/wwmines) "fS" = ( /obj/structure/table/woodentable, -/obj/item/gun/projectile/shotgun, +/obj/item/gun/ballistic/shotgun, /turf/simulated/floor/wood, /area/awaymission/wwmines) "fU" = ( @@ -1274,7 +1274,7 @@ /area/awaymission/wwmines) "gg" = ( /obj/structure/table/woodentable, -/obj/item/gun/projectile/revolver, +/obj/item/gun/ballistic/revolver, /turf/simulated/floor/wood, /area/awaymission/wwmines) "gi" = ( @@ -1294,7 +1294,7 @@ /turf/simulated/floor/wood, /area/awaymission/wwmines) "gm" = ( -/obj/item/gun/projectile, +/obj/item/gun/ballistic, /turf/simulated/floor/wood, /area/awaymission/wwmines) "gn" = ( @@ -1327,11 +1327,11 @@ /turf/simulated/floor/wood, /area/awaymission/wwmines) "gw" = ( -/obj/item/gun/projectile/silenced, +/obj/item/gun/ballistic/silenced, /turf/simulated/floor/wood, /area/awaymission/wwmines) "gx" = ( -/obj/item/gun/projectile/shotgun, +/obj/item/gun/ballistic/shotgun, /turf/simulated/floor/plating, /area/awaymission/wwmines) "gy" = ( diff --git a/_maps/away_missions/archive/zresearchlabs.dmm b/_maps/away_missions/archive/zresearchlabs.dmm index f5e1c275975..045bd74838a 100644 --- a/_maps/away_missions/archive/zresearchlabs.dmm +++ b/_maps/away_missions/archive/zresearchlabs.dmm @@ -3364,7 +3364,7 @@ /area/awaymission/labs/militarydivision) "jQ" = ( /obj/effect/debris/cleanable/blood/splatter, -/obj/item/gun/projectile/silenced{ +/obj/item/gun/ballistic/silenced{ desc = "A sidearm commonly favored by terrestrial security forces."; icon_state = "g115 Pistol"; name = "Pistol"; @@ -6906,7 +6906,7 @@ }, /area/awaymission/labs/security) "tS" = ( -/obj/item/gun/projectile/shotgun/pump, +/obj/item/gun/ballistic/shotgun/pump, /obj/machinery/light{ dir = 1 }, @@ -7024,7 +7024,7 @@ /area/awaymission/labs/security) "uk" = ( /obj/item/ammo_magazine/clip/c45, -/obj/item/gun/projectile/silenced{ +/obj/item/gun/ballistic/silenced{ desc = "A sidearm commonly favored by terrestrial security forces."; icon_state = "g115 Pistol"; name = "Pistol"; diff --git a/_maps/map_files/mini_test/citadel_minitest-sector-2.dmm b/_maps/map_files/mini_test/citadel_minitest-sector-2.dmm index f0f2cb6877a..8fedcc0994f 100644 --- a/_maps/map_files/mini_test/citadel_minitest-sector-2.dmm +++ b/_maps/map_files/mini_test/citadel_minitest-sector-2.dmm @@ -464,7 +464,7 @@ /area/awaymission) "bz" = ( /obj/structure/closet/crate/secure/weapon, -/obj/item/gun/projectile/shotgun/pump/rifle, +/obj/item/gun/ballistic/shotgun/pump/rifle, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, /area/awaymission) diff --git a/_maps/map_files/mini_test/citadel_minitest-sector-3.dmm b/_maps/map_files/mini_test/citadel_minitest-sector-3.dmm index 55868a802bf..6ac31a58c20 100644 --- a/_maps/map_files/mini_test/citadel_minitest-sector-3.dmm +++ b/_maps/map_files/mini_test/citadel_minitest-sector-3.dmm @@ -48,7 +48,7 @@ icon_opened = "cabinet_open"; icon_state = "cabinet_closed" }, -/obj/item/gun/projectile/shotgun/doublebarrel, +/obj/item/gun/ballistic/shotgun/doublebarrel, /obj/item/storage/box/beanbags, /turf/simulated/floor/wood, /area/awaymission/wwmines) diff --git a/_maps/map_files/rift/rift-04-surface1.dmm b/_maps/map_files/rift/rift-04-surface1.dmm index 8c6d7b23b21..7d38a0c3382 100644 --- a/_maps/map_files/rift/rift-04-surface1.dmm +++ b/_maps/map_files/rift/rift-04-surface1.dmm @@ -19073,8 +19073,8 @@ /obj/item/pizzavoucher, /obj/item/moneybag, /obj/item/inflatable_duck, -/obj/item/gun/projectile/revolver/capgun, -/obj/item/gun/projectile/revolver/capgun, +/obj/item/gun/ballistic/revolver/capgun, +/obj/item/gun/ballistic/revolver/capgun, /obj/item/toy/cultsword, /obj/item/toy/cultsword, /obj/item/bikehorn/rubberducky, diff --git a/_maps/map_files/rift/rift-05-surface2.dmm b/_maps/map_files/rift/rift-05-surface2.dmm index e59f50ba853..dc6b2afa6c9 100644 --- a/_maps/map_files/rift/rift-05-surface2.dmm +++ b/_maps/map_files/rift/rift-05-surface2.dmm @@ -9756,10 +9756,10 @@ /obj/item/ammo_magazine/m9mmt, /obj/item/ammo_magazine/m9mmt, /obj/item/ammo_magazine/m9mmt, -/obj/item/gun/projectile/automatic/wt550, -/obj/item/gun/projectile/automatic/wt550, -/obj/item/gun/projectile/automatic/wt550, -/obj/item/gun/projectile/automatic/wt550, +/obj/item/gun/ballistic/automatic/wt550, +/obj/item/gun/ballistic/automatic/wt550, +/obj/item/gun/ballistic/automatic/wt550, +/obj/item/gun/ballistic/automatic/wt550, /turf/simulated/floor/tiled/dark, /area/security/tactical) "hkI" = ( @@ -12785,8 +12785,8 @@ /area/rift/station/public_garden/stairwell) "jtH" = ( /obj/structure/table/steel, -/obj/item/gun/projectile/shotgun/pump/rifle/practice, -/obj/item/gun/projectile/shotgun/pump/rifle/practice, +/obj/item/gun/ballistic/shotgun/pump/rifle/practice, +/obj/item/gun/ballistic/shotgun/pump/rifle/practice, /obj/item/ammo_magazine/clip/c762/practice, /obj/item/ammo_magazine/clip/c762/practice, /obj/item/ammo_magazine/clip/c762/practice, @@ -16184,8 +16184,8 @@ "lVi" = ( /obj/structure/table/rack/shelf/steel, /obj/effect/floor_decal/industrial/outline/grey, -/obj/item/gun/projectile/automatic/z8, -/obj/item/gun/projectile/automatic/z8, +/obj/item/gun/ballistic/automatic/z8, +/obj/item/gun/ballistic/automatic/z8, /obj/item/ammo_magazine/m762, /obj/item/ammo_magazine/m762, /obj/item/ammo_magazine/m762, @@ -17458,7 +17458,7 @@ /obj/effect/floor_decal/borderfloorblack/cee, /obj/item/ammo_magazine/m44, /obj/item/ammo_magazine/m44, -/obj/item/gun/projectile/deagle/taj, +/obj/item/gun/ballistic/deagle/taj, /turf/simulated/floor/wood, /area/crew_quarters/heads/hos) "mWL" = ( @@ -27018,10 +27018,10 @@ pixel_x = 6; pixel_y = -1 }, -/obj/item/gun/projectile/shotgun/pump/combat, -/obj/item/gun/projectile/shotgun/pump/combat, -/obj/item/gun/projectile/shotgun/pump/combat, -/obj/item/gun/projectile/shotgun/pump/combat, +/obj/item/gun/ballistic/shotgun/pump/combat, +/obj/item/gun/ballistic/shotgun/pump/combat, +/obj/item/gun/ballistic/shotgun/pump/combat, +/obj/item/gun/ballistic/shotgun/pump/combat, /turf/simulated/floor/tiled/dark, /area/security/armory/red) "uIz" = ( @@ -28877,8 +28877,8 @@ pixel_x = 6; pixel_y = -1 }, -/obj/item/gun/projectile/automatic/as24, -/obj/item/gun/projectile/automatic/as24, +/obj/item/gun/ballistic/automatic/as24, +/obj/item/gun/ballistic/automatic/as24, /obj/machinery/light{ dir = 1 }, diff --git a/_maps/map_files/rift/rift-06-surface3.dmm b/_maps/map_files/rift/rift-06-surface3.dmm index cfa7939bd58..c13bb1b0db2 100644 --- a/_maps/map_files/rift/rift-06-surface3.dmm +++ b/_maps/map_files/rift/rift-06-surface3.dmm @@ -18525,7 +18525,7 @@ }, /obj/item/ammo_magazine/s357, /obj/item/ammo_magazine/s357, -/obj/item/gun/projectile/revolver/mateba, +/obj/item/gun/ballistic/revolver/mateba, /obj/effect/floor_decal/borderfloorblack/full, /obj/effect/floor_decal/industrial/outline, /turf/simulated/floor/tiled/dark, @@ -19893,7 +19893,7 @@ /turf/simulated/floor/tiled/steel_grid, /area/bridge/bunker) "Nu" = ( -/obj/item/gun/projectile/shotgun/doublebarrel, +/obj/item/gun/ballistic/shotgun/doublebarrel, /obj/item/storage/box/beanbags/large, /obj/item/storage/box/beanbags/large, /obj/item/clothing/accessory/permit/gun/bar, @@ -19901,7 +19901,7 @@ info = "This permit signifies that the Bartender is permitted to posess this firearm in the bar, and ONLY the bar. Failure to adhere to this permit will result in confiscation of the weapon and possibly arrest."; name = "Shotgun permit" }, -/obj/item/gun/projectile/shotgun/doublebarrel, +/obj/item/gun/ballistic/shotgun/doublebarrel, /obj/item/clothing/suit/armor/vest/alt{ name = "armor vest" }, @@ -20539,7 +20539,7 @@ /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway) "OH" = ( -/obj/item/gun/projectile/shotgun/flare, +/obj/item/gun/ballistic/shotgun/flare, /obj/item/storage/box/flashshells, /obj/item/duct_tape_roll, /obj/structure/closet/hydrant{ @@ -23741,7 +23741,7 @@ /obj/structure/table/rack/shelf, /obj/effect/floor_decal/borderfloorblack/full, /obj/effect/floor_decal/industrial/outline, -/obj/item/gun/projectile/SVD, +/obj/item/gun/ballistic/SVD, /obj/item/ammo_magazine/m762svd, /obj/item/ammo_magazine/m762svd, /obj/item/clothing/suit/space/void/merc/soviet, diff --git a/_maps/map_files/rift/rift-07-west_base.dmm b/_maps/map_files/rift/rift-07-west_base.dmm index d6690c94cbe..e0e9a734391 100644 --- a/_maps/map_files/rift/rift-07-west_base.dmm +++ b/_maps/map_files/rift/rift-07-west_base.dmm @@ -7,7 +7,7 @@ /area/rift/surfacebase/outside/west_base) "aJ" = ( /obj/structure/table/rack/shelf, -/obj/item/gun/projectile/automatic/automat/taj, +/obj/item/gun/ballistic/automatic/automat/taj, /obj/item/ammo_magazine/clip/c762, /obj/item/ammo_magazine/clip/c762, /obj/item/ammo_magazine/clip/c762, @@ -15,8 +15,8 @@ /area/rift/facility/interior/vault) "aV" = ( /obj/structure/table/rack/shelf, -/obj/item/gun/projectile/colt/taj, -/obj/item/gun/projectile/colt/taj, +/obj/item/gun/ballistic/colt/taj, +/obj/item/gun/ballistic/colt/taj, /obj/item/ammo_magazine/m45, /obj/item/ammo_magazine/m45, /turf/simulated/floor/tiled/steel_ridged, diff --git a/_maps/map_files/rift/rift-11-orbital.dmm b/_maps/map_files/rift/rift-11-orbital.dmm index 0f5e4e94147..1c2af359239 100644 --- a/_maps/map_files/rift/rift-11-orbital.dmm +++ b/_maps/map_files/rift/rift-11-orbital.dmm @@ -6418,8 +6418,8 @@ /obj/item/ammo_magazine/m545, /obj/item/ammo_magazine/m545, /obj/item/ammo_magazine/m545, -/obj/item/gun/projectile/automatic/sts35, -/obj/item/gun/projectile/automatic/sts35, +/obj/item/gun/ballistic/automatic/sts35, +/obj/item/gun/ballistic/automatic/sts35, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -6441,8 +6441,8 @@ /obj/item/ammo_magazine/m545, /obj/item/ammo_magazine/m545, /obj/item/ammo_magazine/m545, -/obj/item/gun/projectile/automatic/sts35, -/obj/item/gun/projectile/automatic/sts35, +/obj/item/gun/ballistic/automatic/sts35, +/obj/item/gun/ballistic/automatic/sts35, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -6578,8 +6578,8 @@ /obj/item/ammo_casing/rocket, /obj/item/ammo_casing/rocket, /obj/item/ammo_casing/rocket, -/obj/item/gun/projectile/automatic/l6_saw, -/obj/item/gun/projectile/automatic/l6_saw, +/obj/item/gun/ballistic/automatic/l6_saw, +/obj/item/gun/ballistic/automatic/l6_saw, /obj/item/ammo_magazine/m545saw, /obj/item/ammo_magazine/m545saw, /obj/item/ammo_magazine/m545saw, @@ -6845,8 +6845,8 @@ "tM" = ( /obj/structure/table/rack, /obj/structure/window/reinforced, -/obj/item/gun/projectile/shotgun/pump/combat, -/obj/item/gun/projectile/shotgun/pump/combat, +/obj/item/gun/ballistic/shotgun/pump/combat, +/obj/item/gun/ballistic/shotgun/pump/combat, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -6879,7 +6879,7 @@ "tP" = ( /obj/structure/table/rack, /obj/structure/window/reinforced, -/obj/item/gun/projectile/automatic/advanced_smg, +/obj/item/gun/ballistic/automatic/advanced_smg, /obj/item/ammo_magazine/m9mmR/saber, /obj/item/ammo_magazine/m9mmR/saber, /obj/item/ammo_magazine/m9mmR/saber, @@ -6902,16 +6902,16 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/gun/projectile/revolver/detective45, -/obj/item/gun/projectile/revolver/detective45, +/obj/item/gun/ballistic/revolver/detective45, +/obj/item/gun/ballistic/revolver/detective45, /obj/item/ammo_magazine/s45, /obj/item/ammo_magazine/s45, /obj/item/ammo_magazine/s45, /obj/item/ammo_magazine/s45, -/obj/item/gun/projectile/p92x, -/obj/item/gun/projectile/p92x, -/obj/item/gun/projectile/p92x, -/obj/item/gun/projectile/p92x, +/obj/item/gun/ballistic/p92x, +/obj/item/gun/ballistic/p92x, +/obj/item/gun/ballistic/p92x, +/obj/item/gun/ballistic/p92x, /obj/item/ammo_magazine/m9mm/large/licensed, /obj/item/ammo_magazine/m9mm/large/licensed, /obj/item/ammo_magazine/m9mm/large/licensed, @@ -7511,7 +7511,7 @@ /obj/item/ammo_casing/nsfw_batt/net, /obj/item/ammo_casing/nsfw_batt/net, /obj/item/ammo_magazine/nsfw_mag, -/obj/item/gun/projectile/nsfw, +/obj/item/gun/ballistic/nsfw, /turf/unsimulated/floor/steel{ icon = 'icons/turf/floors_vr.dmi'; icon_state = "wood" @@ -7572,7 +7572,7 @@ /obj/item/clothing/accessory/holster/hip, /obj/item/ammo_magazine/m44, /obj/item/ammo_magazine/m44, -/obj/item/gun/projectile/deagle, +/obj/item/gun/ballistic/deagle, /turf/unsimulated/floor/steel{ icon = 'icons/turf/floors_vr.dmi'; icon_state = "wood" diff --git a/_maps/map_files/tether/tether-01-surface1.dmm b/_maps/map_files/tether/tether-01-surface1.dmm index 922f89b15a4..083e7fe0c6c 100644 --- a/_maps/map_files/tether/tether-01-surface1.dmm +++ b/_maps/map_files/tether/tether-01-surface1.dmm @@ -30979,7 +30979,7 @@ }, /obj/structure/table/reinforced, /obj/item/gun/energy/laser/practice, -/obj/item/gun/projectile/shotgun/pump/rifle/practice, +/obj/item/gun/ballistic/shotgun/pump/rifle/practice, /obj/item/ammo_magazine/clip/c762/practice, /obj/item/ammo_magazine/clip/c762/practice, /turf/simulated/floor/tiled/dark, diff --git a/_maps/map_files/tether/tether-02-surface2.dmm b/_maps/map_files/tether/tether-02-surface2.dmm index 50032e987d3..7208a884455 100644 --- a/_maps/map_files/tether/tether-02-surface2.dmm +++ b/_maps/map_files/tether/tether-02-surface2.dmm @@ -4679,10 +4679,10 @@ /obj/item/gunbox/lethal{ pixel_y = -3 }, -/obj/item/gun/projectile/shotgun/pump/combat{ +/obj/item/gun/ballistic/shotgun/pump/combat{ pixel_y = -6 }, -/obj/item/gun/projectile/shotgun/pump/combat{ +/obj/item/gun/ballistic/shotgun/pump/combat{ pixel_y = 5 }, /turf/simulated/floor/tiled/dark, @@ -10995,11 +10995,11 @@ /area/tether/surfacebase/security/armory) "arP" = ( /obj/structure/table/rack/shelf/steel, -/obj/item/gun/projectile/shotgun/pump{ +/obj/item/gun/ballistic/shotgun/pump{ pixel_x = 2; pixel_y = -6 }, -/obj/item/gun/projectile/shotgun/pump{ +/obj/item/gun/ballistic/shotgun/pump{ pixel_x = 1; pixel_y = 4 }, diff --git a/_maps/map_files/tether/tether-03-surface3.dmm b/_maps/map_files/tether/tether-03-surface3.dmm index 2a7b093f5a6..42708c5af67 100644 --- a/_maps/map_files/tether/tether-03-surface3.dmm +++ b/_maps/map_files/tether/tether-03-surface3.dmm @@ -29696,8 +29696,8 @@ name = "east bump"; pixel_x = 28 }, -/obj/item/gun/projectile/revolver/capgun, -/obj/item/gun/projectile/revolver/capgun, +/obj/item/gun/ballistic/revolver/capgun, +/obj/item/gun/ballistic/revolver/capgun, /obj/item/toy/cultsword, /obj/item/toy/cultsword, /obj/item/bikehorn/rubberducky, @@ -30420,7 +30420,7 @@ }, /obj/structure/table/woodentable, /obj/item/storage/box/beanbags, -/obj/item/gun/projectile/shotgun/doublebarrel, +/obj/item/gun/ballistic/shotgun/doublebarrel, /obj/item/paper{ info = "This permit signifies that the Bartender is permitted to posess this firearm in the bar, and ONLY the bar. Failure to adhere to this permit will result in confiscation of the weapon and possibly arrest."; name = "Shotgun permit" diff --git a/_maps/map_files/tether/tether-06-station2.dmm b/_maps/map_files/tether/tether-06-station2.dmm index 752b6832564..19f657fc0db 100644 --- a/_maps/map_files/tether/tether-06-station2.dmm +++ b/_maps/map_files/tether/tether-06-station2.dmm @@ -999,7 +999,7 @@ name = "gun safe"; req_access = list(1) }, -/obj/item/gun/projectile/revolver/consul, +/obj/item/gun/ballistic/revolver/consul, /obj/item/ammo_magazine/s44, /obj/item/ammo_magazine/s44, /turf/simulated/floor/tiled/dark, diff --git a/_maps/map_files/triumph/triumph-02-deck2.dmm b/_maps/map_files/triumph/triumph-02-deck2.dmm index 987f5a35c0a..77b302e5503 100644 --- a/_maps/map_files/triumph/triumph-02-deck2.dmm +++ b/_maps/map_files/triumph/triumph-02-deck2.dmm @@ -3819,7 +3819,7 @@ /area/crew_quarters/lounge/kitchen_freezer) "lv" = ( /obj/structure/closet/secure_closet/bar, -/obj/item/gun/projectile/shotgun/doublebarrel, +/obj/item/gun/ballistic/shotgun/doublebarrel, /obj/item/storage/box/beanbags/large, /obj/item/storage/box/beanbags/large, /obj/item/clothing/accessory/permit/gun/bar, @@ -3832,7 +3832,7 @@ dir = 4; pixel_x = -24 }, -/obj/item/gun/projectile/shotgun/doublebarrel, +/obj/item/gun/ballistic/shotgun/doublebarrel, /turf/simulated/floor/wood, /area/triumph/surfacebase/bar_backroom) "lx" = ( @@ -3846,7 +3846,7 @@ /obj/structure/closet/hydrant{ pixel_y = 30 }, -/obj/item/gun/projectile/shotgun/flare, +/obj/item/gun/ballistic/shotgun/flare, /obj/item/storage/box/flashshells, /obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 1 diff --git a/_maps/map_files/triumph/triumph-04-deck4.dmm b/_maps/map_files/triumph/triumph-04-deck4.dmm index a5c1eab4f31..b3716394ce2 100644 --- a/_maps/map_files/triumph/triumph-04-deck4.dmm +++ b/_maps/map_files/triumph/triumph-04-deck4.dmm @@ -10777,7 +10777,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/gun/projectile/luger/brown, +/obj/item/gun/ballistic/luger/brown, /turf/simulated/floor/carpet, /area/crew_quarters/heads/hos) "hQJ" = ( @@ -10962,7 +10962,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/gun/projectile/shotgun/pump/rifle/lever/win1895, +/obj/item/gun/ballistic/shotgun/pump/rifle/lever/win1895, /turf/simulated/floor/carpet, /area/crew_quarters/heads/hos) "hWj" = ( @@ -19351,7 +19351,7 @@ /obj/structure/table/rack/shelf/steel, /obj/item/ammo_magazine/m762, /obj/item/ammo_magazine/m762, -/obj/item/gun/projectile/automatic/z8, +/obj/item/gun/ballistic/automatic/z8, /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/dark, /area/security/tactical) @@ -22675,7 +22675,7 @@ /turf/simulated/floor/tiled/dark, /area/chapel/main) "qpp" = ( -/obj/item/gun/projectile/shotgun/flare, +/obj/item/gun/ballistic/shotgun/flare, /obj/item/storage/box/flashshells, /obj/item/duct_tape_roll, /obj/structure/closet/hydrant{ @@ -31810,10 +31810,10 @@ pixel_x = 6; pixel_y = -1 }, -/obj/item/gun/projectile/shotgun/pump/combat, -/obj/item/gun/projectile/shotgun/pump/combat, -/obj/item/gun/projectile/shotgun/pump/combat, -/obj/item/gun/projectile/shotgun/pump/combat, +/obj/item/gun/ballistic/shotgun/pump/combat, +/obj/item/gun/ballistic/shotgun/pump/combat, +/obj/item/gun/ballistic/shotgun/pump/combat, +/obj/item/gun/ballistic/shotgun/pump/combat, /turf/simulated/floor/tiled/dark, /area/security/riot_control) "wDl" = ( diff --git a/_maps/map_files/triumph/triumph-05-flagship.dmm b/_maps/map_files/triumph/triumph-05-flagship.dmm index db93ccc7c13..ee0a5afa88e 100644 --- a/_maps/map_files/triumph/triumph-05-flagship.dmm +++ b/_maps/map_files/triumph/triumph-05-flagship.dmm @@ -194,8 +194,8 @@ /obj/item/ammo_magazine/m545, /obj/item/ammo_magazine/m545, /obj/item/ammo_magazine/m545, -/obj/item/gun/projectile/automatic/sts35, -/obj/item/gun/projectile/automatic/sts35, +/obj/item/gun/ballistic/automatic/sts35, +/obj/item/gun/ballistic/automatic/sts35, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -214,8 +214,8 @@ /obj/item/ammo_magazine/m545, /obj/item/ammo_magazine/m545, /obj/item/ammo_magazine/m545, -/obj/item/gun/projectile/automatic/sts35, -/obj/item/gun/projectile/automatic/sts35, +/obj/item/gun/ballistic/automatic/sts35, +/obj/item/gun/ballistic/automatic/sts35, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -339,10 +339,10 @@ /obj/item/ammo_casing/rocket, /obj/item/ammo_casing/rocket, /obj/item/ammo_casing/rocket, -/obj/item/gun/projectile/rocket, -/obj/item/gun/projectile/rocket, -/obj/item/gun/projectile/automatic/l6_saw, -/obj/item/gun/projectile/automatic/l6_saw, +/obj/item/gun/ballistic/rocket, +/obj/item/gun/ballistic/rocket, +/obj/item/gun/ballistic/automatic/l6_saw, +/obj/item/gun/ballistic/automatic/l6_saw, /obj/item/ammo_magazine/m545saw, /obj/item/ammo_magazine/m545saw, /obj/item/ammo_magazine/m545saw, @@ -593,8 +593,8 @@ "ba" = ( /obj/structure/table/rack, /obj/structure/window/reinforced, -/obj/item/gun/projectile/shotgun/pump/combat, -/obj/item/gun/projectile/shotgun/pump/combat, +/obj/item/gun/ballistic/shotgun/pump/combat, +/obj/item/gun/ballistic/shotgun/pump/combat, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -627,7 +627,7 @@ "bd" = ( /obj/structure/table/rack, /obj/structure/window/reinforced, -/obj/item/gun/projectile/automatic/advanced_smg, +/obj/item/gun/ballistic/automatic/advanced_smg, /obj/item/ammo_magazine/m9mmR/saber, /obj/item/ammo_magazine/m9mmR/saber, /obj/item/ammo_magazine/m9mmR/saber, @@ -658,10 +658,10 @@ /obj/item/ammo_magazine/s44, /obj/item/ammo_magazine/s44, /obj/item/ammo_magazine/s44, -/obj/item/gun/projectile/revolver/combat, -/obj/item/gun/projectile/revolver/combat, -/obj/item/gun/projectile/revolver/combat, -/obj/item/gun/projectile/revolver/combat, +/obj/item/gun/ballistic/revolver/combat, +/obj/item/gun/ballistic/revolver/combat, +/obj/item/gun/ballistic/revolver/combat, +/obj/item/gun/ballistic/revolver/combat, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -1306,7 +1306,7 @@ /obj/item/clothing/accessory/holster/hip, /obj/item/ammo_magazine/s44, /obj/item/ammo_magazine/s44, -/obj/item/gun/projectile/revolver/combat, +/obj/item/gun/ballistic/revolver/combat, /obj/structure/table/steel_reinforced, /turf/unsimulated/floor/steel{ icon = 'icons/turf/floors_vr.dmi'; @@ -4372,7 +4372,7 @@ "ie" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/gun/projectile/automatic/l6_saw, +/obj/item/gun/ballistic/automatic/l6_saw, /turf/unsimulated/floor{ dir = 5; icon_state = "vault" @@ -4854,7 +4854,7 @@ "iZ" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/gun/projectile/heavysniper, +/obj/item/gun/ballistic/heavysniper, /turf/unsimulated/floor{ dir = 5; icon_state = "vault" @@ -5110,8 +5110,8 @@ "jB" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/gun/projectile/automatic/z8, -/obj/item/gun/projectile/automatic/z8, +/obj/item/gun/ballistic/automatic/z8, +/obj/item/gun/ballistic/automatic/z8, /turf/unsimulated/floor{ dir = 5; icon_state = "vault" @@ -5431,11 +5431,11 @@ /area/centcom/security) "kc" = ( /obj/structure/table/rack, -/obj/item/gun/projectile/automatic/p90, -/obj/item/gun/projectile/automatic/p90, -/obj/item/gun/projectile/automatic/p90, -/obj/item/gun/projectile/automatic/p90, -/obj/item/gun/projectile/automatic/p90, +/obj/item/gun/ballistic/automatic/p90, +/obj/item/gun/ballistic/automatic/p90, +/obj/item/gun/ballistic/automatic/p90, +/obj/item/gun/ballistic/automatic/p90, +/obj/item/gun/ballistic/automatic/p90, /obj/effect/floor_decal/industrial/outline/yellow, /turf/unsimulated/floor{ dir = 5; @@ -5444,11 +5444,11 @@ /area/centcom/security) "kd" = ( /obj/structure/table/rack, -/obj/item/gun/projectile/automatic/bullpup, -/obj/item/gun/projectile/automatic/bullpup, -/obj/item/gun/projectile/automatic/bullpup, -/obj/item/gun/projectile/automatic/bullpup, -/obj/item/gun/projectile/automatic/bullpup, +/obj/item/gun/ballistic/automatic/bullpup, +/obj/item/gun/ballistic/automatic/bullpup, +/obj/item/gun/ballistic/automatic/bullpup, +/obj/item/gun/ballistic/automatic/bullpup, +/obj/item/gun/ballistic/automatic/bullpup, /obj/effect/floor_decal/industrial/outline/yellow, /turf/unsimulated/floor{ dir = 5; @@ -5457,11 +5457,11 @@ /area/centcom/security) "ke" = ( /obj/structure/table/rack, -/obj/item/gun/projectile/automatic/wt550/lethal, -/obj/item/gun/projectile/automatic/wt550/lethal, -/obj/item/gun/projectile/automatic/wt550/lethal, -/obj/item/gun/projectile/automatic/wt550/lethal, -/obj/item/gun/projectile/automatic/wt550/lethal, +/obj/item/gun/ballistic/automatic/wt550/lethal, +/obj/item/gun/ballistic/automatic/wt550/lethal, +/obj/item/gun/ballistic/automatic/wt550/lethal, +/obj/item/gun/ballistic/automatic/wt550/lethal, +/obj/item/gun/ballistic/automatic/wt550/lethal, /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/camera/network/crescent, /turf/unsimulated/floor{ @@ -5471,11 +5471,11 @@ /area/centcom/security) "kf" = ( /obj/structure/table/rack, -/obj/item/gun/projectile/shotgun/pump/combat, -/obj/item/gun/projectile/shotgun/pump/combat, -/obj/item/gun/projectile/shotgun/pump/combat, -/obj/item/gun/projectile/shotgun/pump/combat, -/obj/item/gun/projectile/shotgun/pump/combat, +/obj/item/gun/ballistic/shotgun/pump/combat, +/obj/item/gun/ballistic/shotgun/pump/combat, +/obj/item/gun/ballistic/shotgun/pump/combat, +/obj/item/gun/ballistic/shotgun/pump/combat, +/obj/item/gun/ballistic/shotgun/pump/combat, /obj/effect/floor_decal/industrial/outline/yellow, /turf/unsimulated/floor{ dir = 5; @@ -5813,11 +5813,11 @@ /area/centcom/security) "kI" = ( /obj/structure/table/rack, -/obj/item/gun/projectile/shotgun/pump, -/obj/item/gun/projectile/shotgun/pump, -/obj/item/gun/projectile/shotgun/pump, -/obj/item/gun/projectile/shotgun/pump, -/obj/item/gun/projectile/shotgun/pump, +/obj/item/gun/ballistic/shotgun/pump, +/obj/item/gun/ballistic/shotgun/pump, +/obj/item/gun/ballistic/shotgun/pump, +/obj/item/gun/ballistic/shotgun/pump, +/obj/item/gun/ballistic/shotgun/pump, /obj/effect/floor_decal/industrial/outline/yellow, /turf/unsimulated/floor{ dir = 5; @@ -6242,11 +6242,11 @@ /area/centcom/security) "lw" = ( /obj/structure/table/rack, -/obj/item/gun/projectile/automatic/battlerifle, -/obj/item/gun/projectile/automatic/battlerifle, -/obj/item/gun/projectile/automatic/battlerifle, -/obj/item/gun/projectile/automatic/battlerifle, -/obj/item/gun/projectile/automatic/battlerifle, +/obj/item/gun/ballistic/automatic/battlerifle, +/obj/item/gun/ballistic/automatic/battlerifle, +/obj/item/gun/ballistic/automatic/battlerifle, +/obj/item/gun/ballistic/automatic/battlerifle, +/obj/item/gun/ballistic/automatic/battlerifle, /obj/effect/floor_decal/industrial/outline/yellow, /turf/unsimulated/floor{ dir = 5; @@ -6593,11 +6593,11 @@ /area/centcom/security) "md" = ( /obj/structure/table/rack, -/obj/item/gun/projectile/automatic/pdw, -/obj/item/gun/projectile/automatic/pdw, -/obj/item/gun/projectile/automatic/pdw, -/obj/item/gun/projectile/automatic/pdw, -/obj/item/gun/projectile/automatic/pdw, +/obj/item/gun/ballistic/automatic/pdw, +/obj/item/gun/ballistic/automatic/pdw, +/obj/item/gun/ballistic/automatic/pdw, +/obj/item/gun/ballistic/automatic/pdw, +/obj/item/gun/ballistic/automatic/pdw, /obj/effect/floor_decal/industrial/outline/yellow, /turf/unsimulated/floor{ dir = 5; @@ -11728,7 +11728,7 @@ pixel_y = 30 }, /obj/structure/table/reinforced, -/obj/item/gun/projectile/shotgun/pump/combat{ +/obj/item/gun/ballistic/shotgun/pump/combat{ name = "Discipline" }, /obj/effect/floor_decal/borderfloorblack{ diff --git a/_maps/map_levels/140x140/talon/talon1.dmm b/_maps/map_levels/140x140/talon/talon1.dmm index 3e595c0dcf3..67552a38691 100644 --- a/_maps/map_levels/140x140/talon/talon1.dmm +++ b/_maps/map_levels/140x140/talon/talon1.dmm @@ -859,7 +859,7 @@ /obj/structure/table/rack/steel, /obj/item/spaceflare, /obj/item/storage/box/flashshells/large, -/obj/item/gun/projectile/shotgun/flare, +/obj/item/gun/ballistic/shotgun/flare, /obj/machinery/alarm/talon{ dir = 1; pixel_y = -22 diff --git a/_maps/map_levels/140x140/tradeport.dmm b/_maps/map_levels/140x140/tradeport.dmm index bf81ac22046..91f72d88ee8 100644 --- a/_maps/map_levels/140x140/tradeport.dmm +++ b/_maps/map_levels/140x140/tradeport.dmm @@ -835,7 +835,7 @@ dir = 8 }, /obj/structure/table/steel_reinforced, -/obj/item/gun/projectile/automatic/as24{ +/obj/item/gun/ballistic/automatic/as24{ desc = "Never ask to speak to the manager."; name = "Kate" }, @@ -2244,7 +2244,7 @@ dir = 1 }, /obj/structure/table/marble, -/obj/item/gun/projectile/shotgun/pump/JSDF{ +/obj/item/gun/ballistic/shotgun/pump/JSDF{ desc = "The Iceman cometh."; name = "mercenary tactical shotgun" }, @@ -6045,7 +6045,7 @@ dir = 1 }, /obj/structure/bookcase, -/obj/item/gun/projectile/shotgun/pump/combat, +/obj/item/gun/ballistic/shotgun/pump/combat, /turf/simulated/floor/wood, /area/shuttle/trade_ship/general) "wx" = ( diff --git a/_maps/map_levels/192x192/tradeport.dmm b/_maps/map_levels/192x192/tradeport.dmm index 5fc2802a96e..95cfb0e9333 100644 --- a/_maps/map_levels/192x192/tradeport.dmm +++ b/_maps/map_levels/192x192/tradeport.dmm @@ -678,7 +678,7 @@ dir = 8 }, /obj/structure/table/steel_reinforced, -/obj/item/gun/projectile/automatic/as24{ +/obj/item/gun/ballistic/automatic/as24{ desc = "Never ask to speak to the manager."; name = "Kate" }, @@ -7319,7 +7319,7 @@ dir = 1 }, /obj/structure/table/marble, -/obj/item/gun/projectile/shotgun/pump/JSDF{ +/obj/item/gun/ballistic/shotgun/pump/JSDF{ desc = "The Iceman cometh."; name = "mercenary tactical shotgun" }, @@ -9793,7 +9793,7 @@ dir = 1 }, /obj/structure/bookcase, -/obj/item/gun/projectile/shotgun/pump/combat, +/obj/item/gun/ballistic/shotgun/pump/combat, /turf/simulated/floor/wood, /area/shuttle/trade_ship/general) "LL" = ( diff --git a/_maps/submaps/level_specific/class_d/Possesed_mech_cave.dmm b/_maps/submaps/level_specific/class_d/Possesed_mech_cave.dmm index 73fb61a4cbc..e924f18374d 100644 --- a/_maps/submaps/level_specific/class_d/Possesed_mech_cave.dmm +++ b/_maps/submaps/level_specific/class_d/Possesed_mech_cave.dmm @@ -168,7 +168,7 @@ /obj/item/ammo_casing/a12g/flare, /obj/item/ammo_casing/a12g/flare, /obj/item/ammo_casing/a12g/flare, -/obj/item/gun/projectile/shotgun/flare, +/obj/item/gun/ballistic/shotgun/flare, /turf/simulated/floor/classd/indoors, /area/class_d/explored/underground) "GP" = ( diff --git a/_maps/submaps/level_specific/class_d/hiddenbunkerD.dmm b/_maps/submaps/level_specific/class_d/hiddenbunkerD.dmm index ecd9950551a..b2de0298fda 100644 --- a/_maps/submaps/level_specific/class_d/hiddenbunkerD.dmm +++ b/_maps/submaps/level_specific/class_d/hiddenbunkerD.dmm @@ -330,7 +330,7 @@ /area/class_d/Mountain) "TI" = ( /obj/structure/table/reinforced, -/obj/item/gun/projectile/automatic/tommygun, +/obj/item/gun/ballistic/automatic/tommygun, /obj/machinery/light{ dir = 4 }, diff --git a/_maps/submaps/level_specific/class_d/landing_padD.dmm b/_maps/submaps/level_specific/class_d/landing_padD.dmm index c5016ce9ab5..7b0f8317798 100644 --- a/_maps/submaps/level_specific/class_d/landing_padD.dmm +++ b/_maps/submaps/level_specific/class_d/landing_padD.dmm @@ -133,7 +133,7 @@ /obj/item/clothing/shoes/black, /obj/item/clothing/shoes/black, /obj/item/clothing/shoes/black, -/obj/item/gun/projectile/shotgun/pump/rifle, +/obj/item/gun/ballistic/shotgun/pump/rifle, /obj/item/ammo_magazine/clip/c762, /obj/item/ammo_magazine/clip/c762, /obj/item/ammo_magazine/clip/c762, diff --git a/_maps/submaps/level_specific/class_d/vault5D.dmm b/_maps/submaps/level_specific/class_d/vault5D.dmm index 87aae4bc705..b90e66e1ee5 100644 --- a/_maps/submaps/level_specific/class_d/vault5D.dmm +++ b/_maps/submaps/level_specific/class_d/vault5D.dmm @@ -14,7 +14,7 @@ "d" = ( /obj/effect/alien/weeds, /obj/structure/bed/nest, -/obj/item/gun/projectile/p92x/large, +/obj/item/gun/ballistic/p92x/large, /turf/simulated/mineral/floor/classd/indoors, /area/class_d/explored) "e" = ( @@ -52,7 +52,7 @@ "k" = ( /obj/effect/alien/weeds, /obj/item/clothing/head/helmet/tac, -/obj/item/gun/projectile/SVD, +/obj/item/gun/ballistic/SVD, /turf/simulated/mineral/floor/classd/indoors, /area/class_d/explored) "A" = ( diff --git a/_maps/submaps/level_specific/class_h/AuxiliaryResearchFacility.dmm b/_maps/submaps/level_specific/class_h/AuxiliaryResearchFacility.dmm index ecac311fa22..a40fbbaa84b 100644 --- a/_maps/submaps/level_specific/class_h/AuxiliaryResearchFacility.dmm +++ b/_maps/submaps/level_specific/class_h/AuxiliaryResearchFacility.dmm @@ -890,7 +890,7 @@ /area/class_h/POIs/AuxiliaryResearchFacility) "uI" = ( /obj/structure/table/rack, -/obj/item/gun/projectile/shotgun/doublebarrel, +/obj/item/gun/ballistic/shotgun/doublebarrel, /turf/simulated/floor/tiled/steel, /area/class_h/POIs/AuxiliaryResearchFacility) "uP" = ( diff --git a/_maps/submaps/level_specific/class_h/farmsH.dmm b/_maps/submaps/level_specific/class_h/farmsH.dmm index a240e72241e..143e101f168 100644 --- a/_maps/submaps/level_specific/class_h/farmsH.dmm +++ b/_maps/submaps/level_specific/class_h/farmsH.dmm @@ -115,7 +115,7 @@ /obj/item/clothing/head/cowboy_hat, /obj/item/clothing/head/cowboy_hat, /obj/item/clothing/head/cowboy_hat, -/obj/item/gun/projectile/shotgun/doublebarrel/pellet, +/obj/item/gun/ballistic/shotgun/doublebarrel/pellet, /obj/item/storage/box/shotgunshells, /turf/simulated/floor/wood/classh, /area/class_h/POIs/dirt_farm) diff --git a/_maps/submaps/level_specific/class_h/highnoonH.dmm b/_maps/submaps/level_specific/class_h/highnoonH.dmm index 2e2febf7a18..f3d748d357a 100644 --- a/_maps/submaps/level_specific/class_h/highnoonH.dmm +++ b/_maps/submaps/level_specific/class_h/highnoonH.dmm @@ -26,7 +26,7 @@ /area/class_h/POIs/WW_Town) "dR" = ( /obj/structure/table/woodentable, -/obj/item/gun/projectile/revolver/detective45, +/obj/item/gun/ballistic/revolver/detective45, /obj/machinery/light/small{ dir = 4 }, @@ -284,7 +284,7 @@ /area/class_h/POIs/WW_Town) "Vx" = ( /obj/structure/table/rack/shelf, -/obj/item/gun/projectile/shotgun/pump/rifle, +/obj/item/gun/ballistic/shotgun/pump/rifle, /turf/simulated/floor/wood, /area/class_h/POIs/WW_Town) "Wm" = ( diff --git a/_maps/submaps/level_specific/class_h/landing_padH.dmm b/_maps/submaps/level_specific/class_h/landing_padH.dmm index ee8c817f481..72f72f89120 100644 --- a/_maps/submaps/level_specific/class_h/landing_padH.dmm +++ b/_maps/submaps/level_specific/class_h/landing_padH.dmm @@ -112,7 +112,7 @@ /obj/item/clothing/shoes/black, /obj/item/clothing/shoes/black, /obj/item/clothing/shoes/black, -/obj/item/gun/projectile/shotgun/pump/rifle, +/obj/item/gun/ballistic/shotgun/pump/rifle, /obj/item/ammo_magazine/clip/c762, /obj/item/ammo_magazine/clip/c762, /obj/item/ammo_magazine/clip/c762, diff --git a/_maps/submaps/level_specific/class_h/ranchH.dmm b/_maps/submaps/level_specific/class_h/ranchH.dmm index 273d4b29498..5bdfc48a4d2 100644 --- a/_maps/submaps/level_specific/class_h/ranchH.dmm +++ b/_maps/submaps/level_specific/class_h/ranchH.dmm @@ -123,7 +123,7 @@ /area/class_h/POIs/ranch) "Q" = ( /obj/structure/closet/cabinet, -/obj/item/gun/projectile/shotgun/pump/rifle/lever/vintage, +/obj/item/gun/ballistic/shotgun/pump/rifle/lever/vintage, /obj/item/ammo_casing/a44, /obj/item/ammo_casing/a44, /obj/item/ammo_casing/a44, diff --git a/_maps/submaps/level_specific/debrisfield_vr/tinycarrier.dmm b/_maps/submaps/level_specific/debrisfield_vr/tinycarrier.dmm index 8f66375ecc5..effce4c05c8 100644 --- a/_maps/submaps/level_specific/debrisfield_vr/tinycarrier.dmm +++ b/_maps/submaps/level_specific/debrisfield_vr/tinycarrier.dmm @@ -559,8 +559,8 @@ anchored = 1; starts_with = list() }, -/obj/item/gun/projectile/p92x/large, -/obj/item/gun/projectile/p92x/large, +/obj/item/gun/ballistic/p92x/large, +/obj/item/gun/ballistic/p92x/large, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, diff --git a/_maps/submaps/level_specific/virgo2/Blackshuttledown.dmm b/_maps/submaps/level_specific/virgo2/Blackshuttledown.dmm index fc97170554f..6e8840e4eb0 100644 --- a/_maps/submaps/level_specific/virgo2/Blackshuttledown.dmm +++ b/_maps/submaps/level_specific/virgo2/Blackshuttledown.dmm @@ -122,8 +122,8 @@ /area/submap/virgo2/Blackshuttledown) "av" = ( /obj/structure/table/steel, -/obj/item/gun/projectile/automatic/wt550, -/obj/item/gun/projectile/automatic/p90, +/obj/item/gun/ballistic/automatic/wt550, +/obj/item/gun/ballistic/automatic/p90, /turf/simulated/floor/tiled/steel, /area/submap/virgo2/Blackshuttledown) "aw" = ( @@ -161,7 +161,7 @@ /area/submap/virgo2/Blackshuttledown) "aC" = ( /obj/structure/table/steel, -/obj/item/gun/projectile/automatic/c20r, +/obj/item/gun/ballistic/automatic/c20r, /obj/machinery/light/small{ dir = 4; pixel_y = 0 @@ -357,7 +357,7 @@ /area/submap/virgo2/Blackshuttledown) "bl" = ( /obj/structure/table/steel, -/obj/item/gun/projectile/automatic/c20r, +/obj/item/gun/ballistic/automatic/c20r, /turf/simulated/floor/tiled/steel, /area/submap/virgo2/Blackshuttledown) "bm" = ( @@ -371,7 +371,7 @@ /area/submap/virgo2/Blackshuttledown) "bo" = ( /obj/structure/table/steel, -/obj/item/gun/projectile/pistol, +/obj/item/gun/ballistic/pistol, /obj/machinery/light/small{ dir = 4; pixel_y = 0 @@ -391,8 +391,8 @@ /area/submap/virgo2/Blackshuttledown) "br" = ( /obj/structure/table/steel, -/obj/item/gun/projectile/pistol, -/obj/item/gun/projectile/shotgun/pump, +/obj/item/gun/ballistic/pistol, +/obj/item/gun/ballistic/shotgun/pump, /turf/simulated/floor/tiled/steel, /area/submap/virgo2/Blackshuttledown) "bs" = ( diff --git a/_maps/submaps/level_specific/virgo2/CrashedSmuggler.dmm b/_maps/submaps/level_specific/virgo2/CrashedSmuggler.dmm index c45fe9678cd..e15216fc1fe 100644 --- a/_maps/submaps/level_specific/virgo2/CrashedSmuggler.dmm +++ b/_maps/submaps/level_specific/virgo2/CrashedSmuggler.dmm @@ -303,7 +303,7 @@ /obj/structure/bed/chair/bay/shuttle{ dir = 4 }, -/obj/item/gun/projectile/revolver/mateba, +/obj/item/gun/ballistic/revolver/mateba, /turf/simulated/floor/tiled/techfloor/virgo2, /area/submap/virgo2/CrashedSmuggler/ship) "BR" = ( diff --git a/_maps/submaps/level_specific/virgo2/DJOutpost1.dmm b/_maps/submaps/level_specific/virgo2/DJOutpost1.dmm index 4a0e9de08d5..06ae1332c5c 100644 --- a/_maps/submaps/level_specific/virgo2/DJOutpost1.dmm +++ b/_maps/submaps/level_specific/virgo2/DJOutpost1.dmm @@ -271,7 +271,7 @@ "P" = ( /obj/structure/table/rack, /obj/item/ammo_magazine/clip/c762/hunter, -/obj/item/gun/projectile/shotgun/pump/rifle, +/obj/item/gun/ballistic/shotgun/pump/rifle, /turf/simulated/floor/wood, /area/submap/virgo2/DJOutpost1) "Q" = ( diff --git a/_maps/submaps/level_specific/virgo2/DoomP.dmm b/_maps/submaps/level_specific/virgo2/DoomP.dmm index b4fae3cdbd2..6a298be75b3 100644 --- a/_maps/submaps/level_specific/virgo2/DoomP.dmm +++ b/_maps/submaps/level_specific/virgo2/DoomP.dmm @@ -350,7 +350,7 @@ /area/submap/virgo2/DoomP) "bs" = ( /obj/structure/table/rack, -/obj/item/gun/projectile/contender, +/obj/item/gun/ballistic/contender, /obj/item/ammo_magazine/s357, /obj/item/ammo_magazine/s357, /turf/simulated/floor/tiled/techfloor, diff --git a/_maps/submaps/level_specific/virgo2/GovPatrol.dmm b/_maps/submaps/level_specific/virgo2/GovPatrol.dmm index 6534c5f3f0d..5a8caa4b13f 100644 --- a/_maps/submaps/level_specific/virgo2/GovPatrol.dmm +++ b/_maps/submaps/level_specific/virgo2/GovPatrol.dmm @@ -35,7 +35,7 @@ /turf/simulated/mineral/floor/ignore_mapgen/virgo2, /area/submap/virgo2/GovPatrol) "k" = ( -/obj/item/gun/projectile/shotgun/pump/rifle/lever, +/obj/item/gun/ballistic/shotgun/pump/rifle/lever, /turf/simulated/mineral/floor/ignore_mapgen/virgo2, /area/submap/virgo2/GovPatrol) "m" = ( diff --git a/_maps/submaps/level_specific/virgo2/MCamp1.dmm b/_maps/submaps/level_specific/virgo2/MCamp1.dmm index 938c754c3d2..1f96a594e47 100644 --- a/_maps/submaps/level_specific/virgo2/MCamp1.dmm +++ b/_maps/submaps/level_specific/virgo2/MCamp1.dmm @@ -53,7 +53,7 @@ /area/submap/virgo2/MilitaryCamp1) "q" = ( /obj/structure/table/standard, -/obj/item/gun/projectile/automatic/c20r, +/obj/item/gun/ballistic/automatic/c20r, /turf/simulated/floor/tiled/techfloor/virgo2, /area/submap/virgo2/MilitaryCamp1) "r" = ( diff --git a/_maps/submaps/level_specific/virgo2/Rockybase.dmm b/_maps/submaps/level_specific/virgo2/Rockybase.dmm index ca64ac126f0..104eecfeb38 100644 --- a/_maps/submaps/level_specific/virgo2/Rockybase.dmm +++ b/_maps/submaps/level_specific/virgo2/Rockybase.dmm @@ -138,7 +138,7 @@ /area/submap/virgo2/Rockybase) "aC" = ( /obj/structure/table/rack, -/obj/item/gun/projectile/pistol, +/obj/item/gun/ballistic/pistol, /turf/simulated/floor/tiled/techfloor/virgo2, /area/submap/virgo2/Rockybase) "aD" = ( @@ -158,8 +158,8 @@ /area/submap/virgo2/Rockybase) "aG" = ( /obj/structure/table/rack, -/obj/item/gun/projectile/shotgun/pump/combat, -/obj/item/gun/projectile/shotgun/pump/combat, +/obj/item/gun/ballistic/shotgun/pump/combat, +/obj/item/gun/ballistic/shotgun/pump/combat, /turf/simulated/floor/tiled/techfloor/virgo2, /area/submap/virgo2/Rockybase) "aH" = ( @@ -263,7 +263,7 @@ "aW" = ( /obj/structure/bed, /obj/item/bedsheet, -/obj/item/gun/projectile/pistol, +/obj/item/gun/ballistic/pistol, /turf/simulated/floor/tiled/techfloor/virgo2, /area/submap/virgo2/Rockybase) "aX" = ( @@ -293,8 +293,8 @@ /area/submap/virgo2/Rockybase) "bc" = ( /obj/structure/table/rack, -/obj/item/gun/projectile/automatic/c20r, -/obj/item/gun/projectile/automatic/c20r, +/obj/item/gun/ballistic/automatic/c20r, +/obj/item/gun/ballistic/automatic/c20r, /turf/simulated/floor/tiled/techfloor/virgo2, /area/submap/virgo2/Rockybase) "bd" = ( diff --git a/_maps/submaps/mountains/Rockb1.dmm b/_maps/submaps/mountains/Rockb1.dmm index 232b446aa64..ef20b4734fc 100644 --- a/_maps/submaps/mountains/Rockb1.dmm +++ b/_maps/submaps/mountains/Rockb1.dmm @@ -25,7 +25,7 @@ icon_opened = "cabinet_open"; icon_state = "cabinet_closed" }, -/obj/item/gun/projectile/pistol, +/obj/item/gun/ballistic/pistol, /obj/item/ammo_magazine/m9mm/compact, /turf/simulated/floor/lino, /area/submap/Rockb1) diff --git a/_maps/submaps/mountains/prepper1.dmm b/_maps/submaps/mountains/prepper1.dmm index 1b336994942..ae3fa8b5209 100644 --- a/_maps/submaps/mountains/prepper1.dmm +++ b/_maps/submaps/mountains/prepper1.dmm @@ -96,7 +96,7 @@ /area/submap/cave/prepper1) "t" = ( /obj/structure/table/rack, -/obj/item/gun/projectile/shotgun/pump/rifle/lever, +/obj/item/gun/ballistic/shotgun/pump/rifle/lever, /obj/item/ammo_magazine/clip/c762, /obj/item/ammo_magazine/clip/c762, /turf/simulated/floor/plating, diff --git a/_maps/submaps/mountains/vault5.dmm b/_maps/submaps/mountains/vault5.dmm index 8bc4d418b37..0809ec78581 100644 --- a/_maps/submaps/mountains/vault5.dmm +++ b/_maps/submaps/mountains/vault5.dmm @@ -14,7 +14,7 @@ "d" = ( /obj/effect/alien/weeds, /obj/structure/bed/nest, -/obj/item/gun/projectile/p92x/large, +/obj/item/gun/ballistic/p92x/large, /turf/simulated/mineral/floor/ignore_mapgen, /area/submap/cave/vault5) "e" = ( @@ -51,7 +51,7 @@ "k" = ( /obj/effect/alien/weeds, /obj/item/clothing/head/helmet/tac, -/obj/item/gun/projectile/SVD, +/obj/item/gun/ballistic/SVD, /turf/simulated/mineral/floor/ignore_mapgen, /area/submap/cave/vault5) diff --git a/_maps/submaps/plains/Boathouse.dmm b/_maps/submaps/plains/Boathouse.dmm index 4c8b3bfe8b3..638002e468e 100644 --- a/_maps/submaps/plains/Boathouse.dmm +++ b/_maps/submaps/plains/Boathouse.dmm @@ -49,7 +49,7 @@ icon_opened = "cabinet_open"; icon_state = "cabinet_closed" }, -/obj/item/gun/projectile/shotgun/doublebarrel, +/obj/item/gun/ballistic/shotgun/doublebarrel, /obj/item/storage/box/beanbags, /turf/simulated/floor/wood, /area/submap/Boathouse) diff --git a/_maps/submaps/plains/Boathouse_vr.dmm b/_maps/submaps/plains/Boathouse_vr.dmm index b14e8fa227d..57011f17590 100644 --- a/_maps/submaps/plains/Boathouse_vr.dmm +++ b/_maps/submaps/plains/Boathouse_vr.dmm @@ -49,7 +49,7 @@ icon_opened = "cabinet_open"; icon_state = "cabinet_closed" }, -/obj/item/gun/projectile/shotgun/doublebarrel, +/obj/item/gun/ballistic/shotgun/doublebarrel, /obj/item/storage/box/beanbags, /turf/simulated/floor/wood, /area/submap/Boathouse) diff --git a/_maps/submaps/wilderness/Blackshuttledown.dmm b/_maps/submaps/wilderness/Blackshuttledown.dmm index 412b4ed9618..3d8b0f0d5ba 100644 --- a/_maps/submaps/wilderness/Blackshuttledown.dmm +++ b/_maps/submaps/wilderness/Blackshuttledown.dmm @@ -155,8 +155,8 @@ /area/submap/Blackshuttledown) "ax" = ( /obj/structure/table/steel, -/obj/item/gun/projectile/automatic/wt550, -/obj/item/gun/projectile/automatic/p90, +/obj/item/gun/ballistic/automatic/wt550, +/obj/item/gun/ballistic/automatic/p90, /turf/simulated/floor/tiled/steel_grid, /area/submap/Blackshuttledown) "ay" = ( @@ -671,7 +671,7 @@ /area/submap/Blackshuttledown) "cc" = ( /obj/structure/table/steel, -/obj/item/gun/projectile/pistol, +/obj/item/gun/ballistic/pistol, /obj/machinery/light/small{ dir = 4; pixel_y = 0 diff --git a/_maps/submaps/wilderness/Blueshuttledown.dmm b/_maps/submaps/wilderness/Blueshuttledown.dmm index 9869301c1dd..c14e899734a 100644 --- a/_maps/submaps/wilderness/Blueshuttledown.dmm +++ b/_maps/submaps/wilderness/Blueshuttledown.dmm @@ -158,8 +158,8 @@ /area/submap/Blackshuttledown) "ax" = ( /obj/structure/table/steel, -/obj/item/gun/projectile/automatic/wt550, -/obj/item/gun/projectile/automatic/p90, +/obj/item/gun/ballistic/automatic/wt550, +/obj/item/gun/ballistic/automatic/p90, /turf/simulated/floor/tiled/steel_grid, /area/submap/Blackshuttledown) "ay" = ( @@ -692,7 +692,7 @@ /area/submap/Blackshuttledown) "cc" = ( /obj/structure/table/steel, -/obj/item/gun/projectile/pistol, +/obj/item/gun/ballistic/pistol, /obj/machinery/light/small{ dir = 4; pixel_y = 0 diff --git a/_maps/submaps/wilderness/DJOutpost1.dmm b/_maps/submaps/wilderness/DJOutpost1.dmm index 4834a96c6b1..f362d8a8e0e 100644 --- a/_maps/submaps/wilderness/DJOutpost1.dmm +++ b/_maps/submaps/wilderness/DJOutpost1.dmm @@ -279,7 +279,7 @@ "P" = ( /obj/structure/table/rack, /obj/item/ammo_magazine/clip/c762/hunter, -/obj/item/gun/projectile/shotgun/pump/rifle, +/obj/item/gun/ballistic/shotgun/pump/rifle, /turf/simulated/floor/wood, /area/submap/DJOutpost1) "Q" = ( diff --git a/_maps/submaps/wilderness/DoomP.dmm b/_maps/submaps/wilderness/DoomP.dmm index bde1ca491a4..212b24f3c07 100644 --- a/_maps/submaps/wilderness/DoomP.dmm +++ b/_maps/submaps/wilderness/DoomP.dmm @@ -365,7 +365,7 @@ /area/submap/DoomP) "bs" = ( /obj/structure/table/rack, -/obj/item/gun/projectile/contender, +/obj/item/gun/ballistic/contender, /obj/item/ammo_magazine/s357, /obj/item/ammo_magazine/s357, /turf/simulated/floor/tiled/techfloor, diff --git a/_maps/submaps/wilderness/GovPatrol.dmm b/_maps/submaps/wilderness/GovPatrol.dmm index 115c0633b6b..0194db1a8ad 100644 --- a/_maps/submaps/wilderness/GovPatrol.dmm +++ b/_maps/submaps/wilderness/GovPatrol.dmm @@ -35,7 +35,7 @@ /turf/template_noop, /area/submap/GovPatrol) "j" = ( -/obj/item/gun/projectile/shotgun/pump/rifle/lever, +/obj/item/gun/ballistic/shotgun/pump/rifle/lever, /turf/template_noop, /area/submap/GovPatrol) "k" = ( diff --git a/_maps/submaps/wilderness/Rockybase.dmm b/_maps/submaps/wilderness/Rockybase.dmm index 4261ef578fe..54534d23a14 100644 --- a/_maps/submaps/wilderness/Rockybase.dmm +++ b/_maps/submaps/wilderness/Rockybase.dmm @@ -200,7 +200,7 @@ /area/submap/Rockybase) "aQ" = ( /obj/structure/table/rack, -/obj/item/gun/projectile/pistol, +/obj/item/gun/ballistic/pistol, /obj/effect/floor_decal/corner/red/border{ dir = 1 }, @@ -235,8 +235,8 @@ /area/submap/Rockybase) "aV" = ( /obj/structure/table/rack, -/obj/item/gun/projectile/shotgun/pump/combat, -/obj/item/gun/projectile/shotgun/pump/combat, +/obj/item/gun/ballistic/shotgun/pump/combat, +/obj/item/gun/ballistic/shotgun/pump/combat, /turf/simulated/floor/tiled/techfloor, /area/submap/Rockybase) "aW" = ( @@ -362,7 +362,7 @@ "bn" = ( /obj/structure/bed, /obj/item/bedsheet, -/obj/item/gun/projectile/pistol, +/obj/item/gun/ballistic/pistol, /turf/simulated/floor/holofloor/lino, /area/submap/Rockybase) "bo" = ( diff --git a/_maps/templates/admin/dhael_centcom.dmm b/_maps/templates/admin/dhael_centcom.dmm index 7b8d742eb68..4f985da9f83 100644 --- a/_maps/templates/admin/dhael_centcom.dmm +++ b/_maps/templates/admin/dhael_centcom.dmm @@ -113,8 +113,8 @@ /obj/item/ammo_magazine/m545, /obj/item/ammo_magazine/m545, /obj/item/ammo_magazine/m545, -/obj/item/gun/projectile/automatic/sts35, -/obj/item/gun/projectile/automatic/sts35, +/obj/item/gun/ballistic/automatic/sts35, +/obj/item/gun/ballistic/automatic/sts35, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -133,8 +133,8 @@ /obj/item/ammo_magazine/m545, /obj/item/ammo_magazine/m545, /obj/item/ammo_magazine/m545, -/obj/item/gun/projectile/automatic/sts35, -/obj/item/gun/projectile/automatic/sts35, +/obj/item/gun/ballistic/automatic/sts35, +/obj/item/gun/ballistic/automatic/sts35, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -372,8 +372,8 @@ "ba" = ( /obj/structure/table/rack, /obj/structure/window/reinforced, -/obj/item/gun/projectile/shotgun/pump/combat, -/obj/item/gun/projectile/shotgun/pump/combat, +/obj/item/gun/ballistic/shotgun/pump/combat, +/obj/item/gun/ballistic/shotgun/pump/combat, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -393,8 +393,8 @@ "bc" = ( /obj/structure/table/rack, /obj/structure/window/reinforced, -/obj/item/gun/projectile/revolver/detective45, -/obj/item/gun/projectile/revolver/detective45, +/obj/item/gun/ballistic/revolver/detective45, +/obj/item/gun/ballistic/revolver/detective45, /obj/item/ammo_magazine/s45, /obj/item/ammo_magazine/s45, /obj/item/ammo_magazine/s45, @@ -406,7 +406,7 @@ "bd" = ( /obj/structure/table/rack, /obj/structure/window/reinforced, -/obj/item/gun/projectile/automatic/advanced_smg, +/obj/item/gun/ballistic/automatic/advanced_smg, /obj/item/ammo_magazine/m9mmAdvanced, /obj/item/ammo_magazine/m9mmAdvanced, /obj/item/ammo_magazine/m9mmAdvanced, @@ -429,10 +429,10 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/gun/projectile/p92x, -/obj/item/gun/projectile/p92x, -/obj/item/gun/projectile/p92x, -/obj/item/gun/projectile/p92x, +/obj/item/gun/ballistic/p92x, +/obj/item/gun/ballistic/p92x, +/obj/item/gun/ballistic/p92x, +/obj/item/gun/ballistic/p92x, /obj/item/ammo_magazine/m9mm/large/licensed, /obj/item/ammo_magazine/m9mm/large/licensed, /obj/item/ammo_magazine/m9mm/large/licensed, @@ -929,7 +929,7 @@ /obj/item/clothing/accessory/holster/hip, /obj/item/ammo_magazine/m44, /obj/item/ammo_magazine/m44, -/obj/item/gun/projectile/deagle, +/obj/item/gun/ballistic/deagle, /turf/unsimulated/floor/steel{ icon = 'icons/turf/floors_vr.dmi'; icon_state = "wood" @@ -3775,7 +3775,7 @@ "ie" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/gun/projectile/automatic/l6_saw, +/obj/item/gun/ballistic/automatic/l6_saw, /turf/unsimulated/floor{ dir = 5; icon_state = "vault" @@ -4165,7 +4165,7 @@ "iZ" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/gun/projectile/heavysniper, +/obj/item/gun/ballistic/heavysniper, /turf/unsimulated/floor{ dir = 5; icon_state = "vault" @@ -4380,8 +4380,8 @@ "jB" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/gun/projectile/automatic/z8, -/obj/item/gun/projectile/automatic/z8, +/obj/item/gun/ballistic/automatic/z8, +/obj/item/gun/ballistic/automatic/z8, /turf/unsimulated/floor{ dir = 5; icon_state = "vault" @@ -4699,11 +4699,11 @@ /area/centcom/security) "kc" = ( /obj/structure/table/rack, -/obj/item/gun/projectile/automatic/p90, -/obj/item/gun/projectile/automatic/p90, -/obj/item/gun/projectile/automatic/p90, -/obj/item/gun/projectile/automatic/p90, -/obj/item/gun/projectile/automatic/p90, +/obj/item/gun/ballistic/automatic/p90, +/obj/item/gun/ballistic/automatic/p90, +/obj/item/gun/ballistic/automatic/p90, +/obj/item/gun/ballistic/automatic/p90, +/obj/item/gun/ballistic/automatic/p90, /obj/effect/floor_decal/industrial/outline/yellow, /turf/unsimulated/floor{ dir = 5; @@ -4712,11 +4712,11 @@ /area/centcom/security) "kd" = ( /obj/structure/table/rack, -/obj/item/gun/projectile/automatic/bullpup, -/obj/item/gun/projectile/automatic/bullpup, -/obj/item/gun/projectile/automatic/bullpup, -/obj/item/gun/projectile/automatic/bullpup, -/obj/item/gun/projectile/automatic/bullpup, +/obj/item/gun/ballistic/automatic/bullpup, +/obj/item/gun/ballistic/automatic/bullpup, +/obj/item/gun/ballistic/automatic/bullpup, +/obj/item/gun/ballistic/automatic/bullpup, +/obj/item/gun/ballistic/automatic/bullpup, /obj/effect/floor_decal/industrial/outline/yellow, /turf/unsimulated/floor{ dir = 5; @@ -4725,11 +4725,11 @@ /area/centcom/security) "ke" = ( /obj/structure/table/rack, -/obj/item/gun/projectile/automatic/wt550/lethal, -/obj/item/gun/projectile/automatic/wt550/lethal, -/obj/item/gun/projectile/automatic/wt550/lethal, -/obj/item/gun/projectile/automatic/wt550/lethal, -/obj/item/gun/projectile/automatic/wt550/lethal, +/obj/item/gun/ballistic/automatic/wt550/lethal, +/obj/item/gun/ballistic/automatic/wt550/lethal, +/obj/item/gun/ballistic/automatic/wt550/lethal, +/obj/item/gun/ballistic/automatic/wt550/lethal, +/obj/item/gun/ballistic/automatic/wt550/lethal, /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/camera/network/crescent, /turf/unsimulated/floor{ @@ -4739,11 +4739,11 @@ /area/centcom/security) "kf" = ( /obj/structure/table/rack, -/obj/item/gun/projectile/shotgun/pump/combat, -/obj/item/gun/projectile/shotgun/pump/combat, -/obj/item/gun/projectile/shotgun/pump/combat, -/obj/item/gun/projectile/shotgun/pump/combat, -/obj/item/gun/projectile/shotgun/pump/combat, +/obj/item/gun/ballistic/shotgun/pump/combat, +/obj/item/gun/ballistic/shotgun/pump/combat, +/obj/item/gun/ballistic/shotgun/pump/combat, +/obj/item/gun/ballistic/shotgun/pump/combat, +/obj/item/gun/ballistic/shotgun/pump/combat, /obj/effect/floor_decal/industrial/outline/yellow, /turf/unsimulated/floor{ dir = 5; @@ -5052,11 +5052,11 @@ /area/centcom/security) "kH" = ( /obj/structure/table/rack, -/obj/item/gun/projectile/shotgun/pump/JSDF, -/obj/item/gun/projectile/shotgun/pump/JSDF, -/obj/item/gun/projectile/shotgun/pump/JSDF, -/obj/item/gun/projectile/shotgun/pump/JSDF, -/obj/item/gun/projectile/shotgun/pump/JSDF, +/obj/item/gun/ballistic/shotgun/pump/JSDF, +/obj/item/gun/ballistic/shotgun/pump/JSDF, +/obj/item/gun/ballistic/shotgun/pump/JSDF, +/obj/item/gun/ballistic/shotgun/pump/JSDF, +/obj/item/gun/ballistic/shotgun/pump/JSDF, /obj/effect/floor_decal/industrial/outline/yellow, /turf/unsimulated/floor{ dir = 5; @@ -5065,11 +5065,11 @@ /area/centcom/security) "kI" = ( /obj/structure/table/rack, -/obj/item/gun/projectile/shotgun/pump, -/obj/item/gun/projectile/shotgun/pump, -/obj/item/gun/projectile/shotgun/pump, -/obj/item/gun/projectile/shotgun/pump, -/obj/item/gun/projectile/shotgun/pump, +/obj/item/gun/ballistic/shotgun/pump, +/obj/item/gun/ballistic/shotgun/pump, +/obj/item/gun/ballistic/shotgun/pump, +/obj/item/gun/ballistic/shotgun/pump, +/obj/item/gun/ballistic/shotgun/pump, /obj/effect/floor_decal/industrial/outline/yellow, /turf/unsimulated/floor{ dir = 5; @@ -5442,11 +5442,11 @@ /area/centcom/security) "lw" = ( /obj/structure/table/rack, -/obj/item/gun/projectile/automatic/battlerifle, -/obj/item/gun/projectile/automatic/battlerifle, -/obj/item/gun/projectile/automatic/battlerifle, -/obj/item/gun/projectile/automatic/battlerifle, -/obj/item/gun/projectile/automatic/battlerifle, +/obj/item/gun/ballistic/automatic/battlerifle, +/obj/item/gun/ballistic/automatic/battlerifle, +/obj/item/gun/ballistic/automatic/battlerifle, +/obj/item/gun/ballistic/automatic/battlerifle, +/obj/item/gun/ballistic/automatic/battlerifle, /obj/effect/floor_decal/industrial/outline/yellow, /turf/unsimulated/floor{ dir = 5; @@ -5758,11 +5758,11 @@ /area/centcom/security) "md" = ( /obj/structure/table/rack, -/obj/item/gun/projectile/automatic/pdw, -/obj/item/gun/projectile/automatic/pdw, -/obj/item/gun/projectile/automatic/pdw, -/obj/item/gun/projectile/automatic/pdw, -/obj/item/gun/projectile/automatic/pdw, +/obj/item/gun/ballistic/automatic/pdw, +/obj/item/gun/ballistic/automatic/pdw, +/obj/item/gun/ballistic/automatic/pdw, +/obj/item/gun/ballistic/automatic/pdw, +/obj/item/gun/ballistic/automatic/pdw, /obj/effect/floor_decal/industrial/outline/yellow, /turf/unsimulated/floor{ dir = 5; @@ -10655,7 +10655,7 @@ pixel_y = 30 }, /obj/structure/table/reinforced, -/obj/item/gun/projectile/shotgun/pump/combat{ +/obj/item/gun/ballistic/shotgun/pump/combat{ name = "Discipline" }, /obj/effect/floor_decal/borderfloorblack{ @@ -14860,8 +14860,8 @@ /area/centcom/specops) "EI" = ( /obj/structure/table/rack, -/obj/item/gun/projectile/rocket, -/obj/item/gun/projectile/rocket, +/obj/item/gun/ballistic/rocket, +/obj/item/gun/ballistic/rocket, /obj/item/ammo_casing/rocket, /obj/item/ammo_casing/rocket, /obj/item/ammo_casing/rocket, @@ -15254,8 +15254,8 @@ /area/centcom/specops) "Og" = ( /obj/structure/table/rack, -/obj/item/gun/projectile/automatic/l6_saw, -/obj/item/gun/projectile/automatic/l6_saw, +/obj/item/gun/ballistic/automatic/l6_saw, +/obj/item/gun/ballistic/automatic/l6_saw, /obj/item/ammo_magazine/m545saw, /obj/item/ammo_magazine/m545saw, /obj/item/ammo_magazine/m545saw, @@ -15382,8 +15382,8 @@ /area/centcom/specops) "RJ" = ( /obj/structure/table/rack, -/obj/item/gun/projectile/automatic/z8, -/obj/item/gun/projectile/automatic/z8, +/obj/item/gun/ballistic/automatic/z8, +/obj/item/gun/ballistic/automatic/z8, /obj/item/ammo_magazine/m762, /obj/item/ammo_magazine/m762, /obj/item/ammo_magazine/m762, @@ -15612,7 +15612,7 @@ /area/centcom/specops) "Zw" = ( /obj/structure/table/rack, -/obj/item/gun/projectile/heavysniper, +/obj/item/gun/ballistic/heavysniper, /obj/item/storage/box/sniperammo, /obj/item/storage/box/sniperammo, /turf/unsimulated/floor{ diff --git a/_maps/templates/admin/ert.dmm b/_maps/templates/admin/ert.dmm index 1c954a8854c..b88fe109e91 100644 --- a/_maps/templates/admin/ert.dmm +++ b/_maps/templates/admin/ert.dmm @@ -1088,12 +1088,12 @@ /area/ship/ert/atmos) "kf" = ( /obj/structure/table/rack/steel, -/obj/item/gun/projectile/automatic/pdw, -/obj/item/gun/projectile/automatic/pdw, -/obj/item/gun/projectile/automatic/pdw, -/obj/item/gun/projectile/automatic/pdw, -/obj/item/gun/projectile/automatic/pdw, -/obj/item/gun/projectile/automatic/pdw, +/obj/item/gun/ballistic/automatic/pdw, +/obj/item/gun/ballistic/automatic/pdw, +/obj/item/gun/ballistic/automatic/pdw, +/obj/item/gun/ballistic/automatic/pdw, +/obj/item/gun/ballistic/automatic/pdw, +/obj/item/gun/ballistic/automatic/pdw, /obj/item/ammo_magazine/m9mml, /obj/item/ammo_magazine/m9mml, /obj/item/ammo_magazine/m9mml, @@ -2956,12 +2956,12 @@ pixel_y = 23 }, /obj/effect/floor_decal/industrial/outline/grey, -/obj/item/gun/projectile/p92x, -/obj/item/gun/projectile/p92x, -/obj/item/gun/projectile/p92x, -/obj/item/gun/projectile/p92x, -/obj/item/gun/projectile/p92x, -/obj/item/gun/projectile/p92x, +/obj/item/gun/ballistic/p92x, +/obj/item/gun/ballistic/p92x, +/obj/item/gun/ballistic/p92x, +/obj/item/gun/ballistic/p92x, +/obj/item/gun/ballistic/p92x, +/obj/item/gun/ballistic/p92x, /obj/item/ammo_magazine/m9mm/large/licensed, /obj/item/ammo_magazine/m9mm/large/licensed, /obj/item/ammo_magazine/m9mm/large/licensed, @@ -2979,8 +2979,8 @@ "xi" = ( /obj/structure/table/rack/steel, /obj/effect/floor_decal/industrial/outline/grey, -/obj/item/gun/projectile/automatic/sts35, -/obj/item/gun/projectile/automatic/sts35, +/obj/item/gun/ballistic/automatic/sts35, +/obj/item/gun/ballistic/automatic/sts35, /obj/item/ammo_magazine/m545, /obj/item/ammo_magazine/m545, /obj/item/ammo_magazine/m545, @@ -3579,8 +3579,8 @@ /area/ship/ert/barracks) "Bp" = ( /obj/structure/table/rack/steel, -/obj/item/gun/projectile/automatic/z8, -/obj/item/gun/projectile/automatic/z8, +/obj/item/gun/ballistic/automatic/z8, +/obj/item/gun/ballistic/automatic/z8, /obj/item/ammo_magazine/m762, /obj/item/ammo_magazine/m762, /obj/item/ammo_magazine/m762, @@ -4240,7 +4240,7 @@ /area/ship/ert/armoury_st) "Gl" = ( /obj/structure/table/rack/steel, -/obj/item/gun/projectile/heavysniper, +/obj/item/gun/ballistic/heavysniper, /obj/item/storage/box/sniperammo, /obj/item/storage/box/sniperammo, /obj/effect/floor_decal/industrial/outline/grey, @@ -4782,8 +4782,8 @@ pixel_y = -26 }, /obj/effect/floor_decal/industrial/outline/grey, -/obj/item/gun/projectile/automatic/z8, -/obj/item/gun/projectile/automatic/z8, +/obj/item/gun/ballistic/automatic/z8, +/obj/item/gun/ballistic/automatic/z8, /obj/item/ammo_magazine/m762, /obj/item/ammo_magazine/m762, /obj/item/ammo_magazine/m762, @@ -5026,8 +5026,8 @@ /area/ship/ert/armoury_st) "LA" = ( /obj/structure/table/rack/steel, -/obj/item/gun/projectile/shotgun/pump/combat, -/obj/item/gun/projectile/shotgun/pump/combat, +/obj/item/gun/ballistic/shotgun/pump/combat, +/obj/item/gun/ballistic/shotgun/pump/combat, /obj/item/storage/box/shotgunshells/large, /obj/item/storage/box/shotgunshells/large, /obj/item/storage/box/shotgunammo/large, @@ -5127,8 +5127,8 @@ /area/ship/ert/armoury_st) "Me" = ( /obj/structure/table/rack/steel, -/obj/item/gun/projectile/automatic/as24, -/obj/item/gun/projectile/automatic/as24, +/obj/item/gun/ballistic/automatic/as24, +/obj/item/gun/ballistic/automatic/as24, /obj/item/storage/box/shotgunshells/large, /obj/item/storage/box/shotgunshells/large, /obj/item/storage/box/shotgunammo/large, @@ -6046,16 +6046,16 @@ /area/ship/ert/hallways) "Sx" = ( /obj/structure/table/rack/steel, -/obj/item/gun/projectile/automatic/p90, -/obj/item/gun/projectile/automatic/p90, +/obj/item/gun/ballistic/automatic/p90, +/obj/item/gun/ballistic/automatic/p90, /obj/item/ammo_magazine/m57x28mmp90, /obj/item/ammo_magazine/m57x28mmp90, /obj/item/ammo_magazine/m57x28mmp90, /obj/item/ammo_magazine/m57x28mmp90, /obj/item/ammo_magazine/m57x28mmp90, /obj/item/ammo_magazine/m57x28mmp90, -/obj/item/gun/projectile/automatic/p90, -/obj/item/gun/projectile/automatic/p90, +/obj/item/gun/ballistic/automatic/p90, +/obj/item/gun/ballistic/automatic/p90, /obj/item/ammo_magazine/m57x28mmp90, /obj/item/ammo_magazine/m57x28mmp90, /obj/item/ammo_magazine/m57x28mmp90, @@ -6067,8 +6067,8 @@ /area/ship/ert/armoury_dl) "Sy" = ( /obj/structure/table/rack/steel, -/obj/item/gun/projectile/automatic/l6_saw, -/obj/item/gun/projectile/automatic/l6_saw, +/obj/item/gun/ballistic/automatic/l6_saw, +/obj/item/gun/ballistic/automatic/l6_saw, /obj/item/ammo_magazine/m545saw, /obj/item/ammo_magazine/m545saw, /obj/item/ammo_magazine/m545saw, @@ -6104,7 +6104,7 @@ /area/ship/ert/med_surg) "SD" = ( /obj/structure/table/rack, -/obj/item/gun/projectile/deagle, +/obj/item/gun/ballistic/deagle, /obj/item/ammo_magazine/m44, /obj/item/ammo_magazine/m44, /turf/simulated/floor/wood, diff --git a/_maps/templates/admin/ert_base.dmm b/_maps/templates/admin/ert_base.dmm index 35323037ccb..25e49623fc3 100644 --- a/_maps/templates/admin/ert_base.dmm +++ b/_maps/templates/admin/ert_base.dmm @@ -493,8 +493,8 @@ /area/shuttle/specops/centcom) "aZ" = ( /obj/structure/table/rack/steel, -/obj/item/gun/projectile/shotgun/pump/combat, -/obj/item/gun/projectile/shotgun/pump/combat, +/obj/item/gun/ballistic/shotgun/pump/combat, +/obj/item/gun/ballistic/shotgun/pump/combat, /obj/item/storage/box/shotgunshells, /obj/item/storage/box/shotgunshells, /obj/item/storage/box/shotgunshells, @@ -510,13 +510,13 @@ /area/shuttle/specops/centcom) "ba" = ( /obj/structure/table/rack/steel, -/obj/item/gun/projectile/automatic/advanced_smg, +/obj/item/gun/ballistic/automatic/advanced_smg, /obj/item/ammo_magazine/m9mmAdvanced, /obj/item/ammo_magazine/m9mmAdvanced, /obj/item/ammo_magazine/m9mmAdvanced, /obj/item/ammo_magazine/m9mmAdvanced, -/obj/item/gun/projectile/revolver/detective45, -/obj/item/gun/projectile/revolver/detective45, +/obj/item/gun/ballistic/revolver/detective45, +/obj/item/gun/ballistic/revolver/detective45, /obj/item/ammo_magazine/s45, /obj/item/ammo_magazine/s45, /obj/item/ammo_magazine/s45, @@ -620,8 +620,8 @@ /area/shuttle/specops/centcom) "bn" = ( /obj/structure/table/rack/steel, -/obj/item/gun/projectile/automatic/sts35, -/obj/item/gun/projectile/automatic/sts35, +/obj/item/gun/ballistic/automatic/sts35, +/obj/item/gun/ballistic/automatic/sts35, /obj/item/ammo_magazine/m545, /obj/item/ammo_magazine/m545, /obj/item/ammo_magazine/m545, @@ -713,10 +713,10 @@ /obj/item/ammo_magazine/m9mm/large/licensed, /obj/item/ammo_magazine/m9mm/large/licensed, /obj/item/ammo_magazine/m9mm/large/licensed, -/obj/item/gun/projectile/p92x, -/obj/item/gun/projectile/p92x, -/obj/item/gun/projectile/p92x, -/obj/item/gun/projectile/p92x, +/obj/item/gun/ballistic/p92x, +/obj/item/gun/ballistic/p92x, +/obj/item/gun/ballistic/p92x, +/obj/item/gun/ballistic/p92x, /turf/simulated/shuttle/floor/black, /area/shuttle/specops/centcom) "bx" = ( @@ -729,8 +729,8 @@ "by" = ( /obj/structure/window/reinforced, /obj/structure/table/rack/steel, -/obj/item/gun/projectile/automatic/sts35, -/obj/item/gun/projectile/automatic/sts35, +/obj/item/gun/ballistic/automatic/sts35, +/obj/item/gun/ballistic/automatic/sts35, /obj/item/ammo_magazine/m545, /obj/item/ammo_magazine/m545, /obj/item/ammo_magazine/m545, @@ -1925,7 +1925,7 @@ /obj/machinery/computer/security/telescreen/entertainment{ pixel_y = -35 }, -/obj/item/gun/projectile/deagle, +/obj/item/gun/ballistic/deagle, /obj/item/ammo_magazine/m44, /obj/item/ammo_magazine/m44, /turf/simulated/shuttle/floor/black, diff --git a/_maps/templates/admin/kk_mercship.dmm b/_maps/templates/admin/kk_mercship.dmm index f38f73b5e51..4964d01baf4 100644 --- a/_maps/templates/admin/kk_mercship.dmm +++ b/_maps/templates/admin/kk_mercship.dmm @@ -1138,7 +1138,7 @@ /area/ship/manta/hangar) "fK" = ( /obj/structure/table/rack, -/obj/item/gun/projectile/revolver/consul, +/obj/item/gun/ballistic/revolver/consul, /obj/item/ammo_magazine/s44, /obj/item/ammo_magazine/s44, /obj/item/ammo_magazine/s44, @@ -1560,8 +1560,8 @@ /area/ship/manta/hallways_aft) "hU" = ( /obj/structure/table/rack, -/obj/item/gun/projectile/automatic/c20r, -/obj/item/gun/projectile/automatic/c20r, +/obj/item/gun/ballistic/automatic/c20r, +/obj/item/gun/ballistic/automatic/c20r, /obj/item/ammo_magazine/m10mm, /obj/item/ammo_magazine/m10mm, /obj/item/ammo_magazine/m10mm, @@ -1572,7 +1572,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/item/gun/projectile/automatic/c20r, +/obj/item/gun/ballistic/automatic/c20r, /obj/item/ammo_magazine/m10mm, /obj/item/ammo_magazine/m10mm, /turf/simulated/floor/tiled/techfloor, @@ -1616,8 +1616,8 @@ /area/ship/manta/armoury_st) "ih" = ( /obj/structure/table/rack, -/obj/item/gun/projectile/silenced, -/obj/item/gun/projectile/silenced, +/obj/item/gun/ballistic/silenced, +/obj/item/gun/ballistic/silenced, /obj/item/ammo_magazine/m45, /obj/item/ammo_magazine/m45, /obj/item/ammo_magazine/m45/ap, @@ -1626,8 +1626,8 @@ /obj/effect/floor_decal/techfloor{ dir = 5 }, -/obj/item/gun/projectile/sec/wood, -/obj/item/gun/projectile/sec/wood, +/obj/item/gun/ballistic/sec/wood, +/obj/item/gun/ballistic/sec/wood, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "ik" = ( @@ -2274,8 +2274,8 @@ /area/ship/manta/hallways_aft) "lj" = ( /obj/structure/table/rack, -/obj/item/gun/projectile/automatic/c20r, -/obj/item/gun/projectile/automatic/c20r, +/obj/item/gun/ballistic/automatic/c20r, +/obj/item/gun/ballistic/automatic/c20r, /obj/item/ammo_magazine/m10mm, /obj/item/ammo_magazine/m10mm, /obj/item/ammo_magazine/m10mm, @@ -2283,7 +2283,7 @@ /obj/effect/floor_decal/techfloor{ dir = 8 }, -/obj/item/gun/projectile/automatic/c20r, +/obj/item/gun/ballistic/automatic/c20r, /obj/item/ammo_magazine/m10mm, /obj/item/ammo_magazine/m10mm, /turf/simulated/floor/tiled/techfloor, @@ -2302,8 +2302,8 @@ dir = 4 }, /obj/structure/table/rack, -/obj/item/gun/projectile/automatic/sts35, -/obj/item/gun/projectile/automatic/sts35, +/obj/item/gun/ballistic/automatic/sts35, +/obj/item/gun/ballistic/automatic/sts35, /obj/item/ammo_magazine/m545, /obj/item/ammo_magazine/m545, /obj/item/ammo_magazine/m545, @@ -3037,8 +3037,8 @@ /area/space) "oO" = ( /obj/structure/table/rack, -/obj/item/gun/projectile/silenced, -/obj/item/gun/projectile/silenced, +/obj/item/gun/ballistic/silenced, +/obj/item/gun/ballistic/silenced, /obj/item/ammo_magazine/m45, /obj/item/ammo_magazine/m45, /obj/item/ammo_magazine/m45/ap, @@ -3051,8 +3051,8 @@ dir = 8; pixel_x = 26 }, -/obj/item/gun/projectile/sec/wood, -/obj/item/gun/projectile/sec/wood, +/obj/item/gun/ballistic/sec/wood, +/obj/item/gun/ballistic/sec/wood, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "oP" = ( @@ -5988,7 +5988,7 @@ "Dq" = ( /obj/structure/table/rack, /obj/item/storage/box/sniperammo, -/obj/item/gun/projectile/heavysniper, +/obj/item/gun/ballistic/heavysniper, /obj/effect/floor_decal/techfloor{ dir = 5 }, @@ -6384,7 +6384,7 @@ /area/ship/manta/barracks) "Fx" = ( /obj/structure/table/rack, -/obj/item/gun/projectile/rocket, +/obj/item/gun/ballistic/rocket, /obj/item/ammo_casing/rocket, /obj/item/ammo_casing/rocket, /obj/item/ammo_casing/rocket, @@ -6744,7 +6744,7 @@ /obj/item/ammo_magazine/s44, /obj/item/ammo_magazine/s44, /obj/item/ammo_magazine/s44, -/obj/item/gun/projectile/revolver/consul, +/obj/item/gun/ballistic/revolver/consul, /obj/effect/floor_decal/techfloor{ dir = 8 }, @@ -7726,8 +7726,8 @@ /obj/structure/table/rack, /obj/item/storage/box/shotgunshells/large, /obj/item/storage/box/shotgunammo/large, -/obj/item/gun/projectile/shotgun/pump/combat, -/obj/item/gun/projectile/shotgun/pump/combat, +/obj/item/gun/ballistic/shotgun/pump/combat, +/obj/item/gun/ballistic/shotgun/pump/combat, /obj/effect/floor_decal/techfloor{ dir = 8 }, @@ -8490,8 +8490,8 @@ /obj/item/ammo_magazine/m9mm, /obj/item/ammo_magazine/m9mm, /obj/item/ammo_magazine/m9mm, -/obj/item/gun/projectile/luger, -/obj/item/gun/projectile/luger/brown, +/obj/item/gun/ballistic/luger, +/obj/item/gun/ballistic/luger/brown, /obj/effect/floor_decal/techfloor{ dir = 8 }, @@ -9302,10 +9302,10 @@ /obj/effect/floor_decal/techfloor{ dir = 4 }, -/obj/item/gun/projectile/automatic/bullpup, -/obj/item/gun/projectile/automatic/bullpup, -/obj/item/gun/projectile/automatic/bullpup, -/obj/item/gun/projectile/automatic/bullpup, +/obj/item/gun/ballistic/automatic/bullpup, +/obj/item/gun/ballistic/automatic/bullpup, +/obj/item/gun/ballistic/automatic/bullpup, +/obj/item/gun/ballistic/automatic/bullpup, /obj/item/ammo_magazine/m762m, /obj/item/ammo_magazine/m762m, /obj/item/ammo_magazine/m762m, diff --git a/_maps/templates/admin/mercbase.dmm b/_maps/templates/admin/mercbase.dmm index 957313da600..ec4d98f9142 100644 --- a/_maps/templates/admin/mercbase.dmm +++ b/_maps/templates/admin/mercbase.dmm @@ -91,8 +91,8 @@ /obj/item/ammo_magazine/m545/ap, /obj/item/ammo_magazine/m545/ap, /obj/item/ammo_magazine/m545/ap, -/obj/item/gun/projectile/automatic/sts35, -/obj/item/gun/projectile/automatic/sts35, +/obj/item/gun/ballistic/automatic/sts35, +/obj/item/gun/ballistic/automatic/sts35, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -124,7 +124,7 @@ dir = 5 }, /obj/structure/table/rack, -/obj/item/gun/projectile/rocket, +/obj/item/gun/ballistic/rocket, /obj/item/ammo_casing/rocket, /obj/item/ammo_casing/rocket, /obj/item/ammo_casing/rocket, @@ -155,7 +155,7 @@ dir = 6 }, /obj/item/storage/box/sniperammo, -/obj/item/gun/projectile/heavysniper, +/obj/item/gun/ballistic/heavysniper, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -253,7 +253,7 @@ /obj/item/ammo_magazine/s44, /obj/item/ammo_magazine/s44, /obj/item/ammo_magazine/s44, -/obj/item/gun/projectile/revolver/consul, +/obj/item/gun/ballistic/revolver/consul, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -265,8 +265,8 @@ }, /obj/item/storage/box/shotgunshells/large, /obj/item/storage/box/shotgunammo/large, -/obj/item/gun/projectile/shotgun/pump/combat, -/obj/item/gun/projectile/shotgun/pump/combat, +/obj/item/gun/ballistic/shotgun/pump/combat, +/obj/item/gun/ballistic/shotgun/pump/combat, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -284,8 +284,8 @@ /obj/item/ammo_magazine/m9mm, /obj/item/ammo_magazine/m9mm, /obj/item/ammo_magazine/m9mm, -/obj/item/gun/projectile/luger, -/obj/item/gun/projectile/luger/brown, +/obj/item/gun/ballistic/luger, +/obj/item/gun/ballistic/luger/brown, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -688,12 +688,12 @@ /obj/item/ammo_magazine/m10mm, /obj/item/ammo_magazine/m10mm, /obj/item/ammo_magazine/m10mm, -/obj/item/gun/projectile/automatic/c20r, -/obj/item/gun/projectile/automatic/c20r, -/obj/item/gun/projectile/automatic/c20r, -/obj/item/gun/projectile/automatic/c20r, -/obj/item/gun/projectile/automatic/c20r, -/obj/item/gun/projectile/automatic/c20r, +/obj/item/gun/ballistic/automatic/c20r, +/obj/item/gun/ballistic/automatic/c20r, +/obj/item/gun/ballistic/automatic/c20r, +/obj/item/gun/ballistic/automatic/c20r, +/obj/item/gun/ballistic/automatic/c20r, +/obj/item/gun/ballistic/automatic/c20r, /obj/effect/floor_decal/corner/red{ dir = 9 }, @@ -706,13 +706,13 @@ /area/antag/antag_base) "bf" = ( /obj/structure/table/rack, -/obj/item/gun/projectile/silenced, -/obj/item/gun/projectile/silenced, -/obj/item/gun/projectile/silenced, -/obj/item/gun/projectile/silenced, -/obj/item/gun/projectile/silenced, -/obj/item/gun/projectile/silenced, -/obj/item/gun/projectile/silenced, +/obj/item/gun/ballistic/silenced, +/obj/item/gun/ballistic/silenced, +/obj/item/gun/ballistic/silenced, +/obj/item/gun/ballistic/silenced, +/obj/item/gun/ballistic/silenced, +/obj/item/gun/ballistic/silenced, +/obj/item/gun/ballistic/silenced, /obj/effect/floor_decal/corner/red{ dir = 9 }, @@ -3353,7 +3353,7 @@ /obj/item/ammo_magazine/m380, /obj/item/ammo_magazine/m380, /obj/item/ammo_magazine/m380, -/obj/item/gun/projectile/giskard, +/obj/item/gun/ballistic/giskard, /obj/item/clothing/accessory/holster, /turf/simulated/shuttle/floor{ icon_state = "floor_red" diff --git a/_maps/templates/shelters/shelter_4.dmm b/_maps/templates/shelters/shelter_4.dmm index c0883d0d2aa..e360db8303f 100644 --- a/_maps/templates/shelters/shelter_4.dmm +++ b/_maps/templates/shelters/shelter_4.dmm @@ -113,7 +113,7 @@ /obj/item/ammo_magazine/m9mm/compact, /obj/item/ammo_magazine/m9mm/compact/flash, /obj/item/ammo_magazine/m9mm/compact/flash, -/obj/item/gun/projectile/pistol, +/obj/item/gun/ballistic/pistol, /obj/item/clothing/accessory/storage/black_vest, /obj/item/material/knife/tacknife/survival, /obj/item/storage/box/survival/comp, @@ -239,7 +239,7 @@ /obj/item/ammo_magazine/m9mm/compact, /obj/item/ammo_magazine/m9mm/compact/flash, /obj/item/ammo_magazine/m9mm/compact/flash, -/obj/item/gun/projectile/pistol, +/obj/item/gun/ballistic/pistol, /obj/item/clothing/accessory/storage/black_vest, /obj/item/material/knife/tacknife/survival, /obj/item/storage/box/survival/comp{ @@ -371,10 +371,10 @@ /area/survivalpod) "L" = ( /obj/structure/closet/secure_closet/guncabinet, -/obj/item/gun/projectile/automatic/sts35, -/obj/item/gun/projectile/automatic/sts35, -/obj/item/gun/projectile/automatic/sts35, -/obj/item/gun/projectile/automatic/sts35, +/obj/item/gun/ballistic/automatic/sts35, +/obj/item/gun/ballistic/automatic/sts35, +/obj/item/gun/ballistic/automatic/sts35, +/obj/item/gun/ballistic/automatic/sts35, /obj/item/gun/energy/laser, /obj/item/gun/energy/laser, /obj/item/gun/energy/laser, diff --git a/_maps/templates/shuttles/overmaps/generic/abductor.dmm b/_maps/templates/shuttles/overmaps/generic/abductor.dmm index 6d6cecb74d1..b0d3f86aa1b 100644 --- a/_maps/templates/shuttles/overmaps/generic/abductor.dmm +++ b/_maps/templates/shuttles/overmaps/generic/abductor.dmm @@ -892,8 +892,8 @@ /obj/item/ammo_magazine/cell_mag/advanced, /obj/item/ammo_magazine/cell_mag/advanced, /obj/item/ammo_magazine/cell_mag/advanced, -/obj/item/gun/projectile/cell_loaded, -/obj/item/gun/projectile/cell_loaded, +/obj/item/gun/ballistic/cell_loaded, +/obj/item/gun/ballistic/cell_loaded, /turf/simulated/shuttle/floor/alienplating, /area/abductor/interior) "Zk" = ( diff --git a/_maps/templates/shuttles/overmaps/generic/bearcat.dmm b/_maps/templates/shuttles/overmaps/generic/bearcat.dmm index 957b49e13e2..be872f8c92a 100644 --- a/_maps/templates/shuttles/overmaps/generic/bearcat.dmm +++ b/_maps/templates/shuttles/overmaps/generic/bearcat.dmm @@ -327,7 +327,7 @@ icon_state = "1-4" }, /obj/item/storage/box/beanbags/large, -/obj/item/gun/projectile/shotgun/pump/combat{ +/obj/item/gun/ballistic/shotgun/pump/combat{ desc = "When words don't strike hard enough."; name = "Solid Argument" }, diff --git a/_maps/templates/shuttles/overmaps/generic/cruiser.dmm b/_maps/templates/shuttles/overmaps/generic/cruiser.dmm index 7db92835041..cb57f237427 100644 --- a/_maps/templates/shuttles/overmaps/generic/cruiser.dmm +++ b/_maps/templates/shuttles/overmaps/generic/cruiser.dmm @@ -4868,7 +4868,7 @@ /turf/simulated/floor/wood, /area/mothership/dorm6) "kL" = ( -/obj/item/gun/projectile/shotgun/pump/combat{ +/obj/item/gun/ballistic/shotgun/pump/combat{ ammo_type = /obj/item/ammo_casing/a12g/beanbag; desc = "Built for close quarters combat, the Hesphaistos Industries KS-40 is widely regarded as a weapon of choice for repelling boarders. This one has 'Property of the Warden' inscribed on the stock."; name = "warden's shotgun" @@ -5322,10 +5322,10 @@ /obj/item/ammo_magazine/m9mm/large/licensed, /obj/item/ammo_magazine/m9mm/large/licensed, /obj/item/ammo_magazine/m9mm/large/licensed, -/obj/item/gun/projectile/p92x, -/obj/item/gun/projectile/p92x, -/obj/item/gun/projectile/p92x, -/obj/item/gun/projectile/p92x, +/obj/item/gun/ballistic/p92x, +/obj/item/gun/ballistic/p92x, +/obj/item/gun/ballistic/p92x, +/obj/item/gun/ballistic/p92x, /obj/structure/closet/secure_closet/guncabinet{ req_one_access = list(103) }, @@ -5350,9 +5350,9 @@ /obj/item/ammo_magazine/m9mm/compact/practice, /obj/item/ammo_magazine/m9mm/compact/practice, /obj/item/ammo_magazine/m9mm/compact/practice, -/obj/item/gun/projectile/pistol, -/obj/item/gun/projectile/pistol, -/obj/item/gun/projectile/pistol, +/obj/item/gun/ballistic/pistol, +/obj/item/gun/ballistic/pistol, +/obj/item/gun/ballistic/pistol, /obj/structure/closet/secure_closet/guncabinet{ req_one_access = list(103) }, @@ -5591,8 +5591,8 @@ /obj/item/storage/box/shotgunshells/large, /obj/item/storage/box/shotgunshells/large, /obj/item/storage/box/shotgunshells/large, -/obj/item/gun/projectile/shotgun/pump/combat, -/obj/item/gun/projectile/shotgun/pump/combat, +/obj/item/gun/ballistic/shotgun/pump/combat, +/obj/item/gun/ballistic/shotgun/pump/combat, /obj/structure/closet/secure_closet/guncabinet{ req_one_access = list(103) }, @@ -5733,10 +5733,10 @@ /obj/item/ammo_magazine/m545, /obj/item/ammo_magazine/m545, /obj/item/ammo_magazine/m545, -/obj/item/gun/projectile/automatic/sts35, -/obj/item/gun/projectile/automatic/sts35, -/obj/item/gun/projectile/automatic/sts35, -/obj/item/gun/projectile/automatic/sts35, +/obj/item/gun/ballistic/automatic/sts35, +/obj/item/gun/ballistic/automatic/sts35, +/obj/item/gun/ballistic/automatic/sts35, +/obj/item/gun/ballistic/automatic/sts35, /obj/structure/closet/secure_closet/guncabinet{ req_one_access = list(103) }, @@ -5842,8 +5842,8 @@ /obj/item/ammo_magazine/m57x28mmp90, /obj/item/ammo_magazine/m57x28mmp90, /obj/item/ammo_magazine/m57x28mmp90, -/obj/item/gun/projectile/automatic/p90, -/obj/item/gun/projectile/automatic/p90, +/obj/item/gun/ballistic/automatic/p90, +/obj/item/gun/ballistic/automatic/p90, /obj/item/ammo_magazine/m9mmt/flash, /obj/item/ammo_magazine/m9mmt/flash, /obj/item/ammo_magazine/m9mmt/flash, @@ -5877,8 +5877,8 @@ /obj/structure/closet/crate/secure/weapon{ req_one_access = list(108) }, -/obj/item/gun/projectile/automatic/l6_saw, -/obj/item/gun/projectile/automatic/l6_saw, +/obj/item/gun/ballistic/automatic/l6_saw, +/obj/item/gun/ballistic/automatic/l6_saw, /obj/item/ammo_magazine/m545saw, /obj/item/ammo_magazine/m545saw, /obj/item/ammo_magazine/m545saw, @@ -6272,9 +6272,9 @@ /obj/structure/closet/crate/secure/weapon{ req_one_access = list(108) }, -/obj/item/gun/projectile/automatic/z8, -/obj/item/gun/projectile/automatic/z8, -/obj/item/gun/projectile/heavysniper, +/obj/item/gun/ballistic/automatic/z8, +/obj/item/gun/ballistic/automatic/z8, +/obj/item/gun/ballistic/heavysniper, /obj/item/storage/box/sniperammo, /obj/item/storage/box/sniperammo, /obj/item/ammo_magazine/m762, diff --git a/_maps/templates/shuttles/overmaps/generic/curashuttle.dmm b/_maps/templates/shuttles/overmaps/generic/curashuttle.dmm index 7dbfe58ba3f..875529d88f3 100644 --- a/_maps/templates/shuttles/overmaps/generic/curashuttle.dmm +++ b/_maps/templates/shuttles/overmaps/generic/curashuttle.dmm @@ -300,7 +300,7 @@ /obj/item/storage/secure/safe{ pixel_x = 31 }, -/obj/item/gun/projectile/automatic/mini_uzi, +/obj/item/gun/ballistic/automatic/mini_uzi, /obj/item/card/id/syndicate{ access = list(616); assignment = "Curabitur Contractor"; diff --git a/_maps/templates/shuttles/overmaps/generic/mercenarybase.dmm b/_maps/templates/shuttles/overmaps/generic/mercenarybase.dmm index c4247d59c96..359922f0b24 100644 --- a/_maps/templates/shuttles/overmaps/generic/mercenarybase.dmm +++ b/_maps/templates/shuttles/overmaps/generic/mercenarybase.dmm @@ -3511,12 +3511,12 @@ /turf/simulated/floor/tiled/dark, /area/mercbase/medicalstorage) "oq" = ( -/obj/item/gun/projectile/automatic/bullpup, -/obj/item/gun/projectile/automatic/bullpup, -/obj/item/gun/projectile/automatic/bullpup, -/obj/item/gun/projectile/automatic/p90, -/obj/item/gun/projectile/automatic/p90, -/obj/item/gun/projectile/automatic/p90, +/obj/item/gun/ballistic/automatic/bullpup, +/obj/item/gun/ballistic/automatic/bullpup, +/obj/item/gun/ballistic/automatic/bullpup, +/obj/item/gun/ballistic/automatic/p90, +/obj/item/gun/ballistic/automatic/p90, +/obj/item/gun/ballistic/automatic/p90, /obj/structure/closet/secure_closet/guncabinet{ req_one_access = list(150) }, diff --git a/_maps/templates/shuttles/overmaps/generic/mercship.dmm b/_maps/templates/shuttles/overmaps/generic/mercship.dmm index 8888fbd6121..f1de084b6e4 100644 --- a/_maps/templates/shuttles/overmaps/generic/mercship.dmm +++ b/_maps/templates/shuttles/overmaps/generic/mercship.dmm @@ -414,7 +414,7 @@ /obj/item/flashlight/maglight, /obj/item/storage/belt/security/tactical, /obj/item/storage/backpack/dufflebag/syndie, -/obj/item/gun/projectile/silenced, +/obj/item/gun/ballistic/silenced, /turf/simulated/floor/tiled/dark, /area/ship/mercenary/barracks) "aT" = ( @@ -826,7 +826,7 @@ /obj/item/flashlight/maglight, /obj/item/storage/belt/security/tactical, /obj/item/storage/backpack/dufflebag/syndie, -/obj/item/gun/projectile/silenced, +/obj/item/gun/ballistic/silenced, /turf/simulated/floor/tiled/dark, /area/ship/mercenary/barracks) "bJ" = ( @@ -925,7 +925,7 @@ /obj/item/flashlight/maglight, /obj/item/storage/belt/security/tactical, /obj/item/storage/backpack/dufflebag/syndie, -/obj/item/gun/projectile/silenced, +/obj/item/gun/ballistic/silenced, /turf/simulated/floor/tiled/dark, /area/ship/mercenary/barracks) "bR" = ( diff --git a/_maps/templates/shuttles/overmaps/generic/shelter_6.dmm b/_maps/templates/shuttles/overmaps/generic/shelter_6.dmm index b9133cb9947..71b8ddcccc3 100644 --- a/_maps/templates/shuttles/overmaps/generic/shelter_6.dmm +++ b/_maps/templates/shuttles/overmaps/generic/shelter_6.dmm @@ -226,8 +226,8 @@ /obj/item/gun/energy/laser, /obj/item/gun/energy/laser, /obj/item/gun/energy/laser, -/obj/item/gun/projectile/automatic/p90, -/obj/item/gun/projectile/automatic/p90, +/obj/item/gun/ballistic/automatic/p90, +/obj/item/gun/ballistic/automatic/p90, /obj/item/ammo_magazine/m57x28mmp90, /obj/item/ammo_magazine/m57x28mmp90, /obj/item/ammo_magazine/m57x28mmp90, @@ -244,10 +244,10 @@ /obj/item/ammo_magazine/m9mmt/rubber, /obj/item/ammo_magazine/m9mmt/rubber, /obj/item/ammo_magazine/m9mmt/rubber, -/obj/item/gun/projectile/automatic/sts35, -/obj/item/gun/projectile/automatic/sts35, -/obj/item/gun/projectile/automatic/sts35, -/obj/item/gun/projectile/automatic/sts35, +/obj/item/gun/ballistic/automatic/sts35, +/obj/item/gun/ballistic/automatic/sts35, +/obj/item/gun/ballistic/automatic/sts35, +/obj/item/gun/ballistic/automatic/sts35, /obj/item/ammo_magazine/m545/ap, /obj/item/ammo_magazine/m545/ap, /obj/item/ammo_magazine/m545/ap, @@ -268,8 +268,8 @@ /obj/item/ammo_magazine/m545, /obj/item/ammo_magazine/m545, /obj/item/ammo_magazine/m545, -/obj/item/gun/projectile/shotgun/pump/combat, -/obj/item/gun/projectile/shotgun/pump/combat, +/obj/item/gun/ballistic/shotgun/pump/combat, +/obj/item/gun/ballistic/shotgun/pump/combat, /obj/item/storage/box/shotgunshells/large, /obj/item/storage/box/shotgunshells/large, /obj/item/storage/box/shotgunshells/large, @@ -757,9 +757,9 @@ /obj/item/gun/energy/frontier, /obj/item/gun/energy/frontier, /obj/item/gun/energy/frontier, -/obj/item/gun/projectile/pistol, -/obj/item/gun/projectile/pistol, -/obj/item/gun/projectile/pistol, +/obj/item/gun/ballistic/pistol, +/obj/item/gun/ballistic/pistol, +/obj/item/gun/ballistic/pistol, /obj/item/ammo_magazine/m9mm/compact, /obj/item/ammo_magazine/m9mm/compact, /obj/item/ammo_magazine/m9mm/compact, @@ -1355,8 +1355,8 @@ /obj/item/gun/energy/pulse_rifle, /obj/item/gun/energy/pulse_rifle, /obj/item/gun/energy/pulse_rifle, -/obj/item/gun/projectile/automatic/l6_saw, -/obj/item/gun/projectile/automatic/l6_saw, +/obj/item/gun/ballistic/automatic/l6_saw, +/obj/item/gun/ballistic/automatic/l6_saw, /obj/item/ammo_magazine/m545saw, /obj/item/ammo_magazine/m545saw, /obj/item/ammo_magazine/m545saw, @@ -1367,9 +1367,9 @@ /obj/item/ammo_magazine/m545saw/ap, /obj/item/ammo_magazine/m545saw/ap, /obj/item/ammo_magazine/m545saw/ap, -/obj/item/gun/projectile/automatic/z8, -/obj/item/gun/projectile/automatic/z8, -/obj/item/gun/projectile/heavysniper, +/obj/item/gun/ballistic/automatic/z8, +/obj/item/gun/ballistic/automatic/z8, +/obj/item/gun/ballistic/heavysniper, /obj/item/storage/box/sniperammo, /obj/item/storage/box/sniperammo, /obj/item/ammo_magazine/m762, diff --git a/citadel.dme b/citadel.dme index 39acdddebcc..4dc0cae5ac4 100644 --- a/citadel.dme +++ b/citadel.dme @@ -48,7 +48,6 @@ #include "code\__DEFINES\dna.dm" #include "code\__DEFINES\fonts.dm" #include "code\__DEFINES\gamemode.dm" -#include "code\__DEFINES\guns.dm" #include "code\__DEFINES\holidays.dm" #include "code\__DEFINES\holomap.dm" #include "code\__DEFINES\icon_smoothing.dm" @@ -216,6 +215,8 @@ #include "code\__DEFINES\procs\do_after.dm" #include "code\__DEFINES\procs\drain_energy.dm" #include "code\__DEFINES\procs\update_icon.dm" +#include "code\__DEFINES\projectiles\ammo_casing.dm" +#include "code\__DEFINES\projectiles\guns.dm" #include "code\__DEFINES\radiation\flags.dm" #include "code\__DEFINES\radiation\ignore.dm" #include "code\__DEFINES\radiation\insulation.dm" @@ -3672,20 +3673,16 @@ #include "code\modules\preferences\preference_setup\vore\08_traits.dm" #include "code\modules\preferences\preference_setup\vore\09_nif.dm" #include "code\modules\preferences\preference_setup\vore\10_misc.dm" -#include "code\modules\projectiles\ammunition.dm" #include "code\modules\projectiles\dnalocking.dm" #include "code\modules\projectiles\gun.dm" #include "code\modules\projectiles\pins.dm" #include "code\modules\projectiles\projectile.dm" -#include "code\modules\projectiles\ammunition\magazines.dm" -#include "code\modules\projectiles\ammunition\magic.dm" -#include "code\modules\projectiles\ammunition\magnetic.dm" +#include "code\modules\projectiles\ammunition\ammo_casing.dm" #include "code\modules\projectiles\ammunition\rounds.dm" -#include "code\modules\projectiles\ammunition\smartmag.dm" +#include "code\modules\projectiles\guns\ballistic.dm" #include "code\modules\projectiles\guns\energy.dm" #include "code\modules\projectiles\guns\launcher.dm" #include "code\modules\projectiles\guns\magic.dm" -#include "code\modules\projectiles\guns\projectile.dm" #include "code\modules\projectiles\guns\vox.dm" #include "code\modules\projectiles\guns\energy\hooklauncher.dm" #include "code\modules\projectiles\guns\energy\kinetic_accelerator.dm" @@ -3730,6 +3727,9 @@ #include "code\modules\projectiles\guns\projectile\shotgun.dm" #include "code\modules\projectiles\guns\projectile\sniper.dm" #include "code\modules\projectiles\guns\projectile\sniper\collapsible_sniper.dm" +#include "code\modules\projectiles\magazines\magazine.dm" +#include "code\modules\projectiles\magazines\smartmag.dm" +#include "code\modules\projectiles\magazines\unsorted.dm" #include "code\modules\projectiles\projectile\arc.dm" #include "code\modules\projectiles\projectile\blob.dm" #include "code\modules\projectiles\projectile\bullets.dm" @@ -3755,6 +3755,8 @@ #include "code\modules\projectiles\targeting\targeting_mob.dm" #include "code\modules\projectiles\targeting\targeting_overlay.dm" #include "code\modules\projectiles\targeting\targeting_triggers.dm" +#include "code\modules\projectiles\unsorted\magic.dm" +#include "code\modules\projectiles\unsorted\magnetic.dm" #include "code\modules\random_map\_random_map_setup.dm" #include "code\modules\random_map\random_map.dm" #include "code\modules\random_map\random_map_verbs.dm" diff --git a/code/__DEFINES/projectiles/ammo_casing.dm b/code/__DEFINES/projectiles/ammo_casing.dm new file mode 100644 index 00000000000..607dbe251c8 --- /dev/null +++ b/code/__DEFINES/projectiles/ammo_casing.dm @@ -0,0 +1,7 @@ +// /obj/item/ammo_casing casing_flags +/// delete after fire (usually for caseless) +#define CASING_DELETE (1<<0) + +DEFINE_BITFIELD(casing_flags, list( + BITFIELD(CASING_DELETE), +)) diff --git a/code/__DEFINES/guns.dm b/code/__DEFINES/projectiles/guns.dm similarity index 100% rename from code/__DEFINES/guns.dm rename to code/__DEFINES/projectiles/guns.dm diff --git a/code/datums/components/crafting/recipes/recipes_primal.dm b/code/datums/components/crafting/recipes/recipes_primal.dm index b233b301807..0a0f2a2686d 100644 --- a/code/datums/components/crafting/recipes/recipes_primal.dm +++ b/code/datums/components/crafting/recipes/recipes_primal.dm @@ -102,7 +102,7 @@ /datum/crafting_recipe/bone_bow name = "Bone Bow" - result = /obj/item/gun/projectile/bow/ashen + result = /obj/item/gun/ballistic/bow/ashen time = 120 // 80+120 = 200 reqs = list(/obj/item/stack/material/bone = 8, /obj/item/stack/sinew = 4) diff --git a/code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm b/code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm index cbcf1b33f12..f944440e2fa 100644 --- a/code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm +++ b/code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm @@ -315,7 +315,7 @@ /datum/crafting_recipe/pipebow name = "Pipe Bow" - result = /obj/item/gun/projectile/bow/pipe + result = /obj/item/gun/ballistic/bow/pipe reqs = list(/obj/item/pipe = 5, /obj/item/stack/material/plastic = 15, /obj/item/weaponcrafting/string = 5) @@ -325,7 +325,7 @@ /datum/crafting_recipe/dartgun name = "prototype dart gun" - result = /obj/item/gun/projectile/dartgun/research + result = /obj/item/gun/ballistic/dartgun/research reqs = list(/obj/item/stack/material/steel = 10, /obj/item/stack/material/glass = 5, /obj/item/tank/emergency/oxygen = 1, @@ -348,7 +348,7 @@ /datum/crafting_recipe/rapiddartgun name = "dart gun" - result = /obj/item/gun/projectile/dartgun + result = /obj/item/gun/ballistic/dartgun reqs = list( /obj/item/ammo_casing/chemdart = 1, /obj/item/stack/material/plastic = 5, @@ -402,7 +402,7 @@ /datum/crafting_recipe/piperifle name = "pipe rifle" - result = /obj/item/gun/projectile/contender/pipegun + result = /obj/item/gun/ballistic/contender/pipegun reqs = list(/obj/item/pipe = 1, /obj/item/weaponcrafting/receiver = 1, /obj/item/weaponcrafting/stock = 1, diff --git a/code/datums/outfits/costumes/halloween.dm b/code/datums/outfits/costumes/halloween.dm index 7e2211b55af..bf0a942d677 100644 --- a/code/datums/outfits/costumes/halloween.dm +++ b/code/datums/outfits/costumes/halloween.dm @@ -26,7 +26,7 @@ for(var/obj/item/briefcase_item in new_briefcase) qdel(briefcase_item) new_briefcase.contents += new /obj/item/toy/crossbow - new_briefcase.contents += new /obj/item/gun/projectile/revolver/capgun + new_briefcase.contents += new /obj/item/gun/ballistic/revolver/capgun new_briefcase.contents += new /obj/item/clothing/mask/gas/clown_hat H.put_in_hands_or_del(new_briefcase) @@ -38,7 +38,7 @@ glasses = /obj/item/clothing/glasses/fakesunglasses mask = /obj/item/clothing/mask/fakemoustache head = /obj/item/clothing/head/beret - r_hand = /obj/item/gun/projectile/revolver/capgun + r_hand = /obj/item/gun/ballistic/revolver/capgun /datum/outfit/costume/horrorcop/post_equip(var/mob/living/carbon/human/H) var/obj/item/clothing/under/U = H.w_uniform @@ -55,7 +55,7 @@ head = /obj/item/clothing/head/cowboy_hat gloves = /obj/item/clothing/gloves/fingerless suit = /obj/item/clothing/accessory/poncho - r_hand = /obj/item/gun/projectile/revolver/capgun + r_hand = /obj/item/gun/ballistic/revolver/capgun /datum/outfit/costume/cowboy/post_equip(var/mob/living/carbon/human/H) var/obj/item/clothing/under/U = H.w_uniform diff --git a/code/datums/outfits/horror_killers.dm b/code/datums/outfits/horror_killers.dm index e7ecaa15215..54f0fb68ace 100644 --- a/code/datums/outfits/horror_killers.dm +++ b/code/datums/outfits/horror_killers.dm @@ -56,7 +56,7 @@ for(var/i=3, i>0, i--) sec_briefcase.contents += new /obj/item/spacecash/c1000 sec_briefcase.contents += new /obj/item/gun/energy/crossbow - sec_briefcase.contents += new /obj/item/gun/projectile/revolver/mateba + sec_briefcase.contents += new /obj/item/gun/ballistic/revolver/mateba sec_briefcase.contents += new /obj/item/ammo_magazine/s357 sec_briefcase.contents += new /obj/item/plastique H.equip_to_slot_or_del(sec_briefcase, /datum/inventory_slot_meta/abstract/hand/left) diff --git a/code/datums/outfits/misc.dm b/code/datums/outfits/misc.dm index 8171c2770b7..090edcd5c05 100644 --- a/code/datums/outfits/misc.dm +++ b/code/datums/outfits/misc.dm @@ -24,7 +24,7 @@ head = /obj/item/clothing/head/ushanka gloves = /obj/item/clothing/gloves/combat back = /obj/item/storage/backpack/satchel - belt = /obj/item/gun/projectile/revolver/mateba + belt = /obj/item/gun/ballistic/revolver/mateba /datum/outfit/soviet_soldier/admiral name = "Soviet admiral" diff --git a/code/datums/outfits/outfit.dm b/code/datums/outfits/outfit.dm index 9242cd7726d..7408d2275f3 100644 --- a/code/datums/outfits/outfit.dm +++ b/code/datums/outfits/outfit.dm @@ -187,7 +187,7 @@ l_pocket = /obj/item/ammo_magazine/m95 l_hand = /obj/item/ammo_magazine/m95 r_hand = /obj/item/ammo_magazine/m95 - back = /obj/item/gun/projectile/automatic/battlerifle + back = /obj/item/gun/ballistic/automatic/battlerifle backpack_contents = list(/obj/item/storage/box = 1) abstract_type = /datum/outfit/wizard head = /obj/item/clothing/head/helmet/combat/JSDF @@ -208,7 +208,7 @@ shoes = /obj/item/clothing/shoes/boots/jackboots uniform = /obj/item/clothing/under/oricon/mildress/marine/command back = /obj/item/storage/backpack/satchel - belt = /obj/item/gun/projectile/revolver/consul + belt = /obj/item/gun/ballistic/revolver/consul l_pocket = /obj/item/ammo_magazine/s44 r_pocket = /obj/item/ammo_magazine/s44 r_hand = /obj/item/clothing/accessory/holster/hip diff --git a/code/datums/outfits/pirates.dm b/code/datums/outfits/pirates.dm index 0bb21a80efe..fad73bf7a80 100644 --- a/code/datums/outfits/pirates.dm +++ b/code/datums/outfits/pirates.dm @@ -26,7 +26,7 @@ mask = /obj/item/clothing/mask/breath back = /obj/item/tank/vox l_hand = /obj/item/melee/energy/sword/pirate - r_hand = /obj/item/gun/projectile/shotgun/pump/rifle/vox_hunting + r_hand = /obj/item/gun/ballistic/shotgun/pump/rifle/vox_hunting l_pocket = /obj/item/ammo_magazine/clip/c762 r_pocket = /obj/item/ammo_magazine/clip/c762 diff --git a/code/datums/outfits/tournament.dm b/code/datums/outfits/tournament.dm index db3e4401edf..3eefafa4759 100644 --- a/code/datums/outfits/tournament.dm +++ b/code/datums/outfits/tournament.dm @@ -22,7 +22,7 @@ uniform = /obj/item/clothing/under/det suit_store = /obj/item/clothing/suit/storage/det_trench glasses = /obj/item/clothing/glasses/thermal/plain/monocle - r_hand = /obj/item/gun/projectile/revolver + r_hand = /obj/item/gun/ballistic/revolver l_pocket = /obj/item/ammo_magazine/s357 /datum/outfit/tournament_gear/chef diff --git a/code/datums/uplink/visible_weapons.dm b/code/datums/uplink/visible_weapons.dm index 490cd071773..4fcf803248f 100644 --- a/code/datums/uplink/visible_weapons.dm +++ b/code/datums/uplink/visible_weapons.dm @@ -47,7 +47,7 @@ /datum/uplink_item/item/visible_weapons/dartgun name = "Dart Gun" item_cost = 30 - path = /obj/item/gun/projectile/dartgun + path = /obj/item/gun/ballistic/dartgun /datum/uplink_item/item/visible_weapons/crossbow name = "Energy Crossbow" @@ -57,7 +57,7 @@ /datum/uplink_item/item/visible_weapons/silenced_45 name = "Silenced .45" item_cost = 40 - path = /obj/item/gun/projectile/silenced + path = /obj/item/gun/ballistic/silenced /datum/uplink_item/item/visible_weapons/riggedlaser name = "Exosuit Rigged Laser" @@ -67,42 +67,42 @@ /datum/uplink_item/item/visible_weapons/revolver name = "Revolver" item_cost = 70 - path = /obj/item/gun/projectile/revolver + path = /obj/item/gun/ballistic/revolver /datum/uplink_item/item/visible_weapons/mateba name = "Mateba" item_cost = 70 - path = /obj/item/gun/projectile/revolver/mateba + path = /obj/item/gun/ballistic/revolver/mateba /datum/uplink_item/item/visible_weapons/judge name = "Judge" item_cost = 70 - path = /obj/item/gun/projectile/revolver/judge + path = /obj/item/gun/ballistic/revolver/judge /datum/uplink_item/item/visible_weapons/pistol_standard_capacity name = "9mm Pistol" item_cost = 40 - path = /obj/item/gun/projectile/p92x + path = /obj/item/gun/ballistic/p92x /datum/uplink_item/item/visible_weapons/pistol_large_capacity name = "9mm Pistol (with large capacity magazine)" item_cost = 70 - path = /obj/item/gun/projectile/p92x/large + path = /obj/item/gun/ballistic/p92x/large /datum/uplink_item/item/visible_weapons/lemat name = "LeMat" item_cost = 60 - path = /obj/item/gun/projectile/revolver/lemat + path = /obj/item/gun/ballistic/revolver/lemat /datum/uplink_item/item/visible_weapons/Derringer name = ".357 Derringer Pistol" item_cost = 40 - path = /obj/item/gun/projectile/derringer + path = /obj/item/gun/ballistic/derringer /datum/uplink_item/item/visible_weapons/heavysnipermerc name = "Anti-Materiel Rifle (14.5mm)" item_cost = DEFAULT_TELECRYSTAL_AMOUNT - path = /obj/item/gun/projectile/heavysniper + path = /obj/item/gun/ballistic/heavysniper antag_roles = list("mercenary") /datum/uplink_item/item/visible_weapons/heavysnipertraitor @@ -121,28 +121,28 @@ /datum/uplink_item/item/visible_weapons/tommygun name = "Tommy Gun (.45)" // We're keeping this because it's CLASSY. -Spades item_cost = 60 - path = /obj/item/gun/projectile/automatic/tommygun + path = /obj/item/gun/ballistic/automatic/tommygun //These are for traitors (or other antags, perhaps) to have the option of purchasing some merc gear. /datum/uplink_item/item/visible_weapons/submachinegun name = "Submachine Gun (10mm)" item_cost = 60 - path = /obj/item/gun/projectile/automatic/c20r + path = /obj/item/gun/ballistic/automatic/c20r /datum/uplink_item/item/visible_weapons/assaultrifle name = "Assault Rifle (5.45mm)" item_cost = 75 - path = /obj/item/gun/projectile/automatic/sts35 + path = /obj/item/gun/ballistic/automatic/sts35 /datum/uplink_item/item/visible_weapons/combatshotgun name = "Combat Shotgun" item_cost = 75 - path = /obj/item/gun/projectile/shotgun/pump/combat + path = /obj/item/gun/ballistic/shotgun/pump/combat /datum/uplink_item/item/visible_weapons/leveraction name = "Lever Action Rifle" item_cost = 50 - path = /obj/item/gun/projectile/shotgun/pump/rifle/lever + path = /obj/item/gun/ballistic/shotgun/pump/rifle/lever /datum/uplink_item/item/visible_weapons/egun name = "Energy Gun" diff --git a/code/game/antagonist/outsider/commando.dm b/code/game/antagonist/outsider/commando.dm index b0d96bae9d3..012d0b9edf0 100644 --- a/code/game/antagonist/outsider/commando.dm +++ b/code/game/antagonist/outsider/commando.dm @@ -22,7 +22,7 @@ var/datum/antagonist/deathsquad/mercenary/commandos /datum/antagonist/deathsquad/mercenary/equip(var/mob/living/carbon/human/player) player.equip_to_slot_or_del(new /obj/item/clothing/under/syndicate(player), SLOT_ID_UNIFORM) - player.equip_to_slot_or_del(new /obj/item/gun/projectile/silenced(player), SLOT_ID_BELT) + player.equip_to_slot_or_del(new /obj/item/gun/ballistic/silenced(player), SLOT_ID_BELT) player.equip_to_slot_or_del(new /obj/item/clothing/shoes/boots/swat(player), SLOT_ID_SHOES) player.equip_to_slot_or_del(new /obj/item/clothing/gloves/swat(player), SLOT_ID_GLOVES) player.equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal(player), SLOT_ID_GLASSES) diff --git a/code/game/antagonist/outsider/deathsquad.dm b/code/game/antagonist/outsider/deathsquad.dm index 839932e1157..11eedb75e1e 100644 --- a/code/game/antagonist/outsider/deathsquad.dm +++ b/code/game/antagonist/outsider/deathsquad.dm @@ -46,7 +46,7 @@ var/datum/antagonist/deathsquad/deathsquad player.equip_to_slot_or_del(new /obj/item/disk/nuclear(player), SLOT_ID_RIGHT_POCKET) else player.equip_to_slot_or_del(new /obj/item/plastique(player), SLOT_ID_LEFT_POCKET) - player.equip_to_slot_or_del(new /obj/item/gun/projectile/revolver/combat(player), SLOT_ID_BELT) + player.equip_to_slot_or_del(new /obj/item/gun/ballistic/revolver/combat(player), SLOT_ID_BELT) player.equip_to_slot_or_del(new /obj/item/gun/energy/pulse_rifle(player), /datum/inventory_slot_meta/abstract/hand/right) player.equip_to_slot_or_del(new /obj/item/rig/ert/assetprotection(player), SLOT_ID_BACK) player.equip_to_slot_or_del(new /obj/item/melee/energy/sword(player), SLOT_ID_SUIT_STORAGE) diff --git a/code/game/antagonist/outsider/raider.dm b/code/game/antagonist/outsider/raider.dm index f706134fb07..961690838e4 100644 --- a/code/game/antagonist/outsider/raider.dm +++ b/code/game/antagonist/outsider/raider.dm @@ -76,27 +76,27 @@ var/datum/antagonist/raider/raiders /obj/item/gun/launcher/crossbow, /obj/item/gun/launcher/grenade, /obj/item/gun/launcher/pneumatic, - /obj/item/gun/projectile/automatic/mini_uzi, - /obj/item/gun/projectile/automatic/c20r, - /obj/item/gun/projectile/automatic/wt550, - /obj/item/gun/projectile/automatic/sts35, - /obj/item/gun/projectile/automatic/bullpup, - /obj/item/gun/projectile/automatic/tommygun, - /obj/item/gun/projectile/silenced, - /obj/item/gun/projectile/shotgun/pump, - /obj/item/gun/projectile/shotgun/pump/combat, - /obj/item/gun/projectile/shotgun/pump/rifle, - /obj/item/gun/projectile/shotgun/doublebarrel, - /obj/item/gun/projectile/shotgun/doublebarrel/pellet, - /obj/item/gun/projectile/shotgun/doublebarrel/sawn, - /obj/item/gun/projectile/colt/detective, - /obj/item/gun/projectile/pistol, - /obj/item/gun/projectile/p92x, - /obj/item/gun/projectile/revolver, - /obj/item/gun/projectile/pirate, - /obj/item/gun/projectile/revolver/judge, - list(/obj/item/gun/projectile/luger,/obj/item/gun/projectile/luger/brown), - list(/obj/item/gun/projectile/deagle, /obj/item/gun/projectile/deagle/gold, /obj/item/gun/projectile/deagle/camo) + /obj/item/gun/ballistic/automatic/mini_uzi, + /obj/item/gun/ballistic/automatic/c20r, + /obj/item/gun/ballistic/automatic/wt550, + /obj/item/gun/ballistic/automatic/sts35, + /obj/item/gun/ballistic/automatic/bullpup, + /obj/item/gun/ballistic/automatic/tommygun, + /obj/item/gun/ballistic/silenced, + /obj/item/gun/ballistic/shotgun/pump, + /obj/item/gun/ballistic/shotgun/pump/combat, + /obj/item/gun/ballistic/shotgun/pump/rifle, + /obj/item/gun/ballistic/shotgun/doublebarrel, + /obj/item/gun/ballistic/shotgun/doublebarrel/pellet, + /obj/item/gun/ballistic/shotgun/doublebarrel/sawn, + /obj/item/gun/ballistic/colt/detective, + /obj/item/gun/ballistic/pistol, + /obj/item/gun/ballistic/p92x, + /obj/item/gun/ballistic/revolver, + /obj/item/gun/ballistic/pirate, + /obj/item/gun/ballistic/revolver/judge, + list(/obj/item/gun/ballistic/luger,/obj/item/gun/ballistic/luger/brown), + list(/obj/item/gun/ballistic/deagle, /obj/item/gun/ballistic/deagle/gold, /obj/item/gun/ballistic/deagle/camo) ) var/list/raider_holster = list( @@ -247,7 +247,7 @@ var/datum/antagonist/raider/raiders //Give some of the raiders a pirate gun as a secondary if(prob(60)) - var/obj/item/secondary = new /obj/item/gun/projectile/pirate(T) + var/obj/item/secondary = new /obj/item/gun/ballistic/pirate(T) if(!(primary.slot_flags & SLOT_HOLSTER)) holster = new new_holster(T) holster.holstered = secondary @@ -277,8 +277,8 @@ var/datum/antagonist/raider/raiders player.put_in_hands(holster) /datum/antagonist/raider/proc/equip_ammo(var/mob/living/carbon/human/player, var/obj/item/gun/gun) - if(istype(gun, /obj/item/gun/projectile)) - var/obj/item/gun/projectile/bullet_thrower = gun + if(istype(gun, /obj/item/gun/ballistic)) + var/obj/item/gun/ballistic/bullet_thrower = gun if(bullet_thrower.magazine_type) player.equip_to_slot_or_del(new bullet_thrower.magazine_type(player), SLOT_ID_LEFT_POCKET) if(prob(20)) //don't want to give them too much diff --git a/code/game/antagonist/station/renegade.dm b/code/game/antagonist/station/renegade.dm index 2e571fa473b..aae1115347e 100644 --- a/code/game/antagonist/station/renegade.dm +++ b/code/game/antagonist/station/renegade.dm @@ -35,32 +35,32 @@ var/datum/antagonist/renegade/renegades /obj/item/gun/energy/gun/nuclear, /obj/item/gun/energy/crossbow, /obj/item/gun/energy/crossbow/largecrossbow, - /obj/item/gun/projectile/automatic, - /obj/item/gun/projectile/automatic/mini_uzi, - /obj/item/gun/projectile/automatic/c20r, - /obj/item/gun/projectile/automatic/sts35, - /obj/item/gun/projectile/automatic/bullpup, - /obj/item/gun/projectile/automatic/wt550, - /obj/item/gun/projectile/automatic/z8, - /obj/item/gun/projectile/automatic/tommygun, - /obj/item/gun/projectile/colt/detective, - /obj/item/gun/projectile/sec/wood, - /obj/item/gun/projectile/silenced, - /obj/item/gun/projectile/pistol, - /obj/item/gun/projectile/p92x, - /obj/item/gun/projectile/konigin, - /obj/item/gun/projectile/revolver, - /obj/item/gun/projectile/derringer, - /obj/item/gun/projectile/shotgun/pump, - /obj/item/gun/projectile/shotgun/pump/rifle, - /obj/item/gun/projectile/shotgun/pump/combat, - /obj/item/gun/projectile/shotgun/doublebarrel, - /obj/item/gun/projectile/revolver/judge, - /obj/item/gun/projectile/revolver/lemat, - list(/obj/item/gun/projectile/shotgun/doublebarrel/pellet, /obj/item/gun/projectile/shotgun/doublebarrel/sawn), - list(/obj/item/gun/projectile/deagle, /obj/item/gun/projectile/deagle/gold, /obj/item/gun/projectile/deagle/camo), - list(/obj/item/gun/projectile/revolver/detective, /obj/item/gun/projectile/revolver/deckard), - list(/obj/item/gun/projectile/luger,/obj/item/gun/projectile/luger/brown) + /obj/item/gun/ballistic/automatic, + /obj/item/gun/ballistic/automatic/mini_uzi, + /obj/item/gun/ballistic/automatic/c20r, + /obj/item/gun/ballistic/automatic/sts35, + /obj/item/gun/ballistic/automatic/bullpup, + /obj/item/gun/ballistic/automatic/wt550, + /obj/item/gun/ballistic/automatic/z8, + /obj/item/gun/ballistic/automatic/tommygun, + /obj/item/gun/ballistic/colt/detective, + /obj/item/gun/ballistic/sec/wood, + /obj/item/gun/ballistic/silenced, + /obj/item/gun/ballistic/pistol, + /obj/item/gun/ballistic/p92x, + /obj/item/gun/ballistic/konigin, + /obj/item/gun/ballistic/revolver, + /obj/item/gun/ballistic/derringer, + /obj/item/gun/ballistic/shotgun/pump, + /obj/item/gun/ballistic/shotgun/pump/rifle, + /obj/item/gun/ballistic/shotgun/pump/combat, + /obj/item/gun/ballistic/shotgun/doublebarrel, + /obj/item/gun/ballistic/revolver/judge, + /obj/item/gun/ballistic/revolver/lemat, + list(/obj/item/gun/ballistic/shotgun/doublebarrel/pellet, /obj/item/gun/ballistic/shotgun/doublebarrel/sawn), + list(/obj/item/gun/ballistic/deagle, /obj/item/gun/ballistic/deagle/gold, /obj/item/gun/ballistic/deagle/camo), + list(/obj/item/gun/ballistic/revolver/detective, /obj/item/gun/ballistic/revolver/deckard), + list(/obj/item/gun/ballistic/luger,/obj/item/gun/ballistic/luger/brown) ) /datum/antagonist/renegade/New() diff --git a/code/game/machinery/computer/arcade/_arcade.dm b/code/game/machinery/computer/arcade/_arcade.dm index b4402c7ab33..93529c4d883 100644 --- a/code/game/machinery/computer/arcade/_arcade.dm +++ b/code/game/machinery/computer/arcade/_arcade.dm @@ -3,7 +3,7 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list( /obj/item/toy/blink = 2, /obj/item/clothing/under/syndicate/tacticool = 2, /obj/item/toy/sword = 2, - /obj/item/gun/projectile/revolver/capgun = 2, + /obj/item/gun/ballistic/revolver/capgun = 2, /obj/item/toy/crossbow = 2, /obj/item/clothing/suit/syndicatefake = 2, /obj/item/storage/fancy/crayons = 2, diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm index 78d1b394546..9b7c1c31673 100644 --- a/code/game/machinery/recharger.dm +++ b/code/game/machinery/recharger.dm @@ -9,7 +9,7 @@ active_power_usage = 40000 //10 kW var/efficiency = 10000 //will provide the modified power rate when upgraded var/obj/item/charging = null - var/list/allowed_devices = list(/obj/item/gun/energy, /obj/item/melee/baton, /obj/item/modular_computer, /obj/item/computer_hardware/battery_module, /obj/item/cell, /obj/item/flashlight, /obj/item/electronic_assembly, /obj/item/weldingtool/electric, /obj/item/ammo_magazine/smart, /obj/item/flash, /obj/item/ammo_casing/microbattery, /obj/item/shield_diffuser, /obj/item/ammo_magazine/cell_mag, /obj/item/gun/projectile/cell_loaded) + var/list/allowed_devices = list(/obj/item/gun/energy, /obj/item/melee/baton, /obj/item/modular_computer, /obj/item/computer_hardware/battery_module, /obj/item/cell, /obj/item/flashlight, /obj/item/electronic_assembly, /obj/item/weldingtool/electric, /obj/item/ammo_magazine/smart, /obj/item/flash, /obj/item/ammo_casing/microbattery, /obj/item/shield_diffuser, /obj/item/ammo_magazine/cell_mag, /obj/item/gun/ballistic/cell_loaded) var/icon_state_charged = "recharger2" var/icon_state_charging = "recharger1" var/icon_state_idle = "recharger0" //also when unpowered @@ -73,8 +73,8 @@ if(maggy.stored_ammo.len < 1) to_chat(user, "\The [G] does not have any cells installed.") return - else if(istype(G, /obj/item/gun/projectile/cell_loaded)) - var/obj/item/gun/projectile/cell_loaded/gunny = G + else if(istype(G, /obj/item/gun/ballistic/cell_loaded)) + var/obj/item/gun/ballistic/cell_loaded/gunny = G if(gunny.ammo_magazine) var/obj/item/ammo_magazine/cell_mag/maggy = gunny.ammo_magazine if(maggy.stored_ammo.len < 1) @@ -183,8 +183,8 @@ else if(istype(charging, /obj/item/ammo_magazine/cell_mag)) charge_mag(charging) - else if(istype(charging, /obj/item/gun/projectile/cell_loaded)) - var/obj/item/gun/projectile/cell_loaded/gunny = charging + else if(istype(charging, /obj/item/gun/ballistic/cell_loaded)) + var/obj/item/gun/ballistic/cell_loaded/gunny = charging charge_mag(gunny.ammo_magazine) /obj/machinery/recharger/proc/charge_mag(obj/item/ammo_magazine/cell_mag/maggy) @@ -233,7 +233,7 @@ plane = TURF_PLANE layer = ABOVE_TURF_LAYER base_power_draw = 30000 - allowed_devices = list(/obj/item/gun/energy, /obj/item/gun/magnetic, /obj/item/melee/baton, /obj/item/flashlight, /obj/item/cell/device, /obj/item/ammo_casing/microbattery, /obj/item/ammo_magazine/cell_mag, /obj/item/gun/projectile/cell_loaded) + allowed_devices = list(/obj/item/gun/energy, /obj/item/gun/magnetic, /obj/item/melee/baton, /obj/item/flashlight, /obj/item/cell/device, /obj/item/ammo_casing/microbattery, /obj/item/ammo_magazine/cell_mag, /obj/item/gun/ballistic/cell_loaded) icon_state_charged = "wrecharger2" icon_state_charging = "wrecharger1" icon_state_idle = "wrecharger0" diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index f7c60487d27..d526556dfd3 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -946,7 +946,7 @@ req_access = list(access_security) products = list(/obj/item/handcuffs = 8,/obj/item/grenade/flashbang = 4, /obj/item/flash = 5, /obj/item/reagent_containers/spray/pepper = 6, /obj/item/reagent_containers/food/snacks/donut/normal = 12, /obj/item/storage/box/evidence = 6, - /obj/item/gun/projectile/sec = 2, /obj/item/ammo_magazine/m45/rubber = 6, /obj/item/clothing/mask/gas/half = 6, + /obj/item/gun/ballistic/sec = 2, /obj/item/ammo_magazine/m45/rubber = 6, /obj/item/clothing/mask/gas/half = 6, /obj/item/clothing/glasses/omnihud/sec = 6, /obj/item/hailer = 6, /obj/item/barrier_tape_roll/police = 6, /obj/item/flashlight/glowstick = 6) contraband = list(/obj/item/clothing/glasses/sunglasses = 2,/obj/item/storage/box/donut = 2) req_log_access = access_armory @@ -1299,9 +1299,9 @@ product_slogans = "The best defense is good offense!;Buy for your whole family today!;Nobody can outsmart bullet!;God created man - Frozen Star made them EQUAL!;Nobody can outsmart bullet!;Stupidity can be cured! By LEAD.;Dead kids can't bully your children!" product_ads = "Stunning!;Take justice in your own hands!;LEADearship!" icon_state = "weapon" - products = list(/obj/item/flash = 6,/obj/item/reagent_containers/spray/pepper = 6, /obj/item/gun/projectile/olivaw = 5, /obj/item/gun/projectile/giskard = 5, /obj/item/ammo_magazine/mg/cl32/rubber = 20) + products = list(/obj/item/flash = 6,/obj/item/reagent_containers/spray/pepper = 6, /obj/item/gun/ballistic/olivaw = 5, /obj/item/gun/ballistic/giskard = 5, /obj/item/ammo_magazine/mg/cl32/rubber = 20) contraband = list(/obj/item/reagent_containers/food/snacks/syndicake = 6) - prices = list(/obj/item/flash = 600,/obj/item/reagent_containers/spray/pepper = 800, /obj/item/gun/projectile/olivaw = 1600, /obj/item/gun/projectile/giskard = 1200, /obj/item/ammo_magazine/mg/cl32/rubber = 200) + prices = list(/obj/item/flash = 600,/obj/item/reagent_containers/spray/pepper = 800, /obj/item/gun/ballistic/olivaw = 1600, /obj/item/gun/ballistic/giskard = 1200, /obj/item/ammo_magazine/mg/cl32/rubber = 200) */ /obj/machinery/vending/blood diff --git a/code/game/objects/items/gunbox.dm b/code/game/objects/items/gunbox.dm index f5e609a094b..f386c5cfe15 100644 --- a/code/game/objects/items/gunbox.dm +++ b/code/game/objects/items/gunbox.dm @@ -6,9 +6,9 @@ /obj/item/gunbox/attack_self(mob/living/user) var/list/options = list() - options["NT Mk58 (.45)"] = list(/obj/item/gun/projectile/sec, /obj/item/ammo_magazine/m45/rubber, /obj/item/ammo_magazine/m45/flash) - options["SW 625 Revolver (.45)"] = list(/obj/item/gun/projectile/revolver/detective45, /obj/item/ammo_magazine/s45/rubber, /obj/item/ammo_magazine/s45/rubber) - options["P92X (9mm)"] = list(/obj/item/gun/projectile/p92x/sec, /obj/item/ammo_magazine/m9mm/rubber, /obj/item/ammo_magazine/m9mm/flash) + options["NT Mk58 (.45)"] = list(/obj/item/gun/ballistic/sec, /obj/item/ammo_magazine/m45/rubber, /obj/item/ammo_magazine/m45/flash) + options["SW 625 Revolver (.45)"] = list(/obj/item/gun/ballistic/revolver/detective45, /obj/item/ammo_magazine/s45/rubber, /obj/item/ammo_magazine/s45/rubber) + options["P92X (9mm)"] = list(/obj/item/gun/ballistic/p92x/sec, /obj/item/ammo_magazine/m9mm/rubber, /obj/item/ammo_magazine/m9mm/flash) var/choice = input(user,"Would you prefer a pistol or a revolver?") as null|anything in options if(src && choice) var/list/things_to_spawn = options[choice] @@ -26,9 +26,9 @@ /obj/item/gunbox/lethal/attack_self(mob/living/user) var/list/options = list() - options["M1911 Dynamic (.45)"] = list(/obj/item/gun/projectile/colt, /obj/item/ammo_magazine/m45, /obj/item/ammo_magazine/m45) - options["SW 625 Revolver (.45)"] = list(/obj/item/gun/projectile/revolver/detective45, /obj/item/ammo_magazine/s45, /obj/item/ammo_magazine/s45) - options["P92X (9mm)"] = list(/obj/item/gun/projectile/p92x, /obj/item/ammo_magazine/m9mm, /obj/item/ammo_magazine/m9mm) + options["M1911 Dynamic (.45)"] = list(/obj/item/gun/ballistic/colt, /obj/item/ammo_magazine/m45, /obj/item/ammo_magazine/m45) + options["SW 625 Revolver (.45)"] = list(/obj/item/gun/ballistic/revolver/detective45, /obj/item/ammo_magazine/s45, /obj/item/ammo_magazine/s45) + options["P92X (9mm)"] = list(/obj/item/gun/ballistic/p92x, /obj/item/ammo_magazine/m9mm, /obj/item/ammo_magazine/m9mm) var/choice = input(user,"Would you prefer a pistol or a revolver?") as null|anything in options if(src && choice) var/list/things_to_spawn = options[choice] @@ -48,8 +48,8 @@ /obj/item/gunbox/attack_self(mob/living/user) var/list/options = list() - options[".45 Pistol"] = list(/obj/item/gun/projectile/colt/detective, /obj/item/ammo_magazine/m45/rubber, /obj/item/ammo_magazine/m45/rubber) - options[".45 Revolver"] = list(/obj/item/gun/projectile/revolver/detective45, /obj/item/ammo_magazine/s45/rubber, /obj/item/ammo_magazine/s45/rubber) + options[".45 Pistol"] = list(/obj/item/gun/ballistic/colt/detective, /obj/item/ammo_magazine/m45/rubber, /obj/item/ammo_magazine/m45/rubber) + options[".45 Revolver"] = list(/obj/item/gun/ballistic/revolver/detective45, /obj/item/ammo_magazine/s45/rubber, /obj/item/ammo_magazine/s45/rubber) var/choice = input(user,"Would you prefer a pistol or a revolver?") as null|anything in options if(src && choice) var/list/things_to_spawn = options[choice] @@ -70,7 +70,7 @@ /obj/item/gunbox/marksman/attack_self(mob/living/user) var/list/options = list() options["Marksman Energy Rifle"] = list(/obj/item/gun/energy/sniperrifle/locked) - options["M1A Garand"] = list(/obj/item/gun/projectile/garand/sniper, /obj/item/storage/belt/security/tactical/bandolier, /obj/item/ammo_magazine/m762garand/sniperhunter, /obj/item/ammo_magazine/m762garand/sniperhunter, /obj/item/ammo_magazine/m762garand/sniperhunter, /obj/item/ammo_magazine/m762garand/sniperhunter, /obj/item/ammo_magazine/m762garand/sniperhunter, /obj/item/ammo_magazine/m762garand/sniperhunter, /obj/item/ammo_magazine/m762garand/sniperhunter) // 7 clips, 56 rounds + options["M1A Garand"] = list(/obj/item/gun/ballistic/garand/sniper, /obj/item/storage/belt/security/tactical/bandolier, /obj/item/ammo_magazine/m762garand/sniperhunter, /obj/item/ammo_magazine/m762garand/sniperhunter, /obj/item/ammo_magazine/m762garand/sniperhunter, /obj/item/ammo_magazine/m762garand/sniperhunter, /obj/item/ammo_magazine/m762garand/sniperhunter, /obj/item/ammo_magazine/m762garand/sniperhunter, /obj/item/ammo_magazine/m762garand/sniperhunter) // 7 clips, 56 rounds var/choice = input(user,"Would you prefer a ballistic rifle or a laser?") as null|anything in options if(src && choice) var/list/things_to_spawn = options[choice] @@ -89,9 +89,9 @@ /obj/item/gunbox/donksoft/attack_self(mob/living/user) var/list/options = list() - options["Classic DONKsoft Pistol"] = list(/obj/item/gun/projectile/pistol/foam, /obj/item/ammo_magazine/mfoam/pistol, /obj/item/ammo_magazine/mfoam/pistol) - options["Blue DONKsoft Pistol"] = list(/obj/item/gun/projectile/pistol/foam/blue, /obj/item/ammo_magazine/mfoam/pistol, /obj/item/ammo_magazine/mfoam/pistol) - options["DONKsoft Automag"] = list(/obj/item/gun/projectile/pistol/foam/magnum, /obj/item/ammo_magazine/mfoam/pistol, /obj/item/ammo_magazine/mfoam/pistol) + options["Classic DONKsoft Pistol"] = list(/obj/item/gun/ballistic/pistol/foam, /obj/item/ammo_magazine/mfoam/pistol, /obj/item/ammo_magazine/mfoam/pistol) + options["Blue DONKsoft Pistol"] = list(/obj/item/gun/ballistic/pistol/foam/blue, /obj/item/ammo_magazine/mfoam/pistol, /obj/item/ammo_magazine/mfoam/pistol) + options["DONKsoft Automag"] = list(/obj/item/gun/ballistic/pistol/foam/magnum, /obj/item/ammo_magazine/mfoam/pistol, /obj/item/ammo_magazine/mfoam/pistol) var/choice = input(user,"What toy is in this box?") as null|anything in options if(src && choice) var/list/things_to_spawn = options[choice] @@ -109,8 +109,8 @@ /obj/item/gunbox/donksoft/shotgun/attack_self(mob/living/user) var/list/options = list() - options["Classic DONKsoft Shotgun"] = list(/obj/item/gun/projectile/shotgun/pump/foam, /obj/item/storage/box/foamdart, /obj/item/storage/box/foamdart) - options["Blue DONKsoft Shotgun"] = list(/obj/item/gun/projectile/shotgun/pump/foam/blue, /obj/item/storage/box/foamdart, /obj/item/storage/box/foamdart) + options["Classic DONKsoft Shotgun"] = list(/obj/item/gun/ballistic/shotgun/pump/foam, /obj/item/storage/box/foamdart, /obj/item/storage/box/foamdart) + options["Blue DONKsoft Shotgun"] = list(/obj/item/gun/ballistic/shotgun/pump/foam/blue, /obj/item/storage/box/foamdart, /obj/item/storage/box/foamdart) var/choice = input(user,"What toy is in this box?") as null|anything in options if(src && choice) var/list/things_to_spawn = options[choice] @@ -128,8 +128,8 @@ /obj/item/gunbox/donksoft/smg/attack_self(mob/living/user) var/list/options = list() - options["Classic DONKsoft SMG"] = list(/obj/item/gun/projectile/automatic/advanced_smg/foam, /obj/item/ammo_magazine/mfoam/smg, /obj/item/ammo_magazine/mfoam/smg) - options["Blue DONKsoft SMG"] = list(/obj/item/gun/projectile/automatic/advanced_smg/foam/blue, /obj/item/ammo_magazine/mfoam/smg, /obj/item/ammo_magazine/mfoam/smg) + options["Classic DONKsoft SMG"] = list(/obj/item/gun/ballistic/automatic/advanced_smg/foam, /obj/item/ammo_magazine/mfoam/smg, /obj/item/ammo_magazine/mfoam/smg) + options["Blue DONKsoft SMG"] = list(/obj/item/gun/ballistic/automatic/advanced_smg/foam/blue, /obj/item/ammo_magazine/mfoam/smg, /obj/item/ammo_magazine/mfoam/smg) var/choice = input(user,"What toy is in this box?") as null|anything in options if(src && choice) var/list/things_to_spawn = options[choice] diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index a8409773750..68cf0d58d93 100644 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -184,10 +184,10 @@ /obj/item/megaphone, /obj/item/melee, /obj/item/clothing/accessory/badge, - /obj/item/gun/projectile/sec, - /obj/item/gun/projectile/p92x, + /obj/item/gun/ballistic/sec, + /obj/item/gun/ballistic/p92x, /obj/item/barrier_tape_roll, - /obj/item/gun/projectile/colt/detective, + /obj/item/gun/ballistic/colt/detective, /obj/item/holowarrant ) @@ -230,7 +230,7 @@ /obj/item/flame/lighter, /obj/item/reagent_containers/food/snacks/donut/, /obj/item/ammo_magazine, - /obj/item/gun/projectile/colt/detective, + /obj/item/gun/ballistic/colt/detective, /obj/item/holowarrant ) @@ -565,22 +565,22 @@ /obj/item/gun/energy/taser, /obj/item/gun/energy/toxgun, /obj/item/gun/energy/zip, - /obj/item/gun/projectile/colt, - /obj/item/gun/projectile/contender, - /obj/item/gun/projectile/dartgun, - /obj/item/gun/projectile/deagle, - /obj/item/gun/projectile/derringer, - /obj/item/gun/projectile/gyropistol, - /obj/item/gun/projectile/luger, - /obj/item/gun/projectile/r9, - /obj/item/gun/projectile/revolver, - /obj/item/gun/projectile/sec, - /obj/item/gun/projectile/shotgun/doublebarrel/sawn, - /obj/item/gun/projectile/shotgun/flare, - /obj/item/gun/projectile/silenced, - /obj/item/gun/projectile/p92x, - /obj/item/gun/projectile/pistol, - /obj/item/gun/projectile/pirate + /obj/item/gun/ballistic/colt, + /obj/item/gun/ballistic/contender, + /obj/item/gun/ballistic/dartgun, + /obj/item/gun/ballistic/deagle, + /obj/item/gun/ballistic/derringer, + /obj/item/gun/ballistic/gyropistol, + /obj/item/gun/ballistic/luger, + /obj/item/gun/ballistic/r9, + /obj/item/gun/ballistic/revolver, + /obj/item/gun/ballistic/sec, + /obj/item/gun/ballistic/shotgun/doublebarrel/sawn, + /obj/item/gun/ballistic/shotgun/flare, + /obj/item/gun/ballistic/silenced, + /obj/item/gun/ballistic/p92x, + /obj/item/gun/ballistic/pistol, + /obj/item/gun/ballistic/pirate ) /obj/item/storage/belt/quiver diff --git a/code/game/objects/items/storage/lockbox.dm b/code/game/objects/items/storage/lockbox.dm index 42f030d1375..e9af5fd4771 100644 --- a/code/game/objects/items/storage/lockbox.dm +++ b/code/game/objects/items/storage/lockbox.dm @@ -110,10 +110,10 @@ /obj/item/clothing/under/customs/khaki = 4, /obj/item/clothing/suit/colonial_redcoat = 4, /obj/item/clothing/head/redcoat = 4, - /obj/item/gun/projectile/musket/pistol = 1, + /obj/item/gun/ballistic/musket/pistol = 1, /obj/item/ammo_casing/musket = 12, /obj/item/storage/belt/sheath = 1, - /obj/item/gun/projectile/musket = 3, + /obj/item/gun/ballistic/musket = 3, /obj/item/reagent_containers/glass/powder_horn = 4, /obj/item/reagent_containers/food/drinks/tea = 8, ) @@ -126,9 +126,9 @@ /obj/item/clothing/under/tactical = 4, /obj/item/clothing/accessory/storage/black_vest = 4, /obj/item/clothing/head/soft/black = 4, - /obj/item/gun/projectile/automatic/p90 = 2, + /obj/item/gun/ballistic/automatic/p90 = 2, /obj/item/ammo_magazine/m57x28mmp90 = 4, - /obj/item/gun/projectile/p92x = 1, + /obj/item/gun/ballistic/p92x = 1, /obj/item/ammo_magazine/m9mm = 2, ) @@ -140,11 +140,11 @@ /obj/item/clothing/suit/storage/toggle/brown_jacket = 4, /obj/item/clothing/shoes/boots/cowboy/classic = 4, /obj/item/clothing/head/cowboy_hat = 4, - /obj/item/gun/projectile/revolver/dirty_harry = 2, + /obj/item/gun/ballistic/revolver/dirty_harry = 2, /obj/item/ammo_magazine/s44 = 4, - /obj/item/gun/projectile/shotgun/pump/rifle/lever/win1895 = 1, + /obj/item/gun/ballistic/shotgun/pump/rifle/lever/win1895 = 1, /obj/item/ammo_magazine/clip/c762 = 2, - /obj/item/gun/projectile/shotgun/doublebarrel/pellet = 1, + /obj/item/gun/ballistic/shotgun/doublebarrel/pellet = 1, /obj/item/storage/box/shotgunshells = 1, /obj/item/reagent_containers/food/drinks/bottle/small/sarsaparilla = 3, /obj/item/reagent_containers/food/drinks/bottle/small/sassafras = 3, @@ -159,9 +159,9 @@ /obj/item/clothing/under/soviet = 4, /obj/item/clothing/head/ushanka = 3, /obj/item/clothing/head/bearpelt = 1, - /obj/item/gun/projectile/shotgun/pump/rifle = 3, + /obj/item/gun/ballistic/shotgun/pump/rifle = 3, /obj/item/ammo_magazine/clip/c762 = 3, - /obj/item/gun/projectile/pistol = 1, + /obj/item/gun/ballistic/pistol = 1, /obj/item/ammo_magazine/m9mm/compact = 1, /obj/item/reagent_containers/food/drinks/bottle/vodka = 1, ) diff --git a/code/game/objects/items/storage/uplink_kits.dm b/code/game/objects/items/storage/uplink_kits.dm index 715d1f5160e..70540aee139 100644 --- a/code/game/objects/items/storage/uplink_kits.dm +++ b/code/game/objects/items/storage/uplink_kits.dm @@ -21,7 +21,7 @@ new /obj/item/tank/emergency/oxygen/double(src) if("guns") - new /obj/item/gun/projectile/revolver(src) + new /obj/item/gun/ballistic/revolver(src) new /obj/item/ammo_magazine/s357(src) new /obj/item/card/emag(src) new /obj/item/plastique(src) @@ -177,7 +177,7 @@ name = "\improper Smooth operator" desc = "Compact 9mm with silencer kit." starts_with = list( - /obj/item/gun/projectile/pistol, + /obj/item/gun/ballistic/pistol, /obj/item/silencer ) diff --git a/code/game/objects/items/weapons/gift_wrappaper.dm b/code/game/objects/items/weapons/gift_wrappaper.dm index a6a314b9946..b87f5d02558 100644 --- a/code/game/objects/items/weapons/gift_wrappaper.dm +++ b/code/game/objects/items/weapons/gift_wrappaper.dm @@ -79,7 +79,7 @@ /obj/item/toy/balloon, /obj/item/toy/blink, /obj/item/toy/crossbow, - /obj/item/gun/projectile/revolver/capgun, + /obj/item/gun/ballistic/revolver/capgun, /obj/item/toy/katana, /obj/item/toy/prize/deathripley, /obj/item/toy/prize/durand, @@ -179,7 +179,7 @@ /obj/item/storage/backpack/holding, /obj/item/grenade/smokebomb, /obj/item/toy/crossbow, - /obj/item/gun/projectile/revolver/capgun, + /obj/item/gun/ballistic/revolver/capgun, /obj/item/toy/katana, /obj/item/toy/sword, /obj/item/storage/belt/utility/full) diff --git a/code/game/objects/random/guns_and_ammo.dm b/code/game/objects/random/guns_and_ammo.dm index 4741902fa45..008d28d186e 100644 --- a/code/game/objects/random/guns_and_ammo.dm +++ b/code/game/objects/random/guns_and_ammo.dm @@ -51,51 +51,51 @@ icon_state = "revolver" /obj/random/projectile/item_to_spawn() - return pick(prob(3);/obj/item/gun/projectile/automatic/wt550, - prob(3);/obj/item/gun/projectile/automatic/wt274, - prob(1);/obj/item/gun/projectile/automatic/mini_uzi, - prob(1);/obj/item/gun/projectile/automatic/mini_uzi/taj, - prob(1);/obj/item/gun/projectile/automatic/tommygun, - prob(2);/obj/item/gun/projectile/automatic/c20r, - prob(2);/obj/item/gun/projectile/automatic/sts35, - prob(2);/obj/item/gun/projectile/automatic/z8, - prob(1);/obj/item/gun/projectile/automatic/fal, - prob(1);/obj/item/gun/projectile/colt, - prob(1);/obj/item/gun/projectile/colt/taj, - prob(1);/obj/item/gun/projectile/deagle, - prob(1);/obj/item/gun/projectile/deagle/camo, - prob(1);/obj/item/gun/projectile/deagle/gold, - prob(1);/obj/item/gun/projectile/deagle/taj, - prob(1);/obj/item/gun/projectile/derringer, - prob(1);/obj/item/gun/projectile/heavysniper, - prob(1);/obj/item/gun/projectile/luger, - prob(1);/obj/item/gun/projectile/luger/brown, - prob(4);/obj/item/gun/projectile/sec, - prob(3);/obj/item/gun/projectile/sec/wood, - prob(4);/obj/item/gun/projectile/r9, - prob(4);/obj/item/gun/projectile/p92x, - prob(3);/obj/item/gun/projectile/p92x/brown, - prob(4);/obj/item/gun/projectile/pistol, - prob(5);/obj/item/gun/projectile/pirate, - prob(2);/obj/item/gun/projectile/revolver, - prob(2);/obj/item/gun/projectile/revolver/deckard, - prob(1);/obj/item/gun/projectile/revolver/detective, - prob(1);/obj/item/gun/projectile/revolver/judge, - prob(1);/obj/item/gun/projectile/konigin, - prob(1);/obj/item/gun/projectile/revolver/lemat, - prob(1);/obj/item/gun/projectile/revolver/mateba, - prob(1);/obj/item/gun/projectile/revolver/dirty_harry, - prob(4);/obj/item/gun/projectile/shotgun/doublebarrel, - prob(3);/obj/item/gun/projectile/shotgun/doublebarrel/sawn, - prob(2);/obj/item/gun/projectile/shotgun/doublebarrel/quad, - prob(3);/obj/item/gun/projectile/shotgun/pump, - prob(2);/obj/item/gun/projectile/shotgun/pump/rifle/lever/arnold, - prob(2);/obj/item/gun/projectile/shotgun/pump/combat, - prob(4);/obj/item/gun/projectile/shotgun/pump/rifle, - prob(1);/obj/item/gun/projectile/shotgun/pump/rifle/taj, - prob(1);/obj/item/gun/projectile/shotgun/pump/rifle/lever, - prob(1);/obj/item/gun/projectile/shotgun/pump/rifle/lever/win1895, - prob(2);/obj/item/gun/projectile/silenced) + return pick(prob(3);/obj/item/gun/ballistic/automatic/wt550, + prob(3);/obj/item/gun/ballistic/automatic/wt274, + prob(1);/obj/item/gun/ballistic/automatic/mini_uzi, + prob(1);/obj/item/gun/ballistic/automatic/mini_uzi/taj, + prob(1);/obj/item/gun/ballistic/automatic/tommygun, + prob(2);/obj/item/gun/ballistic/automatic/c20r, + prob(2);/obj/item/gun/ballistic/automatic/sts35, + prob(2);/obj/item/gun/ballistic/automatic/z8, + prob(1);/obj/item/gun/ballistic/automatic/fal, + prob(1);/obj/item/gun/ballistic/colt, + prob(1);/obj/item/gun/ballistic/colt/taj, + prob(1);/obj/item/gun/ballistic/deagle, + prob(1);/obj/item/gun/ballistic/deagle/camo, + prob(1);/obj/item/gun/ballistic/deagle/gold, + prob(1);/obj/item/gun/ballistic/deagle/taj, + prob(1);/obj/item/gun/ballistic/derringer, + prob(1);/obj/item/gun/ballistic/heavysniper, + prob(1);/obj/item/gun/ballistic/luger, + prob(1);/obj/item/gun/ballistic/luger/brown, + prob(4);/obj/item/gun/ballistic/sec, + prob(3);/obj/item/gun/ballistic/sec/wood, + prob(4);/obj/item/gun/ballistic/r9, + prob(4);/obj/item/gun/ballistic/p92x, + prob(3);/obj/item/gun/ballistic/p92x/brown, + prob(4);/obj/item/gun/ballistic/pistol, + prob(5);/obj/item/gun/ballistic/pirate, + prob(2);/obj/item/gun/ballistic/revolver, + prob(2);/obj/item/gun/ballistic/revolver/deckard, + prob(1);/obj/item/gun/ballistic/revolver/detective, + prob(1);/obj/item/gun/ballistic/revolver/judge, + prob(1);/obj/item/gun/ballistic/konigin, + prob(1);/obj/item/gun/ballistic/revolver/lemat, + prob(1);/obj/item/gun/ballistic/revolver/mateba, + prob(1);/obj/item/gun/ballistic/revolver/dirty_harry, + prob(4);/obj/item/gun/ballistic/shotgun/doublebarrel, + prob(3);/obj/item/gun/ballistic/shotgun/doublebarrel/sawn, + prob(2);/obj/item/gun/ballistic/shotgun/doublebarrel/quad, + prob(3);/obj/item/gun/ballistic/shotgun/pump, + prob(2);/obj/item/gun/ballistic/shotgun/pump/rifle/lever/arnold, + prob(2);/obj/item/gun/ballistic/shotgun/pump/combat, + prob(4);/obj/item/gun/ballistic/shotgun/pump/rifle, + prob(1);/obj/item/gun/ballistic/shotgun/pump/rifle/taj, + prob(1);/obj/item/gun/ballistic/shotgun/pump/rifle/lever, + prob(1);/obj/item/gun/ballistic/shotgun/pump/rifle/lever/win1895, + prob(2);/obj/item/gun/ballistic/silenced) /obj/random/projectile/sec name = "Random Security Projectile Weapon" @@ -104,9 +104,9 @@ icon_state = "revolver" /obj/random/projectile/sec/item_to_spawn() - return pick(prob(3);/obj/item/gun/projectile/shotgun/pump, - prob(2);/obj/item/gun/projectile/automatic/wt550, - prob(1);/obj/item/gun/projectile/shotgun/pump/combat) + return pick(prob(3);/obj/item/gun/ballistic/shotgun/pump, + prob(2);/obj/item/gun/ballistic/automatic/wt550, + prob(1);/obj/item/gun/ballistic/shotgun/pump/combat) /obj/random/projectile/shotgun name = "Random Projectile Weapon" @@ -115,11 +115,11 @@ icon_state = "shotgun" /obj/random/projectile/item_to_spawn() - return pick(prob(4);/obj/item/gun/projectile/shotgun/doublebarrel, - prob(3);/obj/item/gun/projectile/shotgun/doublebarrel/sawn, - prob(3);/obj/item/gun/projectile/shotgun/pump, - prob(2);/obj/item/gun/projectile/shotgun/doublebarrel/quad, - prob(1);/obj/item/gun/projectile/shotgun/pump/combat) + return pick(prob(4);/obj/item/gun/ballistic/shotgun/doublebarrel, + prob(3);/obj/item/gun/ballistic/shotgun/doublebarrel/sawn, + prob(3);/obj/item/gun/ballistic/shotgun/pump, + prob(2);/obj/item/gun/ballistic/shotgun/doublebarrel/quad, + prob(1);/obj/item/gun/ballistic/shotgun/pump/combat) /obj/random/handgun name = "Random Handgun" @@ -128,18 +128,18 @@ icon_state = "secgundark" /obj/random/handgun/item_to_spawn() - return pick(prob(4);/obj/item/gun/projectile/sec, - prob(4);/obj/item/gun/projectile/p92x, - prob(4);/obj/item/gun/projectile/r9, - prob(3);/obj/item/gun/projectile/sec/wood, - prob(3);/obj/item/gun/projectile/p92x/brown, - prob(3);/obj/item/gun/projectile/colt, - prob(1);/obj/item/gun/projectile/colt/taj, - prob(1);/obj/item/gun/projectile/luger, + return pick(prob(4);/obj/item/gun/ballistic/sec, + prob(4);/obj/item/gun/ballistic/p92x, + prob(4);/obj/item/gun/ballistic/r9, + prob(3);/obj/item/gun/ballistic/sec/wood, + prob(3);/obj/item/gun/ballistic/p92x/brown, + prob(3);/obj/item/gun/ballistic/colt, + prob(1);/obj/item/gun/ballistic/colt/taj, + prob(1);/obj/item/gun/ballistic/luger, prob(2);/obj/item/gun/energy/gun, - prob(2);/obj/item/gun/projectile/pistol, + prob(2);/obj/item/gun/ballistic/pistol, prob(1);/obj/item/gun/energy/retro, - prob(1);/obj/item/gun/projectile/luger/brown) + prob(1);/obj/item/gun/ballistic/luger/brown) /obj/random/handgun/sec name = "Random Security Handgun" @@ -148,8 +148,8 @@ icon_state = "secgundark" /obj/random/handgun/sec/item_to_spawn() - return pick(prob(3);/obj/item/gun/projectile/sec, - prob(1);/obj/item/gun/projectile/sec/wood) + return pick(prob(3);/obj/item/gun/ballistic/sec, + prob(1);/obj/item/gun/ballistic/sec/wood) /obj/random/ammo name = "Random Ammunition" @@ -189,36 +189,36 @@ /obj/random/multiple/gun/projectile/smg/item_to_spawn() return pick( prob(3);list( - /obj/item/gun/projectile/automatic/wt550, + /obj/item/gun/ballistic/automatic/wt550, /obj/item/ammo_magazine/m9mmt, /obj/item/ammo_magazine/m9mmt ), prob(3);list( - /obj/item/gun/projectile/automatic/wt274, + /obj/item/gun/ballistic/automatic/wt274, /obj/item/ammo_magazine/m45uzi/wt274, /obj/item/ammo_magazine/m45uzi/wt274 ), prob(1);list( - /obj/item/gun/projectile/automatic/mini_uzi, + /obj/item/gun/ballistic/automatic/mini_uzi, /obj/item/ammo_magazine/m45uzi, /obj/item/ammo_magazine/m45uzi ), prob(1);list( - /obj/item/gun/projectile/automatic/tommygun, + /obj/item/gun/ballistic/automatic/tommygun, /obj/item/ammo_magazine/m45tommy, /obj/item/ammo_magazine/m45tommy ), prob(2);list( - /obj/item/gun/projectile/automatic/c20r, + /obj/item/gun/ballistic/automatic/c20r, /obj/item/ammo_magazine/m10mm, /obj/item/ammo_magazine/m10mm ), prob(1);list( - /obj/item/gun/projectile/automatic/p90, + /obj/item/gun/ballistic/automatic/p90, /obj/item/ammo_magazine/m57x28mmp90 ), prob(1);list( - /obj/item/gun/projectile/automatic/mini_uzi/taj, + /obj/item/gun/ballistic/automatic/mini_uzi/taj, /obj/item/ammo_magazine/m45uzi, /obj/item/ammo_magazine/m45uzi ) @@ -235,32 +235,32 @@ /obj/random/multiple/gun/projectile/rifle/item_to_spawn() return pick( prob(2);list( - /obj/item/gun/projectile/automatic/sts35, + /obj/item/gun/ballistic/automatic/sts35, /obj/item/ammo_magazine/m545, /obj/item/ammo_magazine/m545 ), prob(2);list( - /obj/item/gun/projectile/automatic/z8, + /obj/item/gun/ballistic/automatic/z8, /obj/item/ammo_magazine/m762, /obj/item/ammo_magazine/m762 ), prob(4);list( - /obj/item/gun/projectile/shotgun/pump/rifle, + /obj/item/gun/ballistic/shotgun/pump/rifle, /obj/item/ammo_magazine/clip/c762, /obj/item/ammo_magazine/clip/c762 ), prob(1);list( - /obj/item/gun/projectile/shotgun/pump/rifle/lever/win1895, + /obj/item/gun/ballistic/shotgun/pump/rifle/lever/win1895, /obj/item/ammo_magazine/clip/c762, /obj/item/ammo_magazine/clip/c762 ), prob(1);list( - /obj/item/gun/projectile/automatic/bullpup, + /obj/item/gun/ballistic/automatic/bullpup, /obj/item/ammo_magazine/m762, /obj/item/ammo_magazine/m762 ), prob(4);list( - /obj/item/gun/projectile/shotgun/pump/rifle/taj, + /obj/item/gun/ballistic/shotgun/pump/rifle/taj, /obj/item/ammo_magazine/clip/c762, /obj/item/ammo_magazine/clip/c762 ) @@ -275,149 +275,149 @@ /obj/random/multiple/gun/projectile/handgun/item_to_spawn() return pick( prob(5);list( - /obj/item/gun/projectile/colt, + /obj/item/gun/ballistic/colt, /obj/item/ammo_magazine/m45, /obj/item/ammo_magazine/m45 ), prob(4);list( - /obj/item/gun/projectile/contender, + /obj/item/gun/ballistic/contender, /obj/item/ammo_magazine/s357, /obj/item/ammo_magazine/s357 ), prob(3);list( - /obj/item/gun/projectile/contender/tacticool, + /obj/item/gun/ballistic/contender/tacticool, /obj/item/ammo_magazine/s357, /obj/item/ammo_magazine/s357 ), prob(1);list( - /obj/item/gun/projectile/contender/taj, + /obj/item/gun/ballistic/contender/taj, /obj/item/ammo_magazine/s357, /obj/item/ammo_magazine/s357 ), prob(2);list( - /obj/item/gun/projectile/deagle, + /obj/item/gun/ballistic/deagle, /obj/item/ammo_magazine/m44, /obj/item/ammo_magazine/m44 ), prob(1);list( - /obj/item/gun/projectile/deagle/camo, + /obj/item/gun/ballistic/deagle/camo, /obj/item/ammo_magazine/m44, /obj/item/ammo_magazine/m44 ), prob(1);list( - /obj/item/gun/projectile/deagle/gold, + /obj/item/gun/ballistic/deagle/gold, /obj/item/ammo_magazine/m44, /obj/item/ammo_magazine/m44 ), prob(1);list( - /obj/item/gun/projectile/deagle/taj, + /obj/item/gun/ballistic/deagle/taj, /obj/item/ammo_magazine/m44, /obj/item/ammo_magazine/m44 ), prob(1);list( - /obj/item/gun/projectile/derringer, + /obj/item/gun/ballistic/derringer, /obj/item/ammo_magazine/s357, /obj/item/ammo_magazine/s357 ), prob(1);list( - /obj/item/gun/projectile/luger, + /obj/item/gun/ballistic/luger, /obj/item/ammo_magazine/m9mm/compact, /obj/item/ammo_magazine/m9mm/compact ), prob(1);list( - /obj/item/gun/projectile/luger/brown, + /obj/item/gun/ballistic/luger/brown, /obj/item/ammo_magazine/m9mm/compact, /obj/item/ammo_magazine/m9mm/compact ), prob(5);list( - /obj/item/gun/projectile/sec, + /obj/item/gun/ballistic/sec, /obj/item/ammo_magazine/m45, /obj/item/ammo_magazine/m45 ), prob(4);list( - /obj/item/gun/projectile/sec/wood, + /obj/item/gun/ballistic/sec/wood, /obj/item/ammo_magazine/m45, /obj/item/ammo_magazine/m45 ), prob(5);list( - /obj/item/gun/projectile/p92x, + /obj/item/gun/ballistic/p92x, /obj/item/ammo_magazine/m9mm, /obj/item/ammo_magazine/m9mm ), prob(5);list( - /obj/item/gun/projectile/r9, + /obj/item/gun/ballistic/r9, /obj/item/ammo_magazine/clip/c9mm, /obj/item/ammo_magazine/clip/c9mm ), prob(4);list( - /obj/item/gun/projectile/p92x/brown, + /obj/item/gun/ballistic/p92x/brown, /obj/item/ammo_magazine/m9mm, /obj/item/ammo_magazine/m9mm ), prob(2);list( - /obj/item/gun/projectile/p92x/large, + /obj/item/gun/ballistic/p92x/large, /obj/item/ammo_magazine/m9mm/large, /obj/item/ammo_magazine/m9mm/large ), prob(5);list( - /obj/item/gun/projectile/pistol, + /obj/item/gun/ballistic/pistol, /obj/item/ammo_magazine/m9mm/compact, /obj/item/ammo_magazine/m9mm/compact ), prob(2);list( - /obj/item/gun/projectile/silenced, + /obj/item/gun/ballistic/silenced, /obj/item/ammo_magazine/m45, /obj/item/ammo_magazine/m45 ), prob(2);list( - /obj/item/gun/projectile/revolver, + /obj/item/gun/ballistic/revolver, /obj/item/ammo_magazine/s357, /obj/item/ammo_magazine/s357 ), prob(4);list( - /obj/item/gun/projectile/revolver/deckard, + /obj/item/gun/ballistic/revolver/deckard, /obj/item/ammo_magazine/s38, /obj/item/ammo_magazine/s38 ), prob(4);list( - /obj/item/gun/projectile/revolver/detective, + /obj/item/gun/ballistic/revolver/detective, /obj/item/ammo_magazine/s38, /obj/item/ammo_magazine/s38 ), prob(2);list( - /obj/item/gun/projectile/revolver/judge, + /obj/item/gun/ballistic/revolver/judge, /obj/item/ammo_magazine/clip/c12g, /obj/item/ammo_magazine/clip/c12g, /obj/item/ammo_magazine/clip/c12g ), prob(2);list( - /obj/item/gun/projectile/revolver/lemat, + /obj/item/gun/ballistic/revolver/lemat, /obj/item/ammo_magazine/s38, /obj/item/ammo_magazine/s38, /obj/item/ammo_magazine/clip/c12g ), prob(2);list( - /obj/item/gun/projectile/revolver/mateba, + /obj/item/gun/ballistic/revolver/mateba, /obj/item/ammo_magazine/s357, /obj/item/ammo_magazine/s357 ), prob(1);list( - /obj/item/gun/projectile/revolver/webley, + /obj/item/gun/ballistic/revolver/webley, /obj/item/ammo_magazine/s44, /obj/item/ammo_magazine/s44 ), prob(2);list( - /obj/item/gun/projectile/revolver/dirty_harry, + /obj/item/gun/ballistic/revolver/dirty_harry, /obj/item/ammo_magazine/s44, /obj/item/ammo_magazine/s44 ), prob(1);list( - /obj/item/gun/projectile/revolver/webley/auto, + /obj/item/gun/ballistic/revolver/webley/auto, /obj/item/ammo_magazine/s44, /obj/item/ammo_magazine/s44 ), prob(1);list( - /obj/item/gun/projectile/colt/taj, + /obj/item/gun/ballistic/colt/taj, /obj/item/ammo_magazine/m45, /obj/item/ammo_magazine/m45 ) @@ -432,32 +432,32 @@ /obj/random/multiple/gun/projectile/shotgun/item_to_spawn() return pick( prob(4);list( - /obj/item/gun/projectile/shotgun/doublebarrel/pellet, + /obj/item/gun/ballistic/shotgun/doublebarrel/pellet, /obj/item/ammo_magazine/clip/c12g/pellet, /obj/item/ammo_magazine/clip/c12g/pellet, /obj/item/ammo_magazine/clip/c12g/pellet, /obj/item/ammo_magazine/clip/c12g/pellet ), prob(3);list( - /obj/item/gun/projectile/shotgun/doublebarrel/sawn, + /obj/item/gun/ballistic/shotgun/doublebarrel/sawn, /obj/item/ammo_magazine/clip/c12g/pellet, /obj/item/ammo_magazine/clip/c12g/pellet, /obj/item/ammo_magazine/clip/c12g/pellet, /obj/item/ammo_magazine/clip/c12g/pellet ), prob(3);list( - /obj/item/gun/projectile/shotgun/doublebarrel/quad, + /obj/item/gun/ballistic/shotgun/doublebarrel/quad, /obj/item/ammo_magazine/clip/c12g/pellet, /obj/item/ammo_magazine/clip/c12g/pellet, /obj/item/ammo_magazine/clip/c12g/pellet, /obj/item/ammo_magazine/clip/c12g/pellet ), prob(3);list( - /obj/item/gun/projectile/shotgun/pump/slug, + /obj/item/gun/ballistic/shotgun/pump/slug, /obj/item/storage/box/shotgunammo ), prob(1);list( - /obj/item/gun/projectile/shotgun/pump/combat, + /obj/item/gun/ballistic/shotgun/pump/combat, /obj/item/storage/box/shotgunammo ) ) diff --git a/code/game/objects/random/mapping.dm b/code/game/objects/random/mapping.dm index 00bf9f9738f..1d7e417094f 100644 --- a/code/game/objects/random/mapping.dm +++ b/code/game/objects/random/mapping.dm @@ -280,8 +280,8 @@ /obj/item/clothing/head/helmet/space/syndicate/black/red, /obj/item/clothing/suit/space/syndicate/black/red, /obj/item/clothing/head/helmet/space/syndicate/black/red, - /obj/item/gun/projectile/automatic/mini_uzi, - /obj/item/gun/projectile/automatic/mini_uzi, + /obj/item/gun/ballistic/automatic/mini_uzi, + /obj/item/gun/ballistic/automatic/mini_uzi, /obj/item/ammo_magazine/m45uzi, /obj/item/ammo_magazine/m45uzi, /obj/item/ammo_magazine/m45uzi/empty, @@ -297,8 +297,8 @@ prob(2);list( /obj/item/clothing/suit/armor/vest, /obj/item/clothing/suit/armor/vest, - /obj/item/gun/projectile/garand, - /obj/item/gun/projectile/garand, + /obj/item/gun/ballistic/garand, + /obj/item/gun/ballistic/garand, /obj/item/ammo_magazine/m762garand, /obj/item/ammo_magazine/m762garand, /obj/structure/closet/crate/plastic @@ -378,15 +378,15 @@ /obj/item/clothing/head/bearpelt, /obj/item/clothing/under/soviet, /obj/item/clothing/under/soviet, - /obj/item/gun/projectile/shotgun/pump/rifle/ceremonial, - /obj/item/gun/projectile/shotgun/pump/rifle/ceremonial, + /obj/item/gun/ballistic/shotgun/pump/rifle/ceremonial, + /obj/item/gun/ballistic/shotgun/pump/rifle/ceremonial, /obj/structure/closet/crate ), prob(1);list( - /obj/item/gun/projectile/revolver/detective, - /obj/item/gun/projectile/contender, - /obj/item/gun/projectile/p92x, - /obj/item/gun/projectile/derringer, + /obj/item/gun/ballistic/revolver/detective, + /obj/item/gun/ballistic/contender, + /obj/item/gun/ballistic/p92x, + /obj/item/gun/ballistic/derringer, /obj/structure/closet/crate ), prob(1);list( diff --git a/code/game/objects/random/misc.dm b/code/game/objects/random/misc.dm index c6984a63696..cced7904848 100644 --- a/code/game/objects/random/misc.dm +++ b/code/game/objects/random/misc.dm @@ -743,87 +743,87 @@ return pick( prob(11);/obj/random/ammo_all, prob(11);/obj/item/gun/energy/laser, - prob(11);/obj/item/gun/projectile/pirate, + prob(11);/obj/item/gun/ballistic/pirate, prob(10);/obj/item/material/twohanded/spear, prob(10);/obj/item/gun/energy/stunrevolver, prob(10);/obj/item/gun/energy/taser, - prob(10);/obj/item/gun/projectile/shotgun/doublebarrel/pellet, + prob(10);/obj/item/gun/ballistic/shotgun/doublebarrel/pellet, prob(10);/obj/item/material/knife, - prob(10);/obj/item/gun/projectile/luger, - // prob(10);/obj/item/gun/projectile/pipegun, - prob(10);/obj/item/gun/projectile/revolver/detective, - prob(10);/obj/item/gun/projectile/revolver/judge, - prob(10);/obj/item/gun/projectile/colt, - prob(2);/obj/item/gun/projectile/colt/taj, - prob(10);/obj/item/gun/projectile/shotgun/pump, - prob(10);/obj/item/gun/projectile/shotgun/pump/rifle, - prob(2);/obj/item/gun/projectile/shotgun/pump/rifle/taj, + prob(10);/obj/item/gun/ballistic/luger, + // prob(10);/obj/item/gun/ballistic/pipegun, + prob(10);/obj/item/gun/ballistic/revolver/detective, + prob(10);/obj/item/gun/ballistic/revolver/judge, + prob(10);/obj/item/gun/ballistic/colt, + prob(2);/obj/item/gun/ballistic/colt/taj, + prob(10);/obj/item/gun/ballistic/shotgun/pump, + prob(10);/obj/item/gun/ballistic/shotgun/pump/rifle, + prob(2);/obj/item/gun/ballistic/shotgun/pump/rifle/taj, prob(10);/obj/item/melee/baton, prob(10);/obj/item/melee/telebaton, prob(10);/obj/item/melee/classic_baton, - prob(9);/obj/item/gun/projectile/automatic/wt550/lethal, - prob(9);/obj/item/gun/projectile/automatic/pdw, - prob(9);/obj/item/gun/projectile/automatic/sol, + prob(9);/obj/item/gun/ballistic/automatic/wt550/lethal, + prob(9);/obj/item/gun/ballistic/automatic/pdw, + prob(9);/obj/item/gun/ballistic/automatic/sol, prob(9);/obj/item/gun/energy/crossbow/largecrossbow, - prob(9);/obj/item/gun/projectile/pistol, - prob(9);/obj/item/gun/projectile/shotgun/pump, + prob(9);/obj/item/gun/ballistic/pistol, + prob(9);/obj/item/gun/ballistic/shotgun/pump, prob(9);/obj/item/cane/concealed, prob(9);/obj/item/gun/energy/gun, prob(8);/obj/item/gun/energy/retro, prob(8);/obj/item/gun/energy/gun/eluger, prob(8);/obj/item/gun/energy/xray, - prob(8);/obj/item/gun/projectile/automatic/c20r, + prob(8);/obj/item/gun/ballistic/automatic/c20r, prob(8);/obj/item/melee/energy/sword, - prob(8);/obj/item/gun/projectile/derringer, - prob(8);/obj/item/gun/projectile/konigin, - prob(8);/obj/item/gun/projectile/revolver/lemat, - // prob(8);/obj/item/gun/projectile/shotgun/pump/rifle/mosin, - // prob(8);/obj/item/gun/projectile/automatic/m41a, + prob(8);/obj/item/gun/ballistic/derringer, + prob(8);/obj/item/gun/ballistic/konigin, + prob(8);/obj/item/gun/ballistic/revolver/lemat, + // prob(8);/obj/item/gun/ballistic/shotgun/pump/rifle/mosin, + // prob(8);/obj/item/gun/ballistic/automatic/m41a, prob(7);/obj/item/material/butterfly, prob(7);/obj/item/material/butterfly/switchblade, - prob(7);/obj/item/gun/projectile/giskard, - prob(7);/obj/item/gun/projectile/automatic/p90, - prob(7);/obj/item/gun/projectile/automatic/sts35, - prob(7);/obj/item/gun/projectile/shotgun/pump/combat, + prob(7);/obj/item/gun/ballistic/giskard, + prob(7);/obj/item/gun/ballistic/automatic/p90, + prob(7);/obj/item/gun/ballistic/automatic/sts35, + prob(7);/obj/item/gun/ballistic/shotgun/pump/combat, prob(6);/obj/item/gun/energy/sniperrifle, - prob(6);/obj/item/gun/projectile/automatic/z8, + prob(6);/obj/item/gun/ballistic/automatic/z8, prob(6);/obj/item/gun/energy/captain, prob(6);/obj/item/material/knife/tacknife, - prob(5);/obj/item/gun/projectile/shotgun/pump/JSDF, - prob(5);/obj/item/gun/projectile/giskard/olivaw, - prob(5);/obj/item/gun/projectile/revolver/consul, - prob(5);/obj/item/gun/projectile/revolver/mateba, - prob(5);/obj/item/gun/projectile/revolver, - prob(4);/obj/item/gun/projectile/deagle, - prob(4);/obj/item/gun/projectile/deagle/taj, + prob(5);/obj/item/gun/ballistic/shotgun/pump/JSDF, + prob(5);/obj/item/gun/ballistic/giskard/olivaw, + prob(5);/obj/item/gun/ballistic/revolver/consul, + prob(5);/obj/item/gun/ballistic/revolver/mateba, + prob(5);/obj/item/gun/ballistic/revolver, + prob(4);/obj/item/gun/ballistic/deagle, + prob(4);/obj/item/gun/ballistic/deagle/taj, prob(4);/obj/item/material/knife/tacknife/combatknife, prob(4);/obj/item/melee/energy/sword, - prob(2);/obj/item/gun/projectile/automatic/mini_uzi, - prob(2);/obj/item/gun/projectile/automatic/mini_uzi/taj, - prob(4);/obj/item/gun/projectile/automatic/wt274, - prob(4);/obj/item/gun/projectile/contender, - prob(4);/obj/item/gun/projectile/contender/tacticool, - prob(4);/obj/item/gun/projectile/contender/taj, - prob(3);/obj/item/gun/projectile/SVD, + prob(2);/obj/item/gun/ballistic/automatic/mini_uzi, + prob(2);/obj/item/gun/ballistic/automatic/mini_uzi/taj, + prob(4);/obj/item/gun/ballistic/automatic/wt274, + prob(4);/obj/item/gun/ballistic/contender, + prob(4);/obj/item/gun/ballistic/contender/tacticool, + prob(4);/obj/item/gun/ballistic/contender/taj, + prob(3);/obj/item/gun/ballistic/SVD, prob(3);/obj/item/gun/energy/lasercannon, - prob(3);/obj/item/gun/projectile/shotgun/pump/rifle/lever, - prob(3);/obj/item/gun/projectile/automatic/bullpup, + prob(3);/obj/item/gun/ballistic/shotgun/pump/rifle/lever, + prob(3);/obj/item/gun/ballistic/automatic/bullpup, prob(2);/obj/item/gun/energy/pulse_rifle, prob(2);/obj/item/gun/energy/gun/nuclear, - prob(2);/obj/item/gun/projectile/automatic/l6_saw, + prob(2);/obj/item/gun/ballistic/automatic/l6_saw, prob(2);/obj/item/gun/energy/gun/burst, prob(2);/obj/item/storage/box/frags, prob(2);/obj/item/material/twohanded/fireaxe, - prob(2);/obj/item/gun/projectile/luger/brown, + prob(2);/obj/item/gun/ballistic/luger/brown, prob(2);/obj/item/gun/launcher/crossbow, - // prob(1);/obj/item/gun/projectile/automatic/battlerifle, // Too OP - prob(1);/obj/item/gun/projectile/deagle/gold, + // prob(1);/obj/item/gun/ballistic/automatic/battlerifle, // Too OP + prob(1);/obj/item/gun/ballistic/deagle/gold, prob(1);/obj/item/gun/energy/imperial, - prob(1);/obj/item/gun/projectile/automatic/as24, - prob(1);/obj/item/gun/projectile/rocket, + prob(1);/obj/item/gun/ballistic/automatic/as24, + prob(1);/obj/item/gun/ballistic/rocket, prob(1);/obj/item/gun/launcher/grenade, - prob(1);/obj/item/gun/projectile/gyropistol, - prob(1);/obj/item/gun/projectile/heavysniper, + prob(1);/obj/item/gun/ballistic/gyropistol, + prob(1);/obj/item/gun/ballistic/heavysniper, prob(1);/obj/item/plastique, prob(1);/obj/item/gun/energy/ionrifle, prob(1);/obj/item/material/sword, diff --git a/code/game/objects/structures/crates_lockers/closets/secure/explorer.dm b/code/game/objects/structures/crates_lockers/closets/secure/explorer.dm index fc8a607191b..3fd31081abb 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/explorer.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/explorer.dm @@ -101,7 +101,7 @@ /obj/item/reagent_containers/food/snacks/liquidprotein, /obj/item/reagent_containers/food/drinks/cans/waterbottle, /obj/item/storage/box/flare, - /obj/item/gun/projectile/shotgun/flare/explo, + /obj/item/gun/ballistic/shotgun/flare/explo, /obj/item/storage/box/flashshells, /obj/item/cell/device, /obj/item/radio, @@ -148,7 +148,7 @@ /obj/item/storage/box/survival_knife, /obj/item/material/knife/machete/deluxe, /obj/item/gun/energy/frontier/locked/carbine, - /obj/item/gun/projectile/fnseven, + /obj/item/gun/ballistic/fnseven, /obj/item/ammo_magazine/m57x28mm, /obj/item/ammo_magazine/m57x28mm, /obj/item/clothing/accessory/holster/machete, diff --git a/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm index 7218bf831de..58942c4d4b9 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm @@ -28,7 +28,7 @@ for (var/obj/item/gun/G in contents) if (istype(G, /obj/item/gun/energy)) lazors++ - if (istype(G, /obj/item/gun/projectile)) + if (istype(G, /obj/item/gun/ballistic)) shottas++ for (var/i = 0 to 2) if(lazors || shottas) // only make icons if we have one of the two types. @@ -71,13 +71,13 @@ starts_with = list( /obj/item/ammo_magazine/clip/c762/hunter = 9, - /obj/item/gun/projectile/shotgun/pump/rifle = 2) + /obj/item/gun/ballistic/shotgun/pump/rifle = 2) /obj/structure/closet/secure_closet/guncabinet/rifle/Initialize(mapload) if(prob(85)) - starts_with += /obj/item/gun/projectile/shotgun/pump/rifle + starts_with += /obj/item/gun/ballistic/shotgun/pump/rifle else - starts_with += /obj/item/gun/projectile/shotgun/pump/rifle/lever + starts_with += /obj/item/gun/ballistic/shotgun/pump/rifle/lever return ..() /obj/structure/closet/secure_closet/guncabinet/phase 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 cef850a8def..4f018a8bab2 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -250,7 +250,7 @@ /obj/item/flashlight/maglight, /obj/item/megaphone, /obj/item/clothing/mask/gas/half, - /obj/item/gun/projectile/shotgun/pump/combat/warden) + /obj/item/gun/ballistic/shotgun/pump/combat/warden) /obj/structure/closet/secure_closet/warden/Initialize(mapload) if(prob(50)) @@ -342,7 +342,7 @@ starts_with = list( /obj/item/clothing/accessory/badge/holo/detective, /obj/item/clothing/gloves/forensic, - /obj/item/gun/projectile/revolver/detective45, + /obj/item/gun/ballistic/revolver/detective45, /obj/item/ammo_magazine/s45/rubber, /obj/item/ammo_magazine/s45/rubber, /obj/item/reagent_containers/spray/pepper, diff --git a/code/game/objects/structures/loot_piles.dm b/code/game/objects/structures/loot_piles.dm index 32e52c02e72..c4b566be987 100644 --- a/code/game/objects/structures/loot_piles.dm +++ b/code/game/objects/structures/loot_piles.dm @@ -592,8 +592,8 @@ Loot piles can be depleted, if loot_depleted is turned on. Note that players wh ) rare_loot = list( /obj/item/storage/belt/utility/alien/full, - /obj/item/gun/projectile/revolver, - /obj/item/gun/projectile/sec, + /obj/item/gun/ballistic/revolver, + /obj/item/gun/ballistic/sec, /obj/item/gun/launcher/crossbow ) @@ -1086,7 +1086,7 @@ Loot piles can be depleted, if loot_depleted is turned on. Note that players wh ) rare_loot = list( - /obj/item/gun/projectile/gyropistol, + /obj/item/gun/ballistic/gyropistol, /obj/item/mecha_parts/mecha_equipment/generator/nuclear ) diff --git a/code/game/objects/structures/trash_pile.dm b/code/game/objects/structures/trash_pile.dm index bb2332563d2..b49a19478ac 100644 --- a/code/game/objects/structures/trash_pile.dm +++ b/code/game/objects/structures/trash_pile.dm @@ -22,9 +22,9 @@ /obj/item/bluespace_harpoon, /obj/item/clothing/glasses/thermal/syndi, /obj/item/gun/energy/netgun, - /obj/item/gun/projectile/pirate, + /obj/item/gun/ballistic/pirate, /obj/item/clothing/accessory/permit/gun, - /obj/item/gun/projectile/dartgun + /obj/item/gun/ballistic/dartgun ) var/global/list/allocated_gamma = list() diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index b0bfe01b73f..9e0135aa742 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -46,10 +46,10 @@ var/obj/item/gun/energy/energy_gun = G P = new energy_gun.projectile_type() - else if(istype(I, /obj/item/gun/projectile)) - var/obj/item/gun/projectile/projectile_gun = G + else if(istype(I, /obj/item/gun/ballistic)) + var/obj/item/gun/ballistic/projectile_gun = G var/obj/item/ammo_casing/ammo = projectile_gun.chambered - P = ammo.BB + P = ammo.get_projectile() else to_chat(user, "DPS calculation by this verb is not supported for \the [G]'s type. Energy or Ballistic only, sorry.") diff --git a/code/modules/awaymissions/loot_vr.dm b/code/modules/awaymissions/loot_vr.dm index 82f5541cd73..d932982a7da 100644 --- a/code/modules/awaymissions/loot_vr.dm +++ b/code/modules/awaymissions/loot_vr.dm @@ -104,37 +104,37 @@ var/new_gun = pick( // Copied from Random.dm prob(11);/obj/random/ammo_all,\ prob(11);/obj/item/gun/energy/laser,\ - prob(11);/obj/item/gun/projectile/pirate,\ + prob(11);/obj/item/gun/ballistic/pirate,\ prob(10);/obj/item/material/twohanded/spear,\ prob(10);/obj/item/gun/energy/stunrevolver,\ prob(10);/obj/item/gun/energy/taser,\ prob(10);/obj/item/gun/launcher/crossbow,\ - prob(10);/obj/item/gun/projectile/shotgun/doublebarrel/pellet,\ + prob(10);/obj/item/gun/ballistic/shotgun/doublebarrel/pellet,\ prob(10);/obj/item/material/knife,\ prob(10);/obj/item/material/knife/tacknife/combatknife,\ prob(10);/obj/item/material/butterfly/switchblade,\ - prob(10);/obj/item/gun/projectile/luger,\ - prob(10);/obj/item/gun/projectile/luger/brown,\ - /* prob(10);/obj/item/gun/projectile/pipegun,\ */ - prob(10);/obj/item/gun/projectile/revolver,\ - prob(10);/obj/item/gun/projectile/revolver/detective,\ - prob(10);/obj/item/gun/projectile/revolver/mateba,\ - prob(10);/obj/item/gun/projectile/revolver/judge,\ - prob(10);/obj/item/gun/projectile/colt,\ - prob(10);/obj/item/gun/projectile/shotgun/pump,\ - prob(10);/obj/item/gun/projectile/shotgun/pump/rifle,\ - /* prob(10);/obj/item/gun/projectile/shotgun/pump/rifle/mosin,\ */ + prob(10);/obj/item/gun/ballistic/luger,\ + prob(10);/obj/item/gun/ballistic/luger/brown,\ + /* prob(10);/obj/item/gun/ballistic/pipegun,\ */ + prob(10);/obj/item/gun/ballistic/revolver,\ + prob(10);/obj/item/gun/ballistic/revolver/detective,\ + prob(10);/obj/item/gun/ballistic/revolver/mateba,\ + prob(10);/obj/item/gun/ballistic/revolver/judge,\ + prob(10);/obj/item/gun/ballistic/colt,\ + prob(10);/obj/item/gun/ballistic/shotgun/pump,\ + prob(10);/obj/item/gun/ballistic/shotgun/pump/rifle,\ + /* prob(10);/obj/item/gun/ballistic/shotgun/pump/rifle/mosin,\ */ prob(10);/obj/item/melee/baton,\ prob(10);/obj/item/melee/telebaton,\ prob(10);/obj/item/melee/classic_baton,\ prob(10);/obj/item/melee/energy/sword,\ - prob(9);/obj/item/gun/projectile/automatic/wt550/lethal,\ - prob(9);/obj/item/gun/projectile/automatic/pdw,\ - prob(9);/obj/item/gun/projectile/derringer,\ + prob(9);/obj/item/gun/ballistic/automatic/wt550/lethal,\ + prob(9);/obj/item/gun/ballistic/automatic/pdw,\ + prob(9);/obj/item/gun/ballistic/derringer,\ prob(9);/obj/item/gun/energy/crossbow/largecrossbow,\ - prob(9);/obj/item/gun/projectile/automatic/mini_uzi,\ - prob(9);/obj/item/gun/projectile/pistol,\ - prob(9);/obj/item/gun/projectile/shotgun/pump/combat,\ + prob(9);/obj/item/gun/ballistic/automatic/mini_uzi,\ + prob(9);/obj/item/gun/ballistic/pistol,\ + prob(9);/obj/item/gun/ballistic/shotgun/pump/combat,\ prob(9);/obj/item/material/twohanded/fireaxe,\ prob(9);/obj/item/cane/concealed,\ prob(9);/obj/item/gun/energy/gun,\ @@ -142,33 +142,33 @@ prob(8);/obj/item/gun/energy/retro,\ prob(8);/obj/item/gun/energy/gun/eluger,\ prob(8);/obj/item/gun/energy/xray,\ - prob(8);/obj/item/gun/projectile/automatic/c20r,\ - prob(8);/obj/item/gun/projectile/automatic/stg,\ + prob(8);/obj/item/gun/ballistic/automatic/c20r,\ + prob(8);/obj/item/gun/ballistic/automatic/stg,\ prob(8);/obj/item/melee/energy/sword,\ - /* prob(8);/obj/item/gun/projectile/automatic/m41a,\ */ + /* prob(8);/obj/item/gun/ballistic/automatic/m41a,\ */ prob(7);/obj/item/gun/energy/captain,\ prob(7);/obj/item/gun/energy/sniperrifle,\ - prob(7);/obj/item/gun/projectile/automatic/p90,\ - prob(7);/obj/item/gun/projectile/automatic/as24,\ - prob(7);/obj/item/gun/projectile/automatic/sts35,\ - prob(7);/obj/item/gun/projectile/automatic/z8,\ + prob(7);/obj/item/gun/ballistic/automatic/p90,\ + prob(7);/obj/item/gun/ballistic/automatic/as24,\ + prob(7);/obj/item/gun/ballistic/automatic/sts35,\ + prob(7);/obj/item/gun/ballistic/automatic/z8,\ prob(7);/obj/item/gun/energy/gun/burst,\ - prob(7);/obj/item/gun/projectile/shotgun/pump/JSDF,\ - prob(7);/obj/item/gun/projectile/deagle,\ + prob(7);/obj/item/gun/ballistic/shotgun/pump/JSDF,\ + prob(7);/obj/item/gun/ballistic/deagle,\ prob(7);/obj/item/gun/launcher/grenade,\ - /* prob(6);/obj/item/gun/projectile/SVD,\*/ - prob(6);/obj/item/gun/projectile/automatic/l6_saw,\ + /* prob(6);/obj/item/gun/ballistic/SVD,\*/ + prob(6);/obj/item/gun/ballistic/automatic/l6_saw,\ prob(6);/obj/item/gun/energy/lasercannon,\ - prob(5);/obj/item/gun/projectile/automatic/bullpup,\ + prob(5);/obj/item/gun/ballistic/automatic/bullpup,\ prob(5);/obj/item/gun/energy/pulse_rifle,\ - /* prob(4);/obj/item/gun/projectile/automatic/battlerifle,\ */ - prob(3);/obj/item/gun/projectile/deagle/camo,\ + /* prob(4);/obj/item/gun/ballistic/automatic/battlerifle,\ */ + prob(3);/obj/item/gun/ballistic/deagle/camo,\ prob(3);/obj/item/gun/energy/gun/nuclear,\ - prob(2);/obj/item/gun/projectile/deagle/gold,\ - prob(1);/obj/item/gun/projectile/rocket,\ + prob(2);/obj/item/gun/ballistic/deagle/gold,\ + prob(1);/obj/item/gun/ballistic/rocket,\ prob(1);/obj/item/gun/launcher/grenade,\ - prob(1);/obj/item/gun/projectile/gyropistol,\ - prob(1);/obj/item/gun/projectile/heavysniper,\ + prob(1);/obj/item/gun/ballistic/gyropistol,\ + prob(1);/obj/item/gun/ballistic/heavysniper,\ prob(1);/obj/item/plastique,\ prob(1);/obj/item/material/sword,\ prob(1);/obj/item/cane/concealed,\ diff --git a/code/modules/cargo/supplypacks/contraband.dm b/code/modules/cargo/supplypacks/contraband.dm index d7d6a9d8026..14e35a02f7f 100644 --- a/code/modules/cargo/supplypacks/contraband.dm +++ b/code/modules/cargo/supplypacks/contraband.dm @@ -47,7 +47,7 @@ /datum/supply_pack/munitions/bolt_rifles_militia name = "Weapon - Misplaced militia rifles" contains = list( - /obj/item/gun/projectile/shotgun/pump/rifle = 3, + /obj/item/gun/ballistic/shotgun/pump/rifle = 3, /obj/item/ammo_magazine/clip/c762 = 6 ) cost = 50 @@ -55,7 +55,7 @@ container_type = /obj/structure/closet/crate/secure/weapon container_name = "Ballistic weapons crate" access = access_armory - + /datum/supply_pack/randomised/misc/telecrate //you get something awesome, a couple of decent things, and a few weak/filler things name = "ERR_NULL_ENTRY" //null crate! also dream maker is hell, num_contained = 1 @@ -78,7 +78,7 @@ name = "operator's kit" /obj/item/storage/box/cargo_null_entry_kit/ops/PopulateContents() - new /obj/item/gun/projectile/shotgun/pump/combat(src) + new /obj/item/gun/ballistic/shotgun/pump/combat(src) new /obj/item/clothing/suit/storage/vest/heavy/merc(src) new /obj/item/clothing/glasses/night(src) new /obj/item/storage/box/anti_photons(src) @@ -90,7 +90,7 @@ /obj/item/storage/box/cargo_null_entry_kit/doctor/PopulateContents() new /obj/item/storage/firstaid/combat(src) - new /obj/item/gun/projectile/dartgun(src) + new /obj/item/gun/ballistic/dartgun(src) new /obj/item/reagent_containers/hypospray(src) new /obj/item/reagent_containers/glass/bottle/chloralhydrate(src) new /obj/item/reagent_containers/glass/bottle/cyanide(src) @@ -111,7 +111,7 @@ name = "spy's kit" /obj/item/storage/box/cargo_null_entry_kit/spy/PopulateContents() - new /obj/item/gun/projectile/silenced(src) + new /obj/item/gun/ballistic/silenced(src) new /obj/item/chameleon(src) new /obj/item/storage/box/syndie_kit/chameleon(src) new /obj/item/encryptionkey/syndicate(src) @@ -123,7 +123,7 @@ name = "professional's kit" /obj/item/storage/box/cargo_null_entry_kit/pro/PopulateContents() - new /obj/item/gun/projectile/silenced(src) + new /obj/item/gun/ballistic/silenced(src) new /obj/item/gun/energy/ionrifle/pistol(src) new /obj/item/clothing/glasses/thermal/syndi(src) new /obj/item/card/emag(src) diff --git a/code/modules/cargo/supplypacks/medical.dm b/code/modules/cargo/supplypacks/medical.dm index ef0cd3a548b..c3c84054ae2 100644 --- a/code/modules/cargo/supplypacks/medical.dm +++ b/code/modules/cargo/supplypacks/medical.dm @@ -425,7 +425,7 @@ /datum/supply_pack/med/ml3m name = "Cell-Loaded Medigun crate" contains = list( - /obj/item/gun/projectile/cell_loaded/medical = 1, + /obj/item/gun/ballistic/cell_loaded/medical = 1, /obj/item/ammo_magazine/cell_mag/medical = 1 ) cost = 250 diff --git a/code/modules/cargo/supplypacks/munitions.dm b/code/modules/cargo/supplypacks/munitions.dm index 804ce237e44..9c1966d8f22 100644 --- a/code/modules/cargo/supplypacks/munitions.dm +++ b/code/modules/cargo/supplypacks/munitions.dm @@ -35,7 +35,7 @@ /datum/supply_pack/munitions/flareguns name = "Weapons - Flare guns" contains = list( - /obj/item/gun/projectile/shotgun/flare = 2, + /obj/item/gun/ballistic/shotgun/flare = 2, /obj/item/storage/box/flashshells = 2 ) cost = 25 @@ -66,7 +66,7 @@ contains = list( /obj/item/storage/box/shotgunammo, /obj/item/storage/box/shotgunshells, - /obj/item/gun/projectile/shotgun/pump/combat = 2 + /obj/item/gun/ballistic/shotgun/pump/combat = 2 ) cost = 50 container_type = /obj/structure/closet/crate/secure/ward @@ -113,7 +113,7 @@ /datum/supply_pack/munitions/bsmg name = "Weapons - Ballistic SMGs" - contains = list(/obj/item/gun/projectile/automatic/wt550 = 2) + contains = list(/obj/item/gun/ballistic/automatic/wt550 = 2) cost = 50 container_type = /obj/structure/closet/crate/secure/ward container_name = "Ballistic weapon crate" @@ -121,7 +121,7 @@ /datum/supply_pack/munitions/brifle name = "Weapons - Ballistic Rifles" - contains = list(/obj/item/gun/projectile/automatic/z8 = 2) + contains = list(/obj/item/gun/ballistic/automatic/z8 = 2) cost = 80 container_type = /obj/structure/closet/crate/secure/weapon container_name = "Ballistic weapon crate" @@ -131,7 +131,7 @@ name = "Weapons - Competitive shooting rifles" contains = list( /obj/item/assembly/timer, - /obj/item/gun/projectile/shotgun/pump/rifle/practice = 2, + /obj/item/gun/ballistic/shotgun/pump/rifle/practice = 2, /obj/item/ammo_magazine/clip/c762/practice = 4, /obj/item/target = 2, /obj/item/target/alien = 2, @@ -240,8 +240,8 @@ /datum/supply_pack/munitions/weaponry_apidean name = "Apidean Weaponry Crate" contains = list( - /obj/item/gun/projectile/apinae_stinger = 1, - /obj/item/gun/projectile/apinae_pistol = 2, + /obj/item/gun/ballistic/apinae_stinger = 1, + /obj/item/gun/ballistic/apinae_pistol = 2, /obj/item/grenade/spawnergrenade/manhacks/apidean = 3 ) cost = 150 @@ -253,9 +253,9 @@ name = "Tyrmalin Weaponry Crate" contains = list( /obj/item/gun/energy/ermitter = 1, - /obj/item/gun/projectile/rocket/tyrmalin = 1, + /obj/item/gun/ballistic/rocket/tyrmalin = 1, /obj/item/ammo_casing/rocket/weak = 2, - /obj/item/gun/projectile/pirate/junker_pistol = 2, + /obj/item/gun/ballistic/pirate/junker_pistol = 2, /obj/item/gun/energy/ionrifle/pistol/tyrmalin = 1 ) cost = 175 diff --git a/code/modules/cargo/supplypacks/recreation.dm b/code/modules/cargo/supplypacks/recreation.dm index e03f9ef6692..629bf08af9f 100644 --- a/code/modules/cargo/supplypacks/recreation.dm +++ b/code/modules/cargo/supplypacks/recreation.dm @@ -200,8 +200,8 @@ /datum/supply_pack/recreation/donksoft_exotic name = "DONKsoft Exotic Weaponry Bundle" contains = list( - /obj/item/gun/projectile/automatic/c20r/foam = 2, - /obj/item/gun/projectile/automatic/l6_saw/foam = 1, + /obj/item/gun/ballistic/automatic/c20r/foam = 2, + /obj/item/gun/ballistic/automatic/l6_saw/foam = 1, /obj/item/ammo_magazine/mfoam/c20 = 4, /obj/item/ammo_magazine/mfoam/lmg = 2, /obj/item/material/twohanded/spear/foam = 2, diff --git a/code/modules/cargo/supplypacks/security.dm b/code/modules/cargo/supplypacks/security.dm index 5b232223c70..9cd41c61c85 100644 --- a/code/modules/cargo/supplypacks/security.dm +++ b/code/modules/cargo/supplypacks/security.dm @@ -659,7 +659,7 @@ /datum/supply_pack/security/battlerifle name = "Battle Rifle Pack" contains = list( - /obj/item/gun/projectile/automatic/battlerifle = 2, + /obj/item/gun/ballistic/automatic/battlerifle = 2, /obj/item/ammo_magazine/m95 = 4 ) cost = 60 @@ -669,7 +669,7 @@ /datum/supply_pack/security/quadshot name = "Quad Shotgun Pack" contains = list( - /obj/item/gun/projectile/shotgun/doublebarrel/quad = 2, + /obj/item/gun/ballistic/shotgun/doublebarrel/quad = 2, /obj/item/storage/box/shotgunshells = 2, /obj/item/storage/belt/security/tactical/bandolier = 2, ) diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm index ffdb25784a4..b5e3ac2f233 100644 --- a/code/modules/clothing/spacesuits/miscellaneous.dm +++ b/code/modules/clothing/spacesuits/miscellaneous.dm @@ -22,7 +22,7 @@ permeability_coefficient = 0.02 clothing_flags = 0 body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS - allowed = list(/obj/item/tank/emergency/oxygen, /obj/item/flashlight,/obj/item/gun/energy, /obj/item/gun/projectile, /obj/item/ammo_magazine, /obj/item/ammo_casing, /obj/item/melee/baton,/obj/item/handcuffs) + allowed = list(/obj/item/tank/emergency/oxygen, /obj/item/flashlight,/obj/item/gun/energy, /obj/item/gun/ballistic, /obj/item/ammo_magazine, /obj/item/ammo_casing, /obj/item/melee/baton,/obj/item/handcuffs) slowdown = 1.5 armor = list(melee = 65, bullet = 50, laser = 50, energy = 25, bomb = 50, bio = 100, rad = 50) flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 9af79721e40..48f3241651a 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -1,5 +1,5 @@ /obj/item/clothing/suit/armor - allowed = list(/obj/item/gun/projectile/sec/flash, /obj/item/gun/energy,/obj/item/reagent_containers/spray/pepper,/obj/item/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/handcuffs,/obj/item/flashlight/maglight,/obj/item/clothing/head/helmet) + allowed = list(/obj/item/gun/ballistic/sec/flash, /obj/item/gun/energy,/obj/item/reagent_containers/spray/pepper,/obj/item/gun/ballistic,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/handcuffs,/obj/item/flashlight/maglight,/obj/item/clothing/head/helmet) body_parts_covered = UPPER_TORSO|LOWER_TORSO clothing_flags = THICKMATERIAL valid_accessory_slots = (\ @@ -502,7 +502,7 @@ item_state_slots = list(SLOT_ID_RIGHT_HAND = "armor", SLOT_ID_LEFT_HAND = "armor") w_class = ITEMSIZE_LARGE//bulky item body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS - allowed = list(/obj/item/gun/projectile/sec/flash, /obj/item/gun/energy,/obj/item/melee/baton,/obj/item/handcuffs,/obj/item/tank/emergency/oxygen,/obj/item/clothing/head/helmet) + allowed = list(/obj/item/gun/ballistic/sec/flash, /obj/item/gun/energy,/obj/item/melee/baton,/obj/item/handcuffs,/obj/item/tank/emergency/oxygen,/obj/item/clothing/head/helmet) flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETIE|HIDEHOLSTER cold_protection = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE diff --git a/code/modules/clothing/suits/hooded.dm b/code/modules/clothing/suits/hooded.dm index 68bc988a87c..d4c8458bbb3 100644 --- a/code/modules/clothing/suits/hooded.dm +++ b/code/modules/clothing/suits/hooded.dm @@ -158,7 +158,7 @@ hoodtype = /obj/item/clothing/head/hood/winter/captain allowed = list (/obj/item/pen, /obj/item/paper, /obj/item/flashlight,/obj/item/tank/emergency/oxygen, /obj/item/storage/fancy/cigarettes, /obj/item/storage/box/matches, /obj/item/reagent_containers/food/drinks/flask, /obj/item/suit_cooling_unit, /obj/item/gun/energy, - /obj/item/reagent_containers/spray/pepper,/obj/item/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton, + /obj/item/reagent_containers/spray/pepper,/obj/item/gun/ballistic,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton, /obj/item/handcuffs,/obj/item/clothing/head/helmet) /obj/item/clothing/suit/storage/hooded/wintercoat/captain/hop @@ -177,7 +177,7 @@ hoodtype = /obj/item/clothing/head/hood/winter/security allowed = list (/obj/item/pen, /obj/item/paper, /obj/item/flashlight,/obj/item/tank/emergency/oxygen, /obj/item/storage/fancy/cigarettes, /obj/item/storage/box/matches, /obj/item/reagent_containers/food/drinks/flask, /obj/item/suit_cooling_unit, /obj/item/gun/energy, - /obj/item/reagent_containers/spray/pepper,/obj/item/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton, + /obj/item/reagent_containers/spray/pepper,/obj/item/gun/ballistic,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton, /obj/item/handcuffs,/obj/item/clothing/head/helmet) /obj/item/clothing/suit/storage/hooded/wintercoat/security/hos @@ -445,7 +445,7 @@ /obj/item/tank, /obj/item/radio, /obj/item/pickaxe, - /obj/item/gun/projectile/sec/flash + /obj/item/gun/ballistic/sec/flash ) /obj/item/clothing/suit/storage/hooded/miner @@ -489,7 +489,7 @@ armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0) allowed = list (/obj/item/pen, /obj/item/paper, /obj/item/flashlight,/obj/item/tank/emergency/oxygen, /obj/item/storage/fancy/cigarettes, /obj/item/storage/box/matches, /obj/item/reagent_containers/food/drinks/flask, /obj/item/suit_cooling_unit, /obj/item/gun/energy, - /obj/item/gun/projectile, /obj/item/ammo_magazine, /obj/item/melee/baton) + /obj/item/gun/ballistic, /obj/item/ammo_magazine, /obj/item/melee/baton) /obj/item/clothing/suit/storage/hooded/runner name = "Runner Jacket" @@ -503,7 +503,7 @@ armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0) allowed = list (/obj/item/pen, /obj/item/paper, /obj/item/flashlight,/obj/item/tank/emergency/oxygen, /obj/item/storage/fancy/cigarettes, /obj/item/storage/box/matches, /obj/item/reagent_containers/food/drinks/flask, /obj/item/suit_cooling_unit, /obj/item/gun/energy, - /obj/item/gun/projectile, /obj/item/ammo_magazine, /obj/item/melee/baton) + /obj/item/gun/ballistic, /obj/item/ammo_magazine, /obj/item/melee/baton) /obj/item/clothing/suit/storage/hooded/runner/half_pint name = "Half-Pint Jacket" diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index 37474db3371..e47594aa608 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -115,7 +115,7 @@ blood_overlay_type = "coat" body_parts_covered = UPPER_TORSO|ARMS flags_inv = HIDEHOLSTER - allowed = list(/obj/item/gun/projectile/sec/flash, /obj/item/tank/emergency/oxygen, /obj/item/flashlight, /obj/item/gun/energy, /obj/item/gun/projectile, /obj/item/ammo_magazine, + allowed = list(/obj/item/gun/ballistic/sec/flash, /obj/item/tank/emergency/oxygen, /obj/item/flashlight, /obj/item/gun/energy, /obj/item/gun/ballistic, /obj/item/ammo_magazine, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/handcuffs, /obj/item/storage/fancy/cigarettes, /obj/item/flame/lighter, /obj/item/tape_recorder, /obj/item/uv_light) armor = list(melee = 10, bullet = 10, laser = 15, energy = 10, bomb = 0, bio = 0, rad = 0) @@ -132,7 +132,7 @@ desc = "A forensics technician jacket." body_parts_covered = UPPER_TORSO|ARMS flags_inv = HIDEHOLSTER - allowed = list(/obj/item/gun/projectile/sec/flash, /obj/item/tank/emergency/oxygen, /obj/item/flashlight, /obj/item/gun/energy, /obj/item/gun/projectile, /obj/item/ammo_magazine, + allowed = list(/obj/item/gun/ballistic/sec/flash, /obj/item/tank/emergency/oxygen, /obj/item/flashlight, /obj/item/gun/energy, /obj/item/gun/ballistic, /obj/item/ammo_magazine, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/handcuffs, /obj/item/storage/fancy/cigarettes, /obj/item/flame/lighter, /obj/item/tape_recorder, /obj/item/uv_light) armor = list(melee = 10, bullet = 10, laser = 15, energy = 10, bomb = 0, bio = 0, rad = 0) diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index f8f6ae1d6fb..cc33c9609d4 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -367,7 +367,7 @@ desc = "A rugged canvas trenchcoat, designed and created by TX Fabrication Corp. The coat appears to have its kevlar lining removed." icon_state = "detective" blood_overlay_type = "coat" - allowed = list(/obj/item/gun/projectile/sec/flash, /obj/item/tank/emergency/oxygen, /obj/item/flashlight,/obj/item/gun/energy,/obj/item/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/handcuffs,/obj/item/storage/fancy/cigarettes,/obj/item/flame/lighter,/obj/item/tape_recorder,/obj/item/uv_light) + allowed = list(/obj/item/gun/ballistic/sec/flash, /obj/item/tank/emergency/oxygen, /obj/item/flashlight,/obj/item/gun/energy,/obj/item/gun/ballistic,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/handcuffs,/obj/item/storage/fancy/cigarettes,/obj/item/flame/lighter,/obj/item/tape_recorder,/obj/item/uv_light) flags_inv = HIDEHOLSTER /obj/item/clothing/suit/storage/trench/grey @@ -389,7 +389,7 @@ desc = "A duster commonly seen on cowboys from Earth's late 1800's." icon_state = "duster" blood_overlay_type = "coat" - allowed = list(/obj/item/gun/projectile/sec/flash, /obj/item/tank/emergency/oxygen, /obj/item/flashlight,/obj/item/gun/energy,/obj/item/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/handcuffs,/obj/item/storage/fancy/cigarettes,/obj/item/flame/lighter) + allowed = list(/obj/item/gun/ballistic/sec/flash, /obj/item/tank/emergency/oxygen, /obj/item/flashlight,/obj/item/gun/energy,/obj/item/gun/ballistic,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/handcuffs,/obj/item/storage/fancy/cigarettes,/obj/item/flame/lighter) flags_inv = HIDEHOLSTER /obj/item/clothing/suit/storage/toggle/cardigan @@ -412,7 +412,7 @@ desc = "A sleek black trenchcoat, paired with a stylish red scarf. Worn either by the coolest, or the weirdest." icon_state = "gothcoat" blood_overlay_type = "coat" - allowed = list(/obj/item/gun/projectile/sec/flash, /obj/item/tank/emergency/oxygen, /obj/item/flashlight,/obj/item/gun/energy,/obj/item/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/handcuffs,/obj/item/storage/fancy/cigarettes,/obj/item/flame/lighter,/obj/item/tape_recorder,/obj/item/uv_light) + allowed = list(/obj/item/gun/ballistic/sec/flash, /obj/item/tank/emergency/oxygen, /obj/item/flashlight,/obj/item/gun/energy,/obj/item/gun/ballistic,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/handcuffs,/obj/item/storage/fancy/cigarettes,/obj/item/flame/lighter,/obj/item/tape_recorder,/obj/item/uv_light) flags_inv = HIDEHOLSTER /obj/item/clothing/suit/storage/toggle/navy_coat_blue @@ -420,7 +420,7 @@ desc = "A coat to show off your mandatory enrollment for those sweet, sweet 5% tax savings and stickers. Who sails a boat nowadays, anyway? This one is blue, which is not what the ocean's color is anymore." icon_state = "blue_navy_jacket" blood_overlay_type = "coat" - allowed = list(/obj/item/gun/projectile/sec/flash, /obj/item/tank/emergency/oxygen, /obj/item/flashlight,/obj/item/gun/energy,/obj/item/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/handcuffs,/obj/item/storage/fancy/cigarettes,/obj/item/flame/lighter,/obj/item/tape_recorder,/obj/item/uv_light) + allowed = list(/obj/item/gun/ballistic/sec/flash, /obj/item/tank/emergency/oxygen, /obj/item/flashlight,/obj/item/gun/energy,/obj/item/gun/ballistic,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/handcuffs,/obj/item/storage/fancy/cigarettes,/obj/item/flame/lighter,/obj/item/tape_recorder,/obj/item/uv_light) flags_inv = HIDEHOLSTER /obj/item/clothing/suit/storage/toggle/navy_coat_brown @@ -428,7 +428,7 @@ desc = "A coat to show off your mandatory enrollment for those sweet, sweet 5% tax savings and stickers. Who sails a boat nowadays, anyway? This one is brown, which makes you feel like you're back in the rust-colored oceans." icon_state = "brown_navy_jacket" blood_overlay_type = "coat" - allowed = list(/obj/item/gun/projectile/sec/flash, /obj/item/tank/emergency/oxygen, /obj/item/flashlight,/obj/item/gun/energy,/obj/item/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/handcuffs,/obj/item/storage/fancy/cigarettes,/obj/item/flame/lighter,/obj/item/tape_recorder,/obj/item/uv_light) + allowed = list(/obj/item/gun/ballistic/sec/flash, /obj/item/tank/emergency/oxygen, /obj/item/flashlight,/obj/item/gun/energy,/obj/item/gun/ballistic,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/handcuffs,/obj/item/storage/fancy/cigarettes,/obj/item/flame/lighter,/obj/item/tape_recorder,/obj/item/uv_light) flags_inv = HIDEHOLSTER /obj/item/clothing/suit/storage/toggle/navy_coat_green @@ -436,7 +436,7 @@ desc = "A coat to show off your mandatory enrollment for those sweet, sweet 5% tax savings and stickers. Who sails a boat nowadays, anyway? This one is green, like the 'vegan rations' you were dared to eat. It was actually bottom-deck gunk. It smelled nicer than this coat." icon_state = "green_navy_jacket" blood_overlay_type = "coat" - allowed = list(/obj/item/gun/projectile/sec/flash, /obj/item/tank/emergency/oxygen, /obj/item/flashlight,/obj/item/gun/energy,/obj/item/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/handcuffs,/obj/item/storage/fancy/cigarettes,/obj/item/flame/lighter,/obj/item/tape_recorder,/obj/item/uv_light) + allowed = list(/obj/item/gun/ballistic/sec/flash, /obj/item/tank/emergency/oxygen, /obj/item/flashlight,/obj/item/gun/energy,/obj/item/gun/ballistic,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/handcuffs,/obj/item/storage/fancy/cigarettes,/obj/item/flame/lighter,/obj/item/tape_recorder,/obj/item/uv_light) flags_inv = HIDEHOLSTER /obj/item/clothing/suit/storage/stripe_jacket @@ -444,7 +444,7 @@ desc = "A high collar, a gaudy stripe, clasps that don't actually work. All the ingredients to a fashionable clown! Trust me, they are /definitely/ laughing at your jokes, and not you." icon_state = "stripe_jacket" blood_overlay_type = "coat" - allowed = list(/obj/item/gun/projectile/sec/flash, /obj/item/tank/emergency/oxygen, /obj/item/flashlight,/obj/item/gun/energy,/obj/item/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/handcuffs,/obj/item/storage/fancy/cigarettes,/obj/item/flame/lighter,/obj/item/tape_recorder,/obj/item/uv_light) + allowed = list(/obj/item/gun/ballistic/sec/flash, /obj/item/tank/emergency/oxygen, /obj/item/flashlight,/obj/item/gun/energy,/obj/item/gun/ballistic,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/handcuffs,/obj/item/storage/fancy/cigarettes,/obj/item/flame/lighter,/obj/item/tape_recorder,/obj/item/uv_light) flags_inv = HIDEHOLSTER /* * stripper @@ -551,7 +551,7 @@ desc = "A thick, well-worn WW2 leather bomber jacket." icon_state = "bomber" item_state_slots = list(SLOT_ID_RIGHT_HAND = "brown_jacket", SLOT_ID_LEFT_HAND = "brown_jacket") - allowed = list (/obj/item/gun/projectile/sec/flash, /obj/item/pen, /obj/item/paper, /obj/item/flashlight, /obj/item/tank/emergency/oxygen, /obj/item/storage/fancy/cigarettes, /obj/item/storage/box/matches, /obj/item/reagent_containers/food/drinks/flask) + allowed = list (/obj/item/gun/ballistic/sec/flash, /obj/item/pen, /obj/item/paper, /obj/item/flashlight, /obj/item/tank/emergency/oxygen, /obj/item/storage/fancy/cigarettes, /obj/item/storage/box/matches, /obj/item/reagent_containers/food/drinks/flask) body_parts_covered = UPPER_TORSO|ARMS flags_inv = HIDEHOLSTER cold_protection = UPPER_TORSO|ARMS @@ -573,7 +573,7 @@ name = "leather jacket" desc = "A black leather coat." icon_state = "leather_jacket" - allowed = list (/obj/item/gun/projectile/sec/flash, /obj/item/pen, /obj/item/paper, /obj/item/flashlight, /obj/item/tank/emergency/oxygen, /obj/item/storage/fancy/cigarettes, /obj/item/storage/box/matches, /obj/item/reagent_containers/food/drinks/flask) + allowed = list (/obj/item/gun/ballistic/sec/flash, /obj/item/pen, /obj/item/paper, /obj/item/flashlight, /obj/item/tank/emergency/oxygen, /obj/item/storage/fancy/cigarettes, /obj/item/storage/box/matches, /obj/item/reagent_containers/food/drinks/flask) body_parts_covered = UPPER_TORSO|ARMS flags_inv = HIDEHOLSTER @@ -956,7 +956,7 @@ cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0) - allowed = list (/obj/item/gun/projectile/sec/flash, /obj/item/pen, /obj/item/paper, /obj/item/flashlight,/obj/item/tank/emergency/oxygen, /obj/item/storage/fancy/cigarettes, /obj/item/storage/box/matches, /obj/item/reagent_containers/food/drinks/flask) + allowed = list (/obj/item/gun/ballistic/sec/flash, /obj/item/pen, /obj/item/paper, /obj/item/flashlight,/obj/item/tank/emergency/oxygen, /obj/item/storage/fancy/cigarettes, /obj/item/storage/box/matches, /obj/item/reagent_containers/food/drinks/flask) /obj/item/clothing/suit/storage/snowsuit/command name = "command snowsuit" @@ -1041,7 +1041,7 @@ /obj/item/tank/emergency/oxygen, /obj/item/flashlight, /obj/item/gun/energy, - /obj/item/gun/projectile, + /obj/item/gun/ballistic, /obj/item/ammo_magazine, /obj/item/ammo_casing, // /obj/item/storage/fancy/shotgun_ammo, @@ -1099,7 +1099,7 @@ /obj/item/tank/emergency/oxygen, /obj/item/flashlight, /obj/item/gun/energy, - /obj/item/gun/projectile, + /obj/item/gun/ballistic, /obj/item/ammo_magazine, /obj/item/ammo_casing, // /obj/item/storage/fancy/shotgun_ammo, diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm index 8a0d994708b..8b8cea78b25 100644 --- a/code/modules/clothing/suits/utility.dm +++ b/code/modules/clothing/suits/utility.dm @@ -71,7 +71,7 @@ /obj/item/clothing/suit/bomb_suit/security icon_state = "bombsuitsec" - allowed = list(/obj/item/gun/projectile/sec/flash, /obj/item/gun/energy,/obj/item/melee/baton,/obj/item/handcuffs) + allowed = list(/obj/item/gun/ballistic/sec/flash, /obj/item/gun/energy,/obj/item/melee/baton,/obj/item/handcuffs) body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS /* diff --git a/code/modules/clothing/under/accessories/clothing.dm b/code/modules/clothing/under/accessories/clothing.dm index 313049a5cf5..3652c6042d0 100644 --- a/code/modules/clothing/under/accessories/clothing.dm +++ b/code/modules/clothing/under/accessories/clothing.dm @@ -132,7 +132,7 @@ item_state = "roughcloak" allowed = list (/obj/item/pen, /obj/item/paper, /obj/item/flashlight,/obj/item/tank/emergency/oxygen, /obj/item/storage/fancy/cigarettes, /obj/item/storage/box/matches, /obj/item/reagent_containers/food/drinks/flask, /obj/item/suit_cooling_unit, /obj/item/gun/energy, - /obj/item/gun/projectile, /obj/item/ammo_magazine, /obj/item/melee/baton) + /obj/item/gun/ballistic, /obj/item/ammo_magazine, /obj/item/melee/baton) action_button_name = "Adjust Cloak" /obj/item/clothing/accessory/poncho/rough_cloak/attack_self(mob/user as mob) diff --git a/code/modules/examine/descriptions/weapons.dm b/code/modules/examine/descriptions/weapons.dm index 27cf5e30884..5f381d332ec 100644 --- a/code/modules/examine/descriptions/weapons.dm +++ b/code/modules/examine/descriptions/weapons.dm @@ -48,7 +48,7 @@ then click where you want to fire. Most energy weapons can fire through windows harmlessly. To recharge this weapon, use a weapon recharger. \ To use the scope, use the appropriate verb in the object tab." -/obj/item/gun/projectile +/obj/item/gun/ballistic description_info = "This is a ballistic weapon. To fire the weapon, ensure your intent is *not* set to 'help', have your gun mode set to 'fire', \ then click where you want to fire. To reload, click the weapon in your hand to unload (if needed), then add the appropriate ammo. The description \ will tell you what caliber you need." @@ -64,12 +64,12 @@ var/obj/O = gun_choices[picked] description_info = initial(O.description_info) -/obj/item/gun/projectile/shotgun/pump +/obj/item/gun/ballistic/shotgun/pump description_info = "This is a ballistic weapon. To fire the weapon, ensure your intent is *not* set to 'help', have your gun mode set to 'fire', \ then click where you want to fire. After firing, you will need to pump the gun, by clicking on the gun in your hand. To reload, load more shotgun \ shells into the gun." -/obj/item/gun/projectile/heavysniper +/obj/item/gun/ballistic/heavysniper description_info = "This is a ballistic weapon. To fire the weapon, ensure your intent is *not* set to 'help', have your gun mode set to 'fire', \ then click where you want to fire. The gun's chamber can be opened or closed by using it in your hand. To reload, open the chamber, add a new bullet \ then close it. To use the scope, use the appropriate verb in the object tab." diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm index e0d4d17198e..6f7c5a586b9 100644 --- a/code/modules/flufftext/Hallucination.dm +++ b/code/modules/flufftext/Hallucination.dm @@ -328,7 +328,7 @@ proc/check_panel(mob/M) qdel(O) return -GLOBAL_LIST_INIT(non_fakeattack_weapons, list(/obj/item/gun/projectile, /obj/item/ammo_magazine/s357,\ +GLOBAL_LIST_INIT(non_fakeattack_weapons, list(/obj/item/gun/ballistic, /obj/item/ammo_magazine/s357,\ /obj/item/gun/energy/crossbow, /obj/item/melee/energy/sword,\ /obj/item/storage/box/syndicate, /obj/item/storage/box/emps,\ /obj/item/cartridge/syndicate, /obj/item/clothing/under/chameleon,\ diff --git a/code/modules/ghostroles/roles/ashlander.dm b/code/modules/ghostroles/roles/ashlander.dm index 4b6d954c85e..874bd73fbdf 100644 --- a/code/modules/ghostroles/roles/ashlander.dm +++ b/code/modules/ghostroles/roles/ashlander.dm @@ -68,7 +68,7 @@ outfit.uniform = /obj/item/clothing/under/gladiator/ashlander outfit.head = /obj/item/clothing/head/helmet/gladiator/ashlander outfit.shoes = /obj/item/clothing/shoes/ashwalker - outfit.back = /obj/item/gun/projectile/bow/ashen + outfit.back = /obj/item/gun/ballistic/bow/ashen outfit.belt = /obj/item/storage/belt/quiver/full/ash outfit.r_hand = /obj/item/material/knife/tacknife/combatknife/bone if("exile") @@ -80,7 +80,7 @@ outfit.shoes = /obj/item/clothing/shoes/ashwalker outfit.belt = /obj/item/reagent_containers/glass/powder_horn/tribal outfit.back = /obj/item/storage/backpack/satchel/bone - outfit.r_hand = /obj/item/gun/projectile/musket/tribal + outfit.r_hand = /obj/item/gun/ballistic/musket/tribal outfit.l_hand = /obj/item/storage/box/munition_box return outfit diff --git a/code/modules/holidays/halloween_loadout_masquarade.dm b/code/modules/holidays/halloween_loadout_masquarade.dm index 8b58aa6d03c..363abae9cfc 100644 --- a/code/modules/holidays/halloween_loadout_masquarade.dm +++ b/code/modules/holidays/halloween_loadout_masquarade.dm @@ -168,7 +168,7 @@ /datum/gear/seasonal/masquarade/syndicate/revolver display_name = ".357 revolver (capgun)" - path = /obj/item/gun/projectile/revolver/capgun + path = /obj/item/gun/ballistic/revolver/capgun /** * changeling diff --git a/code/modules/maps/away_missions/archive/stationCollision.dm b/code/modules/maps/away_missions/archive/stationCollision.dm index a42c803c8e6..0c83698a6e7 100644 --- a/code/modules/maps/away_missions/archive/stationCollision.dm +++ b/code/modules/maps/away_missions/archive/stationCollision.dm @@ -70,28 +70,28 @@ obj/item/gun/energy/laser/retro/sc_retro //clumsy_check = 0 //No sense in having a harmless gun blow up in the clowns face //Syndicate silenced pistol. This definition is not necessary, it's just habit. -/obj/item/gun/projectile/silenced/sc_silenced +/obj/item/gun/ballistic/silenced/sc_silenced //Make it so that these guns only spawn with a couple bullets... if any -/obj/item/gun/projectile/silenced/sc_silenced/Initialize(mapload, starts_loaded) +/obj/item/gun/ballistic/silenced/sc_silenced/Initialize(mapload, starts_loaded) . = ..() for(var/ammo in loaded) if(prob(95)) //95% chance loaded -= ammo //Syndicate sub-machine guns. -/obj/item/gun/projectile/automatic/c20r/sc_c20r +/obj/item/gun/ballistic/automatic/c20r/sc_c20r -/obj/item/gun/projectile/automatic/c20r/sc_c20r/Initialize(mapload, starts_loaded) +/obj/item/gun/ballistic/automatic/c20r/sc_c20r/Initialize(mapload, starts_loaded) . = ..() for(var/ammo in loaded) if(prob(95)) //95% chance loaded -= ammo //Barman's shotgun -/obj/item/gun/projectile/shotgun/pump/sc_pump +/obj/item/gun/ballistic/shotgun/pump/sc_pump -/obj/item/gun/projectile/shotgun/pump/sc_pump/Initialize(mapload, starts_loaded) +/obj/item/gun/ballistic/shotgun/pump/sc_pump/Initialize(mapload, starts_loaded) . = ..() for(var/ammo in loaded) if(prob(95)) //95% chance diff --git a/code/modules/mob/living/simple_mob/subtypes/humanoid/clown.dm b/code/modules/mob/living/simple_mob/subtypes/humanoid/clown.dm index e31e75992a0..09ed92eb2ee 100644 --- a/code/modules/mob/living/simple_mob/subtypes/humanoid/clown.dm +++ b/code/modules/mob/living/simple_mob/subtypes/humanoid/clown.dm @@ -189,7 +189,7 @@ needs_reload = TRUE reload_max = 12 ai_holder_type = /datum/ai_holder/simple_mob/merc/ranged - loot_list = list(/obj/item/gun/projectile/clown_pistol = 100, + loot_list = list(/obj/item/gun/ballistic/clown_pistol = 100, /obj/item/ammo_magazine/mcompressedbio = 30, /obj/item/ammo_magazine/mcompressedbio = 30 ) @@ -266,7 +266,7 @@ minbodytemp = 0 corpse = /obj/spawner/corpse/clown/clownop/space - loot_list = list(/obj/item/gun/projectile/automatic/clown_rifle = 100, + loot_list = list(/obj/item/gun/ballistic/automatic/clown_rifle = 100, /obj/item/ammo_magazine/mcompressedbio/large/banana = 30, /obj/item/ammo_magazine/mcompressedbio/large/banana = 30 ) diff --git a/code/modules/mob/living/simple_mob/subtypes/humanoid/cultist.dm b/code/modules/mob/living/simple_mob/subtypes/humanoid/cultist.dm index f9fb0f51e7e..c3d41f4417d 100644 --- a/code/modules/mob/living/simple_mob/subtypes/humanoid/cultist.dm +++ b/code/modules/mob/living/simple_mob/subtypes/humanoid/cultist.dm @@ -643,7 +643,7 @@ base_attack_cooldown = 7.5 - loot_list = list(/obj/item/material/butterfly/saw = 100, /obj/item/gun/projectile/shotgun/doublebarrel/sawn/alt = 100) + loot_list = list(/obj/item/material/butterfly/saw = 100, /obj/item/gun/ballistic/shotgun/doublebarrel/sawn/alt = 100) needs_reload = TRUE reload_max = 2 diff --git a/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs.dm b/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs.dm index e70f2b15746..c9e7952483b 100644 --- a/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs.dm +++ b/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs.dm @@ -194,7 +194,7 @@ projectiletype = /obj/item/projectile/bullet/pistol/medium // casingtype = /obj/item/ammo_casing/spent //Makes infinite stacks of bullets when put in PoIs. projectilesound = 'sound/weapons/Gunshot_light.ogg' - loot_list = list(/obj/item/gun/projectile/colt = 100) + loot_list = list(/obj/item/gun/ballistic/colt = 100) needs_reload = TRUE reload_max = 7 // Not the best default, but it fits the pistol @@ -207,7 +207,7 @@ icon_state = "syndicateranged_smg" icon_living = "syndicateranged_smg" - loot_list = list(/obj/item/gun/projectile/automatic/c20r = 100) + loot_list = list(/obj/item/gun/ballistic/automatic/c20r = 100) ai_holder_type = /datum/ai_holder/simple_mob/merc/ranged/surpressor @@ -229,7 +229,7 @@ catalogue_data = list(/datum/category_item/catalogue/fauna/mercenary/human/peacekeeper) corpse = /obj/spawner/corpse/solarpeacekeeper - loot_list = list(/obj/item/gun/projectile/automatic/c20r = 100) + loot_list = list(/obj/item/gun/ballistic/automatic/c20r = 100) base_attack_cooldown = 5 // Two attacks a second or so. reload_max = 20 @@ -269,7 +269,7 @@ projectiletype = /obj/item/projectile/bullet/rifle/a762 projectilesound = 'sound/weapons/Gunshot_heavy.ogg' - loot_list = list(/obj/item/gun/projectile/garand = 100) + loot_list = list(/obj/item/gun/ballistic/garand = 100) reload_max = 8 reload_time = 2 // It takes a bit to jam a stripper clip into the rifle. @@ -282,7 +282,7 @@ icon_living = "syndicate_handcannon" projectiletype = /obj/item/projectile/bullet/pistol/strong projectilesound = 'sound/weapons/Gunshot_deagle.ogg' - loot_list = list(/obj/item/gun/projectile/deagle = 100) + loot_list = list(/obj/item/gun/ballistic/deagle = 100) needs_reload = TRUE reload_max = 7 // Deagle Reload @@ -306,7 +306,7 @@ projectilesound = 'sound/weapons/Gunshot_shotgun.ogg' catalogue_data = list(/datum/category_item/catalogue/fauna/mercenary/human/grenadier) - loot_list = list(/obj/item/gun/projectile/shotgun/pump = 100) + loot_list = list(/obj/item/gun/ballistic/shotgun/pump = 100) reload_max = 4 reload_time = 1.5 SECONDS // It's a shotgun, it takes a moment @@ -379,7 +379,7 @@ base_attack_cooldown = 5 // Two attacks a second or so. reload_max = 20 - loot_list = list(/obj/item/gun/projectile/automatic/c20r = 100) + loot_list = list(/obj/item/gun/ballistic/automatic/c20r = 100) /mob/living/simple_mob/humanoid/merc/ranged/space/Process_Spacemove(var/check_drift = 0) return @@ -398,7 +398,7 @@ projectiletype = /obj/item/projectile/bullet/pellet/shotgun // Buckshot projectilesound = 'sound/weapons/Gunshot_shotgun.ogg' - loot_list = list(/obj/item/gun/projectile/shotgun/pump/combat = 100) + loot_list = list(/obj/item/gun/ballistic/shotgun/pump/combat = 100) //Auto-Shotgun Space Merc /mob/living/simple_mob/humanoid/merc/ranged/space/shotgun/auto @@ -413,7 +413,7 @@ projectiletype = /obj/item/projectile/bullet/pellet/shotgun // Buckshot projectilesound = 'sound/weapons/Gunshot_shotgun.ogg' - loot_list = list(/obj/item/gun/projectile/automatic/as24 = 100) + loot_list = list(/obj/item/gun/ballistic/automatic/as24 = 100) ai_holder_type = /datum/ai_holder/simple_mob/merc/ranged/surpressor @@ -430,7 +430,7 @@ projectiletype = /obj/item/projectile/bullet/rifle/a545 projectilesound = 'sound/weapons/Gunshot_light.ogg' - loot_list = list(/obj/item/gun/projectile/automatic/l6_saw = 100) + loot_list = list(/obj/item/gun/ballistic/automatic/l6_saw = 100) ai_holder_type = /datum/ai_holder/simple_mob/merc/ranged/surpressor @@ -460,7 +460,7 @@ projectiletype = /obj/item/projectile/bullet/rifle/a762 projectilesound = 'sound/weapons/Gunshot_heavy.ogg' - loot_list = list(/obj/item/gun/projectile/automatic/fal = 100) + loot_list = list(/obj/item/gun/ballistic/automatic/fal = 100) reload_max = 20 @@ -618,7 +618,7 @@ minbodytemp = 0 corpse = /obj/spawner/corpse/vox/pirate - loot_list = list(/obj/item/gun/projectile/shotgun/pump/rifle/vox_hunting = 100, + loot_list = list(/obj/item/gun/ballistic/shotgun/pump/rifle/vox_hunting = 100, /obj/item/ammo_magazine/clip/c762 = 30, /obj/item/ammo_magazine/clip/c762 = 30 ) @@ -704,7 +704,7 @@ ai_holder_type = /datum/ai_holder/simple_mob/ranged/aggressive corpse = /obj/spawner/corpse/vox/boarder_r - loot_list = list(/obj/item/gun/projectile/shotgun/pump/combat = 100, + loot_list = list(/obj/item/gun/ballistic/shotgun/pump/combat = 100, /obj/item/ammo_magazine/m12gdrum = 30, /obj/item/ammo_magazine/m12gdrum = 30 ) diff --git a/code/modules/mob/living/simple_mob/subtypes/humanoid/pirates.dm b/code/modules/mob/living/simple_mob/subtypes/humanoid/pirates.dm index 502fce593fa..38ac995fa01 100644 --- a/code/modules/mob/living/simple_mob/subtypes/humanoid/pirates.dm +++ b/code/modules/mob/living/simple_mob/subtypes/humanoid/pirates.dm @@ -242,7 +242,7 @@ projectiletype = /obj/item/projectile/bullet/shotgun projectilesound = 'sound/weapons/weaponsounds_shotgunshot.ogg' - loot_list = list(/obj/item/gun/projectile/pirate = 100, /obj/item/material/knife/tacknife = 100) + loot_list = list(/obj/item/gun/ballistic/pirate = 100, /obj/item/material/knife/tacknife = 100) ai_holder_type = /datum/ai_holder/simple_mob/merc/ranged @@ -257,7 +257,7 @@ icon_living = "pirateranged-armor" movement_cooldown = 4 armor = list(melee = 30, bullet = 20, laser = 20, energy = 5, bomb = 5, bio = 100, rad = 100) - loot_list = list(/obj/item/material/knife/tacknife = 100, /obj/item/gun/projectile/pirate = 100, /obj/item/clothing/accessory/armor/armorplate/bulletproof = 100) + loot_list = list(/obj/item/material/knife/tacknife = 100, /obj/item/gun/ballistic/pirate = 100, /obj/item/clothing/accessory/armor/armorplate/bulletproof = 100) corpse = /obj/spawner/corpse/pirate/ranged_armor @@ -279,7 +279,7 @@ projectiletype = /obj/item/projectile/bullet/pellet/shotgun projectilesound = 'sound/weapons/weaponsounds_shotgunshot.ogg' - loot_list = list(/obj/item/gun/projectile/shotgun/doublebarrel/sawn = 100, /obj/item/material/knife/tacknife = 100) + loot_list = list(/obj/item/gun/ballistic/shotgun/doublebarrel/sawn = 100, /obj/item/material/knife/tacknife = 100) ai_holder_type = /datum/ai_holder/simple_mob/ranged/aggressive @@ -293,7 +293,7 @@ icon_living = "pirateranged-blunder-armor" movement_cooldown = 4 armor = list(melee = 30, bullet = 20, laser = 20, energy = 5, bomb = 5, bio = 100, rad = 100) - loot_list = list(/obj/item/material/knife/tacknife = 100, /obj/item/gun/projectile/shotgun/doublebarrel/sawn = 100, /obj/item/clothing/accessory/armor/armorplate/bulletproof = 100) + loot_list = list(/obj/item/material/knife/tacknife = 100, /obj/item/gun/ballistic/shotgun/doublebarrel/sawn = 100, /obj/item/clothing/accessory/armor/armorplate/bulletproof = 100) corpse = /obj/spawner/corpse/pirate/ranged_blunderbuss_armor @@ -421,7 +421,7 @@ projectilesound = 'sound/weapons/weaponsounds_shotgunshot.ogg' base_attack_cooldown = 5 - loot_list = list(/obj/item/gun/projectile/shotgun/doublebarrel/quad = 100, /obj/item/clothing/suit/armor/riot/alt = 100) + loot_list = list(/obj/item/gun/ballistic/shotgun/doublebarrel/quad = 100, /obj/item/clothing/suit/armor/riot/alt = 100) corpse = /obj/spawner/corpse/pirate/mate/shotgun @@ -449,7 +449,7 @@ projectilesound = 'sound/weapons/weaponsounds_heavyrifleshot.ogg' base_attack_cooldown = 10 - loot_list = list(/obj/item/gun/projectile/shotgun/pump/rifle = 100, /obj/item/clothing/suit/armor/riot/alt = 100) + loot_list = list(/obj/item/gun/ballistic/shotgun/pump/rifle = 100, /obj/item/clothing/suit/armor/riot/alt = 100) corpse = /obj/spawner/corpse/pirate/mate/rifle @@ -561,14 +561,14 @@ icon_state = "old-pirateranged" icon_living = "old-pirateranged" icon_dead = "old-piratemelee_dead" - loot_list = list(/obj/item/gun/projectile/pirate = 100, /obj/item/material/knife/tacknife = 100) + loot_list = list(/obj/item/gun/ballistic/pirate = 100, /obj/item/material/knife/tacknife = 100) ai_holder_type = /datum/ai_holder/simple_mob/merc/ranged //Armored Variant /mob/living/simple_mob/humanoid/pirate/ranged/armored/old icon_state = "old-pirateranged-armor" icon_living = "old-pirateranged-armor" - loot_list = list(/obj/item/material/knife/tacknife = 100, /obj/item/gun/projectile/pirate = 100, /obj/item/clothing/suit/armor/material/makeshift = 100) + loot_list = list(/obj/item/material/knife/tacknife = 100, /obj/item/gun/ballistic/pirate = 100, /obj/item/clothing/suit/armor/material/makeshift = 100) //Pirate Blunderbuster @@ -586,7 +586,7 @@ projectiletype = /obj/item/projectile/bullet/pellet/shotgun projectilesound = 'sound/weapons/weaponsounds_shotgunshot.ogg' - loot_list = list(/obj/item/gun/projectile/shotgun/doublebarrel/sawn = 100, /obj/item/material/knife/tacknife = 100) + loot_list = list(/obj/item/gun/ballistic/shotgun/doublebarrel/sawn = 100, /obj/item/material/knife/tacknife = 100) ai_holder_type = /datum/ai_holder/simple_mob/ranged/aggressive @@ -598,7 +598,7 @@ icon_living = "pirateranged-blunder-armor" movement_cooldown = 4 armor = list(melee = 30, bullet = 20, laser = 20, energy = 5, bomb = 5, bio = 100, rad = 100) - loot_list = list(/obj/item/material/knife/tacknife = 100, /obj/item/gun/projectile/shotgun/doublebarrel/sawn = 100, /obj/item/clothing/suit/armor/material/makeshift = 100) + loot_list = list(/obj/item/material/knife/tacknife = 100, /obj/item/gun/ballistic/shotgun/doublebarrel/sawn = 100, /obj/item/clothing/suit/armor/material/makeshift = 100) /////////////////////////////// // Pirate Ziplas @@ -715,7 +715,7 @@ projectilesound = 'sound/weapons/weaponsounds_shotgunshot.ogg' base_attack_cooldown = 5 - loot_list = list(/obj/item/gun/projectile/shotgun/doublebarrel/quad = 100, /obj/item/clothing/suit/pirate = 100) + loot_list = list(/obj/item/gun/ballistic/shotgun/doublebarrel/quad = 100, /obj/item/clothing/suit/pirate = 100) /////////////////////////////// // Mate Marksman @@ -741,7 +741,7 @@ projectilesound = 'sound/weapons/weaponsounds_heavyrifleshot.ogg' base_attack_cooldown = 10 - loot_list = list(/obj/item/gun/projectile/shotgun/pump/rifle = 100, /obj/item/clothing/suit/pirate = 100) + loot_list = list(/obj/item/gun/ballistic/shotgun/pump/rifle = 100, /obj/item/clothing/suit/pirate = 100) /////////////////////////////// // Pirate Captain diff --git a/code/modules/mob/living/simple_mob/subtypes/humanoid/russian.dm b/code/modules/mob/living/simple_mob/subtypes/humanoid/russian.dm index f27da29220f..93d63c7fa53 100644 --- a/code/modules/mob/living/simple_mob/subtypes/humanoid/russian.dm +++ b/code/modules/mob/living/simple_mob/subtypes/humanoid/russian.dm @@ -44,6 +44,6 @@ casingtype = /obj/item/ammo_casing/spent projectilesound = 'sound/weapons/Gunshot4.ogg' - loot_list = list(/obj/item/gun/projectile/revolver/mateba = 100) + loot_list = list(/obj/item/gun/ballistic/revolver/mateba = 100) corpse = /obj/spawner/corpse/russian/ranged diff --git a/code/modules/projectiles/ammunition/ammo_casing.dm b/code/modules/projectiles/ammunition/ammo_casing.dm new file mode 100644 index 00000000000..2b433f05196 --- /dev/null +++ b/code/modules/projectiles/ammunition/ammo_casing.dm @@ -0,0 +1,116 @@ +/obj/item/ammo_casing + name = "bullet casing" + desc = "A bullet casing." + icon = 'icons/obj/ammo.dmi' + icon_state = "s-casing" + slot_flags = SLOT_BELT | SLOT_EARS + throw_force = 1 + w_class = ITEMSIZE_TINY + preserve_item = 1 + drop_sound = 'sound/items/drop/ring.ogg' + pickup_sound = 'sound/items/pickup/ring.ogg' + + //! Casing + /// casing flags - see __DEFINES/projectiles/ammo_casing.dm + var/casing_flags = NONE + /// projectile type + var/projectile_type + /// stored projectile - either null for un-init'd, FALSE for empty, or an instance + VAR_PRIVATE/obj/item/projectile/stored + + //! Icon + /// switch to "[initial(state)]-spent" after expenditure + var/icon_spent = TRUE + + //! unsorted / legacy + var/leaves_residue = 1 + var/caliber = "" //Which kind of guns it can be loaded into + var/fall_sounds = list('sound/weapons/guns/casingfall1.ogg','sound/weapons/guns/casingfall2.ogg','sound/weapons/guns/casingfall3.ogg') + +/obj/item/ammo_casing/Initialize(mapload) + . = ..() + // let's like, not randomize icon state when we're not somewhere relevant, shall we? + if(isturf(loc) || istype(loc, /obj/structure/closet)) + pixel_x = rand(-10, 10) + pixel_y = rand(-10, 10) + +/obj/item/ammo_casing/Destroy() + if(stored) + QDEL_NULL(stored) + return ..() + +//removes the projectile from the ammo casing +// todo: refactor for actual on-shot or whatever +/obj/item/ammo_casing/proc/expend() + . = stored + stored = FALSE + setDir(pick(GLOB.cardinal)) //spin spent casings + update_icon() + +/obj/item/ammo_casing/screwdriver_act(obj/item/I, mob/user, flags, hint) + . = TRUE + if(!stored) + user.action_feedback(SPAN_WARNING("There is no bullet in [src] to inscribe."), src) + return + var/label_text = input(user, "Inscribe some text into [initial(stored.name)]", "Inscription", stored.name) + label_text = sanitize(label_text, MAX_NAME_LEN, extra = FALSE) + if(!label_text) + user.action_feedback(SPAN_NOTICE("You scratch the inscription off of [initial(stored.name)]."), src) + stored.name = initial(stored.name) + return + user.action_feedback(SPAN_NOTICE("You inscribe [label_text] into \the [initial(stored.name)]."), src) + stored.name = "[initial(stored.name)] (\"[label_text]\")" + +/obj/item/ammo_casing/dynamic_tool_functions(obj/item/I, mob/user) + return list(TOOL_SCREWDRIVER) + +/obj/item/ammo_casing/proc/newshot() //For energy weapons, syringe gun, shotgun shells and wands (!). + if(stored) + return + init_projectile() + +/** + * sees if we're currently loaded + */ +/obj/item/ammo_casing/proc/loaded() + return stored != FALSE + +/** + * grab projectile + */ +/obj/item/ammo_casing/proc/get_projectile() + switch(stored) + if(null) + return lazy_init_projectile() + if(FALSE) + return null + return stored + +/** + * make projectile automatically but only if we're not expended + */ +/obj/item/ammo_casing/proc/lazy_init_projectile() + if(stored == FALSE) + return null + return init_projectile() + +/** + * makes a new projectile + */ +/obj/item/ammo_casing/proc/init_projectile() + if(istype(stored)) + CRASH("double init?") + stored = new projectile_type + return stored + +/obj/item/ammo_casing/update_icon_state() + . = ..() + if(icon_spent && !loaded()) + icon_state = "[base_icon_state || initial(icon_state)]-spent" + else + icon_state = base_icon_state || icon_state + +/obj/item/ammo_casing/examine(mob/user) + . = ..() + if(!loaded()) + . += "This one is spent." diff --git a/code/modules/projectiles/ammunition/rounds.dm b/code/modules/projectiles/ammunition/rounds.dm index f765de53932..a7c9ed3cad0 100644 --- a/code/modules/projectiles/ammunition/rounds.dm +++ b/code/modules/projectiles/ammunition/rounds.dm @@ -296,10 +296,6 @@ projectile_type = /obj/item/projectile/energy/electrode/stunshot matter = list(MAT_STEEL = 360, MAT_GLASS = 720) -/obj/item/ammo_casing/a12g/stunshell/emp_act(severity) - if(prob(100/severity)) BB = null - update_icon() - //Does not stun, only blinds, but has area of effect. /obj/item/ammo_casing/a12g/flare name = "flare shell" @@ -484,7 +480,7 @@ icon_state = "casing" projectile_type = /obj/item/projectile/bullet/pistol/medium matter = list(MAT_STEEL = 180) - caseless = 1 + casing_flags = CASING_DELETE /obj/item/ammo_casing/a10x24mmcaseless/ap desc = "A 10x24mm caseless round, common during the Xenomorph wars due to its use the the battle rifles of the United Solar Marine Corps. This one was meant to shred armored targets." @@ -510,7 +506,7 @@ icon_state = "casing" // Placeholder. Should probably be purple. projectile_type = /obj/item/projectile/bullet/pistol // Close enough to be comparable. matter = list(MAT_STEEL = 180) - caseless = 1 + casing_flags = CASING_DELETE /obj/item/ammo_casing/a5mmcaseless/stun desc = "A 5mm solid phoron caseless stun round." @@ -544,7 +540,6 @@ /obj/item/ammo_casing/spent // For simple hostile mobs only, so they don't cough up usable bullets when firing. This is for literally nothing else. icon_state = "s-casing-spent" - BB = null projectile_type = null /obj/item/ammo_casing/organic @@ -572,7 +567,7 @@ caliber = "musket" projectile_type = /obj/item/projectile/bullet/musket matter = list("lead" = 100) - caseless = 1 + casing_flags = CASING_DELETE /obj/item/ammo_casing/musket/silver name = "silver musket ball" @@ -636,7 +631,7 @@ icon_state = "arrow" throw_force = 3 //good luck hitting someone with the pointy end of the arrow throw_speed = 3 - caseless = 1 + casing_flags = CASING_DELETE /obj/item/ammo_casing/arrow/wood name = "wooden arrow" @@ -676,7 +671,7 @@ icon_state = "foamdart" throw_force = 0 //good luck hitting someone with the pointy end of the arrow throw_speed = 3 - caseless = 1 + casing_flags = CASING_DELETE drop_sound = 'sound/items/drop/accessory.ogg' pickup_sound = 'sound/items/pickup/accessory.ogg' diff --git a/code/modules/projectiles/guns/projectile.dm b/code/modules/projectiles/guns/ballistic.dm similarity index 91% rename from code/modules/projectiles/guns/projectile.dm rename to code/modules/projectiles/guns/ballistic.dm index 2a4e2ec7622..730c599243b 100644 --- a/code/modules/projectiles/guns/projectile.dm +++ b/code/modules/projectiles/guns/ballistic.dm @@ -1,4 +1,4 @@ -/obj/item/gun/projectile +/obj/item/gun/ballistic name = "gun" desc = "A gun that fires bullets." icon = 'icons/obj/gun/ballistic.dmi' @@ -33,7 +33,7 @@ //var/list/icon_keys = list() //keys //var/list/ammo_states = list() //values -/obj/item/gun/projectile/Initialize(mapload, starts_loaded = TRUE) +/obj/item/gun/ballistic/Initialize(mapload, starts_loaded = TRUE) . = ..() if(starts_loaded) if(ispath(ammo_type) && (load_method & (SINGLE_CASING|SPEEDLOADER))) @@ -44,7 +44,7 @@ allowed_magazines += /obj/item/ammo_magazine/smart update_icon() -/obj/item/gun/projectile/consume_next_projectile() +/obj/item/gun/ballistic/consume_next_projectile() //get the next casing if(loaded.len) chambered = loaded[1] //load next casing. @@ -56,20 +56,20 @@ ammo_magazine.stored_ammo -= chambered if (chambered) - return chambered.BB + return chambered.get_projectile() return null -/obj/item/gun/projectile/handle_post_fire() +/obj/item/gun/ballistic/handle_post_fire() ..() if(chambered) chambered.expend() process_chambered() -/obj/item/gun/projectile/handle_click_empty() +/obj/item/gun/ballistic/handle_click_empty() ..() process_chambered() -/obj/item/gun/projectile/proc/process_chambered() +/obj/item/gun/ballistic/proc/process_chambered() if (!chambered) return // Aurora forensics port, gunpowder residue. @@ -84,7 +84,7 @@ switch(handle_casings) if(EJECT_CASINGS) //eject casing onto ground. - if(chambered.caseless) + if(chambered.casing_flags & CASING_DELETE) qdel(chambered) return else @@ -105,7 +105,7 @@ #define SPEED_RELOAD_SPEED 0.5 SECONDS //Attempts to load A into src, depending on the type of thing being loaded and the load_method //Maybe this should be broken up into separate procs for each load method? -/obj/item/gun/projectile/proc/load_ammo(obj/item/A, mob/user) +/obj/item/gun/ballistic/proc/load_ammo(obj/item/A, mob/user) if(istype(A, /obj/item/ammo_magazine)) var/obj/item/ammo_magazine/AM = A if(!(load_method & AM.mag_type) || caliber != AM.caliber || allowed_magazines && !is_type_in_list(A, allowed_magazines)) @@ -203,7 +203,7 @@ #undef SPEED_RELOAD_SPEED //attempts to unload src. If allow_dump is set to 0, the speedloader unloading method will be disabled -/obj/item/gun/projectile/proc/unload_ammo(mob/user, var/allow_dump=1) +/obj/item/gun/ballistic/proc/unload_ammo(mob/user, var/allow_dump=1) if(ammo_magazine) user.put_in_hands(ammo_magazine) user.visible_message("[user] removes [ammo_magazine] from [src].", "You remove [ammo_magazine] from [src].") @@ -232,23 +232,23 @@ to_chat(user, "[src] is empty.") update_icon() -/obj/item/gun/projectile/attackby(var/obj/item/A as obj, mob/user as mob) +/obj/item/gun/ballistic/attackby(var/obj/item/A as obj, mob/user as mob) ..() load_ammo(A, user) -/obj/item/gun/projectile/attack_self(mob/user as mob) +/obj/item/gun/ballistic/attack_self(mob/user as mob) if(firemodes.len > 1) switch_firemodes(user) else unload_ammo(user) -/obj/item/gun/projectile/attack_hand(mob/user as mob) +/obj/item/gun/ballistic/attack_hand(mob/user as mob) if(user.get_inactive_held_item() == src) unload_ammo(user, allow_dump=0) else return ..() -/obj/item/gun/projectile/afterattack(atom/A, mob/living/user) +/obj/item/gun/ballistic/afterattack(atom/A, mob/living/user) ..() if(auto_eject && ammo_magazine && ammo_magazine.stored_ammo && !ammo_magazine.stored_ammo.len) ammo_magazine.loc = get_turf(src.loc) @@ -262,14 +262,14 @@ ammo_magazine = null update_icon() //make sure to do this after unsetting ammo_magazine -/obj/item/gun/projectile/examine(mob/user) +/obj/item/gun/ballistic/examine(mob/user) . = ..() if(ammo_magazine) . += "It has \a [ammo_magazine] loaded." . += "Has [getAmmo()] round\s remaining." return -/obj/item/gun/projectile/proc/getAmmo() +/obj/item/gun/ballistic/proc/getAmmo() var/bullets = 0 if(loaded) bullets += loaded.len @@ -281,7 +281,7 @@ /* Unneeded -- so far. //in case the weapon has firemodes and can't unload using attack_hand() -/obj/item/gun/projectile/verb/unload_gun() +/obj/item/gun/ballistic/verb/unload_gun() set name = "Unload Ammo" set category = "Object" set src in usr diff --git a/code/modules/projectiles/guns/magic.dm b/code/modules/projectiles/guns/magic.dm index 5aa96935336..0135300a4aa 100644 --- a/code/modules/projectiles/guns/magic.dm +++ b/code/modules/projectiles/guns/magic.dm @@ -30,11 +30,11 @@ . = ..() /obj/item/gun/magic/proc/recharge_newshot() - if(charges && chambered && !chambered.BB) + if(charges && chambered && !chambered.get_projectile()) chambered.newshot() /obj/item/gun/magic/proc/process_chamber() - if(chambered && !chambered.BB) //if BB is null, i.e the shot has been fired... + if(chambered && !chambered.get_projectile()) //if BB is null, i.e the shot has been fired... charges--//... drain a charge recharge_newshot() @@ -62,7 +62,7 @@ return 1 /obj/item/gun/magic/consume_next_projectile() - return chambered?.BB + return chambered?.get_projectile() /obj/item/gun/magic/proc/shoot_with_empty_chamber(mob/living/user as mob|obj) to_chat(user, "The [name] whizzles quietly.") diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm index ed8669bb664..d28b3eaed6c 100644 --- a/code/modules/projectiles/guns/projectile/automatic.dm +++ b/code/modules/projectiles/guns/projectile/automatic.dm @@ -1,4 +1,4 @@ -/obj/item/gun/projectile/automatic //This should never be spawned in, it is just here because of code necessities. +/obj/item/gun/ballistic/automatic //This should never be spawned in, it is just here because of code necessities. name = "daka SMG" desc = "A small SMG. You really shouldn't be able to get this gun. Uses 9mm rounds." icon_state = "c05r" //Used because it's not used anywhere else @@ -14,7 +14,7 @@ list(mode_name="semiauto", burst=1, fire_delay=0, move_delay=null, burst_accuracy=null, dispersion=null), list(mode_name="3-round bursts", burst=3, fire_delay=null, move_delay=4, burst_accuracy=list(60,30,0), dispersion=list(0.0, 0.6, 1.0))) -/obj/item/gun/projectile/automatic/advanced_smg +/obj/item/gun/ballistic/automatic/advanced_smg name = "advanced SMG" desc = "An advanced submachine gun with a reflective laser optic that makes burst fire less inaccurate than other SMGs. Uses 9mm rounds." icon_state = "advanced_smg-empty" @@ -31,14 +31,14 @@ list(mode_name="3-round bursts", burst=3, fire_delay=null, move_delay=4, burst_accuracy=list(60,30,20), dispersion=list(0.0, 0.3, 0.6)) ) -/obj/item/gun/projectile/automatic/advanced_smg/update_icon_state() +/obj/item/gun/ballistic/automatic/advanced_smg/update_icon_state() . = ..() icon_state = (ammo_magazine)? "advanced_smg" : "advanced_smg-empty" -/obj/item/gun/projectile/automatic/advanced_smg/loaded +/obj/item/gun/ballistic/automatic/advanced_smg/loaded magazine_type = /obj/item/ammo_magazine/m9mmAdvanced -/obj/item/gun/projectile/automatic/c20r +/obj/item/gun/ballistic/automatic/c20r name = "submachine gun" desc = "The C-20r is a lightweight and rapid firing SMG, for when you REALLY need someone dead. It has 'Scarborough Arms - Per falcis, per pravitas' inscribed on the stock. Uses 10mm rounds." icon_state = "c20r" @@ -57,14 +57,14 @@ one_handed_penalty = 15 -/obj/item/gun/projectile/automatic/c20r/update_icon_state() +/obj/item/gun/ballistic/automatic/c20r/update_icon_state() . = ..() if(ammo_magazine) icon_state = "c20r-[round(ammo_magazine.stored_ammo.len,4)]" else icon_state = "c20r" -/obj/item/gun/projectile/automatic/sts35 +/obj/item/gun/ballistic/automatic/sts35 name = "assault rifle" desc = "The rugged STS-35 is a durable automatic weapon of a make popular on the frontier worlds. Uses 5.45mm rounds." icon_state = "arifle" @@ -91,19 +91,19 @@ // list(mode_name="short bursts", burst=5, fire_delay=null, move_delay=6, burst_accuracy=list(0,-15,-30,-30,-45), dispersion=list(0.6, 1.0, 1.0, 1.0, 1.2)), ) -/obj/item/gun/projectile/automatic/sts35/update_icon_state() +/obj/item/gun/ballistic/automatic/sts35/update_icon_state() . = ..() if(istype(ammo_magazine,/obj/item/ammo_magazine/m545/small)) icon_state = "arifle-small" // If using the small magazines, use the small magazine sprite. else icon_state = (ammo_magazine)? "arifle" : "arifle-empty" -/obj/item/gun/projectile/automatic/sts35/update_icon(ignore_inhands) +/obj/item/gun/ballistic/automatic/sts35/update_icon(ignore_inhands) . = ..() update_held_icon() -/obj/item/gun/projectile/automatic/wt550 +/obj/item/gun/ballistic/automatic/wt550 name = "machine pistol" desc = "The WT550 Saber is a cheap self-defense weapon mass-produced by Ward-Takahashi for paramilitary and private use. Uses 9mm rounds." icon_state = "wt550" @@ -118,17 +118,17 @@ allowed_magazines = list(/obj/item/ammo_magazine/m9mmt) projectile_type = /obj/item/projectile/bullet/pistol/medium -/obj/item/gun/projectile/automatic/wt550/update_icon_state() +/obj/item/gun/ballistic/automatic/wt550/update_icon_state() . = ..() if(ammo_magazine) icon_state = "wt550-[round(ammo_magazine.stored_ammo.len,4)]" else icon_state = "wt550" -/obj/item/gun/projectile/automatic/wt550/lethal +/obj/item/gun/ballistic/automatic/wt550/lethal magazine_type = /obj/item/ammo_magazine/m9mmt -/obj/item/gun/projectile/automatic/z8 +/obj/item/gun/ballistic/automatic/z8 name = "designated marksman rifle" desc = "The Z8 Bulldog is an older model designated marksman rifle, made by the now defunct Zendai Foundries. Makes you feel like a space marine when you hold it, even though it can only hold 10 round magazines. Uses 7.62mm rounds and has an under barrel grenade launcher." icon_state = "carbine" // This isn't a carbine. :T @@ -160,23 +160,23 @@ var/use_launcher = 0 var/obj/item/gun/launcher/grenade/underslung/launcher -/obj/item/gun/projectile/automatic/z8/Initialize(mapload) +/obj/item/gun/ballistic/automatic/z8/Initialize(mapload) . = ..() launcher = new(src) -/obj/item/gun/projectile/automatic/z8/attackby(obj/item/I, mob/user) +/obj/item/gun/ballistic/automatic/z8/attackby(obj/item/I, mob/user) if((istype(I, /obj/item/grenade))) launcher.load(I, user) else ..() -/obj/item/gun/projectile/automatic/z8/attack_hand(mob/user) +/obj/item/gun/ballistic/automatic/z8/attack_hand(mob/user) if(user.get_inactive_held_item() == src && use_launcher) launcher.unload(user) else ..() -/obj/item/gun/projectile/automatic/z8/Fire(atom/target, mob/living/user, params, pointblank=0, reflex=0) +/obj/item/gun/ballistic/automatic/z8/Fire(atom/target, mob/living/user, params, pointblank=0, reflex=0) if(use_launcher) launcher.Fire(target, user, params, pointblank, reflex) if(!launcher.chambered) @@ -184,25 +184,25 @@ else ..() -/obj/item/gun/projectile/automatic/z8/update_icon_state() +/obj/item/gun/ballistic/automatic/z8/update_icon_state() . = ..() if(ammo_magazine) icon_state = "carbine-[round(ammo_magazine.stored_ammo.len,2)]" else icon_state = "carbine" -/obj/item/gun/projectile/automatic/z8/update_icon() +/obj/item/gun/ballistic/automatic/z8/update_icon() . = ..() update_held_icon() -/obj/item/gun/projectile/automatic/z8/examine(mob/user) +/obj/item/gun/ballistic/automatic/z8/examine(mob/user) . = ..() if(launcher.chambered) . += "\The [launcher] has \a [launcher.chambered] loaded." else . += "\The [launcher] is empty." -/obj/item/gun/projectile/automatic/l6_saw +/obj/item/gun/ballistic/automatic/l6_saw name = "light machine gun" desc = "A rather traditionally made L6 SAW with a pleasantly lacquered wooden pistol grip. 'Aussec Armoury-2531' is engraved on the reciever. Uses 5.45mm rounds. It's also compatible with magazines from STS-35 assault rifles." icon_state = "l6closed100" @@ -241,35 +241,35 @@ ) */ -/obj/item/gun/projectile/automatic/l6_saw/special_check(mob/user) +/obj/item/gun/ballistic/automatic/l6_saw/special_check(mob/user) if(cover_open) to_chat(user, "[src]'s cover is open! Close it before firing!") return 0 return ..() -/obj/item/gun/projectile/automatic/l6_saw/proc/toggle_cover(mob/user) +/obj/item/gun/ballistic/automatic/l6_saw/proc/toggle_cover(mob/user) cover_open = !cover_open to_chat(user, "You [cover_open ? "open" : "close"] [src]'s cover.") update_icon() update_held_icon() -/obj/item/gun/projectile/automatic/l6_saw/attack_self(mob/user as mob) +/obj/item/gun/ballistic/automatic/l6_saw/attack_self(mob/user as mob) if(cover_open) toggle_cover(user) //close the cover else return ..() //once closed, behave like normal -/obj/item/gun/projectile/automatic/l6_saw/attack_hand(mob/user as mob) +/obj/item/gun/ballistic/automatic/l6_saw/attack_hand(mob/user as mob) if(!cover_open && user.get_inactive_held_item() == src) toggle_cover(user) //open the cover else return ..() //once open, behave like normal -/obj/item/gun/projectile/automatic/l6_saw/update_icon() +/obj/item/gun/ballistic/automatic/l6_saw/update_icon() . = ..() update_held_icon() -/obj/item/gun/projectile/automatic/l6_saw/update_icon_state() +/obj/item/gun/ballistic/automatic/l6_saw/update_icon_state() . = ..() if(istype(ammo_magazine,/obj/item/ammo_magazine/m762)) icon_state = "l6[cover_open ? "open" : "closed"]mag" @@ -278,19 +278,19 @@ icon_state = "l6[cover_open ? "open" : "closed"][ammo_magazine ? round(ammo_magazine.stored_ammo.len, 25) : "-empty"]" item_state = "l6[cover_open ? "open" : "closed"][ammo_magazine ? "" : "-empty"]" -/obj/item/gun/projectile/automatic/l6_saw/load_ammo(var/obj/item/A, mob/user) +/obj/item/gun/ballistic/automatic/l6_saw/load_ammo(var/obj/item/A, mob/user) if(!cover_open) to_chat(user, "You need to open the cover to load [src].") return ..() -/obj/item/gun/projectile/automatic/l6_saw/unload_ammo(mob/user, var/allow_dump=1) +/obj/item/gun/ballistic/automatic/l6_saw/unload_ammo(mob/user, var/allow_dump=1) if(!cover_open) to_chat(user, "You need to open the cover to unload [src].") return ..() -/obj/item/gun/projectile/automatic/as24 +/obj/item/gun/ballistic/automatic/as24 name = "automatic shotgun" desc = "The AS-24 is a rugged looking automatic shotgun produced for the military by Gurov Projectile Weapons LLC. For very obvious reasons, it's illegal to own in many juristictions. Uses 12g rounds." icon_state = "ashot" @@ -315,7 +315,7 @@ // list(mode_name="6-round bursts", burst=6, move_delay=6, burst_accuracy = list(0,-15,-15,-30,-30, -30), dispersion = list(0.6, 1.0, 1.0, 1.0, 1.2, 1.2)), ) -/obj/item/gun/projectile/automatic/as24/update_icon_state() +/obj/item/gun/ballistic/automatic/as24/update_icon_state() . = ..() if(ammo_magazine) icon_state = "ashot" @@ -323,7 +323,7 @@ icon_state = "ashot-empty" return -/obj/item/gun/projectile/automatic/mini_uzi +/obj/item/gun/ballistic/automatic/mini_uzi name = "\improper Uzi" desc = "The iconic Uzi is a lightweight, compact, fast firing machine pistol. Cybersun Industries were the last major manufacturer of these designs, which have changed little since the 20th century. Uses .45 rounds." icon_state = "mini-uzi" @@ -339,33 +339,33 @@ list(mode_name="3-round bursts", burst=3, burst_delay=1, fire_delay=4, move_delay=4, burst_accuracy = list(60,40,30,20,15), dispersion = list(0.6, 1.0, 1.0)) ) -/obj/item/gun/projectile/automatic/mini_uzi/update_icon_state() +/obj/item/gun/ballistic/automatic/mini_uzi/update_icon_state() . = ..() if(ammo_magazine) icon_state = "mini-uzi" else icon_state = "mini-uzi-empty" -/obj/item/gun/projectile/automatic/mini_uzi/custom +/obj/item/gun/ballistic/automatic/mini_uzi/custom name = "\improper custom Uzi" desc = "The iconic Uzi is a lightweight, compact, fast firing machine pistol. These traits make it a popular holdout option for Pathfinders assigned to hazardous expeditions. Uses .45 rounds." icon_state = "mini-uzi-custom" pin = /obj/item/firing_pin/explorer -/obj/item/gun/projectile/automatic/mini_uzi/custom/update_icon_state() +/obj/item/gun/ballistic/automatic/mini_uzi/custom/update_icon_state() . = ..() if(ammo_magazine) icon_state = "mini-uzi-custom" else icon_state = "mini-uzi-custom-empty" -/obj/item/gun/projectile/automatic/mini_uzi/taj +/obj/item/gun/ballistic/automatic/mini_uzi/taj name = "\improper Adhomai Uzi" desc = "The Hotak's Arms machine pistol has developed a fierce reputation for its use by guerillas of the Democratic People's Republic of Adhomai. Its top loading magazine allows one to go completely prone in the deep snow banks of Adhomai while maintaining good weapon stability." icon_state = "mini-uzi-taj" item_state = "mini-uzi-taj" -/obj/item/gun/projectile/automatic/mini_uzi/taj/update_icon_state() +/obj/item/gun/ballistic/automatic/mini_uzi/taj/update_icon_state() . = ..() if(ammo_magazine) icon_state = "mini-uzi-taj" @@ -374,7 +374,7 @@ icon_state = "mini-uzi-taj-empty" item_state = "mini-uzi-taj-empty" -/obj/item/gun/projectile/automatic/p90 +/obj/item/gun/ballistic/automatic/p90 name = "personal defense weapon" desc = "The H90K is a compact, large capacity submachine gun produced by Hephaestus Industries. Despite its fierce reputation, it still manages to feel like a toy. Uses 5.7x28mm rounds." icon_state = "p90smg" @@ -393,11 +393,11 @@ list(mode_name="3-round bursts", burst=3, fire_delay=null, move_delay=4, burst_accuracy=list(60,30,30), dispersion=list(0.0, 0.6, 1.0)) ) -/obj/item/gun/projectile/automatic/p90/update_icon_state() +/obj/item/gun/ballistic/automatic/p90/update_icon_state() . = ..() icon_state = "p90smg-[ammo_magazine ? round(ammo_magazine.stored_ammo.len, 6) : "empty"]" -/obj/item/gun/projectile/automatic/p90/custom +/obj/item/gun/ballistic/automatic/p90/custom name = "custom personal defense weapon" desc = "An H90K from Hephaestus Industries. This one has a different colored receiver and a sling." icon_state = "p90smgC" @@ -405,11 +405,11 @@ slot_flags = SLOT_BELT|SLOT_BACK pin = /obj/item/firing_pin/explorer -/obj/item/gun/projectile/automatic/p90/custom/update_icon_state() +/obj/item/gun/ballistic/automatic/p90/custom/update_icon_state() . = ..() icon_state = "p90smgC-[ammo_magazine ? round(ammo_magazine.stored_ammo.len, 6) : "empty"]" -/obj/item/gun/projectile/automatic/tommygun +/obj/item/gun/ballistic/automatic/tommygun name = "\improper Tommy Gun" desc = "This weapon was made famous by gangsters in the 20th century. Cybersun Industries is currently reproducing these for a target market of historic gun collectors and classy criminals. Uses .45 rounds." icon_state = "tommygun" @@ -426,12 +426,12 @@ list(mode_name="3-round bursts", burst=3, fire_delay=null, move_delay=4, burst_accuracy=list(60,30,25), dispersion=list(0.0, 0.6, 1.0)) ) -/obj/item/gun/projectile/automatic/tommygun/update_icon_state() +/obj/item/gun/ballistic/automatic/tommygun/update_icon_state() . = ..() icon_state = (ammo_magazine)? "tommygun" : "tommygun-empty" // update_held_icon() -/obj/item/gun/projectile/automatic/bullpup // Admin abuse assault rifle. ToDo: Make this less shit. Maybe remove its autofire, and make it spawn with only 10 rounds at start. +/obj/item/gun/ballistic/automatic/bullpup // Admin abuse assault rifle. ToDo: Make this less shit. Maybe remove its autofire, and make it spawn with only 10 rounds at start. name = "bullpup rifle" desc = "The bullpup configured GP3000 is a battle rifle produced by Gurov Projectile Weapons LLC. It is sold almost exclusively to standing armies. Uses 7.62mm rounds." icon_state = "bullpup-small" @@ -453,7 +453,7 @@ list(mode_name="2-round bursts", burst=2, fire_delay=null, move_delay=6, burst_accuracy=list(60,45), dispersion=list(0.0, 0.6)) ) -/obj/item/gun/projectile/automatic/bullpup/update_icon_state() +/obj/item/gun/ballistic/automatic/bullpup/update_icon_state() . = ..() if(istype(ammo_magazine,/obj/item/ammo_magazine/m762)) icon_state = "bullpup-small" @@ -462,11 +462,11 @@ else item_state = "bullpup-empty" -/obj/item/gun/projectile/automatic/bullpup/update_icon() +/obj/item/gun/ballistic/automatic/bullpup/update_icon() . = ..() update_held_icon() -/obj/item/gun/projectile/automatic/fal +/obj/item/gun/ballistic/automatic/fal name = "FN-FAL" desc = "A 20th century Assault Rifle originally designed by Fabrique National. Famous for its use by mercs in grinding proxy wars in backwater nations. This reproduction was probably made for similar purposes." icon_state = "fal" @@ -487,14 +487,14 @@ list(mode_name="2-round bursts", burst=2, fire_delay=null, move_delay=6, burst_accuracy=list(60,35), dispersion=list(0.0, 0.6)) ) -/obj/item/gun/projectile/automatic/fal/update_icon_state() +/obj/item/gun/ballistic/automatic/fal/update_icon_state() . = ..() if(ammo_magazine) icon_state = initial(icon_state) else icon_state = "[initial(icon_state)]-empty" -/obj/item/gun/projectile/automatic/automat +/obj/item/gun/ballistic/automatic/automat name = "Avtomat Rifle" desc = " A Bolt Action Rifle taken apart and retooled into a primitive machine gun. Bulky and obtuse, it still capable of unleashing devastating firepower with its 15 round internal drum magazine. Loads with 7.62 stripper clips." icon_state = "automat" @@ -516,11 +516,11 @@ burst_accuracy = list(60,30,15) dispersion = list(0.0, 0.6,1.0) -/obj/item/gun/projectile/automatic/automat/holy +/obj/item/gun/ballistic/automatic/automat/holy ammo_type = /obj/item/ammo_casing/a762/silver holy = TRUE -/obj/item/gun/projectile/automatic/automat/taj +/obj/item/gun/ballistic/automatic/automat/taj name = "Adhomai automat" desc = "The Hadii-Wrack Avtomat, is an aging internal magazine automatic rifle of the People's Republic of Adhomai's Grand People's Army whose long and storied service life is coming to an end as it is phased out in favor of more modern automatics." icon_state = "automat-taj" @@ -528,7 +528,7 @@ wielded_item_state = "automat-taj-wielded" fire_anim = "" -/obj/item/gun/projectile/automatic/holyshot +/obj/item/gun/ballistic/automatic/holyshot name = "Holy automatic shotgun" desc = "Based off of an ancient design, this hand crafted weapon has been gilded with the gold of melted icons and inscribed with sacred runes and hexagrammic wards. Works best with blessed 12g rounds." icon_state = "holyshotgun" @@ -551,7 +551,7 @@ list(mode_name="2-round burst", burst=2, move_delay=6, burst_accuracy = list(60,50,40,30,25), dispersion = list(0.0, 0.6, 0.6)) ) -/obj/item/gun/projectile/automatic/holyshot/update_icon_state() +/obj/item/gun/ballistic/automatic/holyshot/update_icon_state() . = ..() if(ammo_magazine) icon_state = "holyshotgun" @@ -559,7 +559,7 @@ icon_state = "holyshotgun_empty" //Clown Rifle -/obj/item/gun/projectile/automatic/clown_rifle +/obj/item/gun/ballistic/automatic/clown_rifle name = "clown assault rifle" desc = "The WSS-29m6 is the latest version of the standard Columbina service rifle. Originally a cheap knock-off of the STS-35, the m6 now matches its inspiration in durability. Utilizing a proprietary ROF system, the m6 is able to fire unorthodox, yet effective, weaponry." icon_state = "clownrifle" @@ -584,7 +584,7 @@ // list(mode_name="short bursts", burst=5, fire_delay=null, move_delay=6, burst_accuracy=list(0,-15,-30,-30,-45), dispersion=list(0.6, 1.0, 1.0, 1.0, 1.2)), ) -/obj/item/gun/projectile/automatic/clown_rifle/update_icon_state() +/obj/item/gun/ballistic/automatic/clown_rifle/update_icon_state() . = ..() if(ammo_magazine) icon_state = "[initial(icon_state)]" @@ -592,7 +592,7 @@ icon_state = "[initial(icon_state)]-empty" //Muh Alternator -/obj/item/gun/projectile/automatic/wt274 +/obj/item/gun/ballistic/automatic/wt274 name = "alternating barrel SMG" desc = "Although it experienced an initially successful production run, the WT274 AB-SMG was discontinued in favor of the more reliable WT550. Utilizing a twin-linked barrel assembly, the WT274's ammo consumption was a major factor in its retirement." icon_state = "wt274" @@ -609,7 +609,7 @@ list(mode_name="double tap", burst=4, burst_delay=1, fire_delay=4, move_delay=2, burst_accuracy = list(40,30,20,15), dispersion = list(0.6, 0.6, 1.0, 1.0)) ) -/obj/item/gun/projectile/automatic/wt274/update_icon_state() +/obj/item/gun/ballistic/automatic/wt274/update_icon_state() . = ..() if(ammo_magazine) icon_state = "[initial(icon_state)]" @@ -617,7 +617,7 @@ icon_state = "[initial(icon_state)]-empty" //Foam Weapons -/obj/item/gun/projectile/automatic/advanced_smg/foam +/obj/item/gun/ballistic/automatic/advanced_smg/foam name = "toy submachine gun" desc = "The existence of this DONKsoft toy has instigated allegations of corporate espionage from NanoTrasen." icon = 'icons/obj/toy.dmi' @@ -627,23 +627,23 @@ allowed_magazines = list(/obj/item/ammo_magazine/mfoam/smg) fire_sound = 'sound/items/syringeproj.ogg' -/obj/item/gun/projectile/automatic/advanced_smg/foam/update_icon_state() +/obj/item/gun/ballistic/automatic/advanced_smg/foam/update_icon_state() . = ..() icon_state = (ammo_magazine)? "toy_smg" : "toy_smg-empty" -/obj/item/gun/projectile/automatic/advanced_smg/foam/handle_suicide(mob/living/user) +/obj/item/gun/ballistic/automatic/advanced_smg/foam/handle_suicide(mob/living/user) user.show_message("You feel rather silly, trying to commit suicide with a toy.") mouthshoot = 0 -/obj/item/gun/projectile/automatic/advanced_smg/foam/blue +/obj/item/gun/ballistic/automatic/advanced_smg/foam/blue icon_state = "toy_smg_blue" -/obj/item/gun/projectile/automatic/advanced_smg/foam/blue/update_icon_state() +/obj/item/gun/ballistic/automatic/advanced_smg/foam/blue/update_icon_state() . = ..() icon_state = (ammo_magazine)? "toy_smg_blue" : "toy_smg_blue-empty" //Foam c20r -/obj/item/gun/projectile/automatic/c20r/foam +/obj/item/gun/ballistic/automatic/c20r/foam name = "toy submachine gun" desc = "A DONKsoft rendition of an infamous submachine gun." icon = 'icons/obj/toy.dmi' @@ -656,19 +656,19 @@ one_handed_penalty = 5 fire_sound = 'sound/items/syringeproj.ogg' -/obj/item/gun/projectile/automatic/c20r/foam/update_icon_state() +/obj/item/gun/ballistic/automatic/c20r/foam/update_icon_state() . = ..() if(ammo_magazine) icon_state = "toy_c20r-[round(ammo_magazine.stored_ammo.len,4)]" else icon_state = "toy_c20r" -/obj/item/gun/projectile/automatic/c20r/foam/handle_suicide(mob/living/user) +/obj/item/gun/ballistic/automatic/c20r/foam/handle_suicide(mob/living/user) user.show_message("You feel rather silly, trying to commit suicide with a toy.") mouthshoot = 0 //Foam LMG -/obj/item/gun/projectile/automatic/l6_saw/foam +/obj/item/gun/ballistic/automatic/l6_saw/foam name = "toy light machine gun" desc = "This plastic replica of a common light machine gun weighs about half as much. It's still pretty bulky, but nothing lays down suppressive fire like this bad boy. The bane of schoolyards across the galaxy." icon = 'icons/obj/toy.dmi' @@ -681,7 +681,7 @@ one_handed_penalty = 45 //It's plastic. fire_sound = 'sound/items/syringeproj.ogg' -/obj/item/gun/projectile/automatic/l6_saw/foam/update_icon_state() +/obj/item/gun/ballistic/automatic/l6_saw/foam/update_icon_state() . = ..() if(istype(ammo_magazine,/obj/item/ammo_magazine/m762)) icon_state = "toy_lmg[cover_open ? "open" : "closed"]mag" @@ -690,11 +690,11 @@ icon_state = "toy_lmg[cover_open ? "open" : "closed"][ammo_magazine ? round(ammo_magazine.stored_ammo.len, 25) : "-empty"]" item_state = "toy_lmg[cover_open ? "open" : "closed"][ammo_magazine ? "" : "-empty"]" -/obj/item/gun/projectile/automatic/l6_saw/foam/update_icon() +/obj/item/gun/ballistic/automatic/l6_saw/foam/update_icon() . = ..() update_held_icon() -/obj/item/gun/projectile/automatic/l6_saw/foam/handle_suicide(mob/living/user) +/obj/item/gun/ballistic/automatic/l6_saw/foam/handle_suicide(mob/living/user) user.show_message("You feel rather silly, trying to commit suicide with a toy.") mouthshoot = 0 return diff --git a/code/modules/projectiles/guns/projectile/boltaction.dm b/code/modules/projectiles/guns/projectile/boltaction.dm index 4afeae41b2a..8c9f94873d1 100644 --- a/code/modules/projectiles/guns/projectile/boltaction.dm +++ b/code/modules/projectiles/guns/projectile/boltaction.dm @@ -1,6 +1,6 @@ // For all intents and purposes, these work exactly the same as pump shotguns. It's unnecessary to make their own procs for them. -/obj/item/gun/projectile/shotgun/pump/rifle +/obj/item/gun/ballistic/shotgun/pump/rifle name = "bolt action rifle" desc = "A reproduction of an almost ancient weapon design from the early 20th century. It's still popular among hunters and collectors due to its reliability. Uses 7.62mm rounds." item_state = "boltaction" @@ -14,31 +14,31 @@ load_method = SINGLE_CASING|SPEEDLOADER action_sound = 'sound/weapons/riflebolt.ogg' -/obj/item/gun/projectile/shotgun/pump/rifle/practice // For target practice +/obj/item/gun/ballistic/shotgun/pump/rifle/practice // For target practice desc = "A bolt-action rifle with a lightweight synthetic wood stock, designed for competitive shooting. Comes shipped with practice rounds pre-loaded into the gun. Popular among professional marksmen. Uses 7.62mm rounds." ammo_type = /obj/item/ammo_casing/a762/practice -/obj/item/gun/projectile/shotgun/pump/rifle/ceremonial +/obj/item/gun/ballistic/shotgun/pump/rifle/ceremonial name = "ceremonial bolt-action rifle" desc = "A bolt-action rifle with a heavy, high-quality wood stock that has a beautiful finish. Clearly not intended to be used in combat. Uses 7.62mm rounds." icon_state = "boltaction_c" item_state = "boltaction_c" ammo_type = /obj/item/ammo_casing/a762/blank -/obj/item/gun/projectile/shotgun/pump/rifle/ceremonial/holy +/obj/item/gun/ballistic/shotgun/pump/rifle/ceremonial/holy name = "blessed bolt-action rifle" desc = "A bolt-action rifle with a heavy, high-quality wood stock that has a beautiful finish. Clearly not intended to be used in combat. Uses 7.62mm rounds." ammo_type = /obj/item/ammo_casing/a762/silver holy = TRUE -/obj/item/gun/projectile/shotgun/pump/rifle/taj +/obj/item/gun/ballistic/shotgun/pump/rifle/taj name = "Adhomai bolt action rifle" desc = "The A&K-c bolt action rifle. Though a simple and dated design, this Akhan and Khan rifle is a mainstay of the of the Imperial Adhomain Army and has kept Tajaran monarchy safe since the civil war." item_state = "boltaction-taj" icon_state = "boltaction-taj" wielded_item_state = "boltaction-taj-wielded" -/obj/item/gun/projectile/shotgun/pump/rifle/vox_hunting +/obj/item/gun/ballistic/shotgun/pump/rifle/vox_hunting name = "vox hunting rifle" desc = "This ancient rifle bears traces of an assembly meant to house power cells, implying it used to fire energy beams. It has since been crudely modified to fire standard 7.62mm rounds." icon_state = "vox_hunting" @@ -48,7 +48,7 @@ force = 20 // Stole hacky terrible code from doublebarrel shotgun. -Spades -/obj/item/gun/projectile/shotgun/pump/rifle/ceremonial/attackby(var/obj/item/A as obj, mob/user as mob) +/obj/item/gun/ballistic/shotgun/pump/rifle/ceremonial/attackby(var/obj/item/A as obj, mob/user as mob) if(istype(A, /obj/item/surgical/circular_saw) || istype(A, /obj/item/melee/energy) || istype(A, /obj/item/pickaxe/plasmacutter) && w_class != ITEMSIZE_NORMAL) to_chat(user, "You begin to shorten the barrel and stock of \the [src].") if(loaded.len) @@ -71,7 +71,7 @@ ..() //Lever actions are the same thing, but bigger. -/obj/item/gun/projectile/shotgun/pump/rifle/lever +/obj/item/gun/ballistic/shotgun/pump/rifle/lever name = "lever-action rifle" desc = "A reproduction of an almost ancient weapon design from the 19th century. This one uses a lever-action to move new rounds into the chamber. Uses .357 rounds." item_state = "leveraction" @@ -83,12 +83,12 @@ action_sound = 'sound/weapons/riflebolt.ogg' one_handed_penalty = 15 -/obj/item/gun/projectile/shotgun/pump/rifle/lever/holy +/obj/item/gun/ballistic/shotgun/pump/rifle/lever/holy name = "blessed lever-action" ammo_type = /obj/item/ammo_casing/a357/silver holy = TRUE -/obj/item/gun/projectile/shotgun/pump/rifle/lever/attackby(var/obj/item/A as obj, mob/user as mob) +/obj/item/gun/ballistic/shotgun/pump/rifle/lever/attackby(var/obj/item/A as obj, mob/user as mob) if(istype(A, /obj/item/surgical/circular_saw) || istype(A, /obj/item/melee/energy) || istype(A, /obj/item/pickaxe/plasmacutter) && w_class != ITEMSIZE_NORMAL) to_chat(user, "You begin to shorten the barrel and stock of \the [src].") if(loaded.len) @@ -115,7 +115,7 @@ else ..() -/obj/item/gun/projectile/shotgun/pump/rifle/lever/vintage +/obj/item/gun/ballistic/shotgun/pump/rifle/lever/vintage name = "vintage repeater" desc = "An iconic manually operated lever action rifle, offering adequate stopping power due to it's still powerful cartridge while at the same time having a rather respectable firing rate due to it's mechanism. It is very probable this is a replica instead of a museum piece, but rifles of this pattern still see usage as colonist guns in some far off regions. Uses .44 rounds." item_state = "levercarabine" // That isn't how carbine is spelled ya knob! :U @@ -127,12 +127,12 @@ animated_pump = 1 action_sound = 'sound/weapons/riflebolt.ogg' -/obj/item/gun/projectile/shotgun/pump/rifle/lever/vintage/holy +/obj/item/gun/ballistic/shotgun/pump/rifle/lever/vintage/holy name = "blessed lever-action" ammo_type = /obj/item/ammo_casing/a44/silver holy = TRUE -/obj/item/gun/projectile/shotgun/pump/rifle/lever/vintage/attackby(var/obj/item/A as obj, mob/user as mob) +/obj/item/gun/ballistic/shotgun/pump/rifle/lever/vintage/attackby(var/obj/item/A as obj, mob/user as mob) if(istype(A, /obj/item/surgical/circular_saw) || istype(A, /obj/item/melee/energy) || istype(A, /obj/item/pickaxe/plasmacutter) && w_class != ITEMSIZE_NORMAL) to_chat(user, "You begin to shorten the barrel and stock of \the [src].") if(loaded.len) @@ -159,7 +159,7 @@ else ..() -/obj/item/gun/projectile/shotgun/pump/rifle/lever/arnold +/obj/item/gun/ballistic/shotgun/pump/rifle/lever/arnold name = "lever-action shotgun" desc = "The legendary Model 1887 Lever Action Shotgun, Hasta La Vista Bay-bee!" item_state = "arnold" @@ -171,12 +171,12 @@ load_method = SINGLE_CASING action_sound = 'sound/weapons/riflebolt.ogg' -/obj/item/gun/projectile/shotgun/pump/rifle/lever/arnold/holy +/obj/item/gun/ballistic/shotgun/pump/rifle/lever/arnold/holy name = "blessed lever-action shotgun" ammo_type = /obj/item/ammo_casing/a12g/silver holy = TRUE -/obj/item/gun/projectile/shotgun/pump/rifle/lever/win1895 +/obj/item/gun/ballistic/shotgun/pump/rifle/lever/win1895 name = "Winchester 1895" desc = "The Winchester Model 1895 rifle, unqiue for its ability to load using rifle stripper clips. Uses 7.62mm rounds." item_state = "win1895" @@ -189,12 +189,12 @@ action_sound = 'sound/weapons/riflebolt.ogg' animated_pump = 1 -/obj/item/gun/projectile/shotgun/pump/rifle/lever/win1895/holy +/obj/item/gun/ballistic/shotgun/pump/rifle/lever/win1895/holy name = "blessed lever-action" ammo_type = /obj/item/ammo_casing/a762/silver holy = TRUE -/obj/item/gun/projectile/shotgun/pump/scopedrifle +/obj/item/gun/ballistic/shotgun/pump/scopedrifle name = "scoped bolt action" desc = "A bolt-action rifle with a scope afixed to it by a gun smith. Uses 7.62 rounds." item_state = "boltaction" @@ -212,7 +212,7 @@ accuracy = 50 //Forced missing fucking sucks ass scoped_accuracy = 100 -/obj/item/gun/projectile/shotgun/pump/scopedrifle/verb/scope() +/obj/item/gun/ballistic/shotgun/pump/scopedrifle/verb/scope() set category = "Object" set name = "Use Scope" set popup_menu = 1 diff --git a/code/modules/projectiles/guns/projectile/bow.dm b/code/modules/projectiles/guns/projectile/bow.dm index 8d1e9e1ccaa..59fc12a243c 100644 --- a/code/modules/projectiles/guns/projectile/bow.dm +++ b/code/modules/projectiles/guns/projectile/bow.dm @@ -1,4 +1,4 @@ -/obj/item/gun/projectile/bow +/obj/item/gun/ballistic/bow name = "wooden bow" desc = "Some sort of primitive projectile weapon. Used to fire arrows." icon_state = "bow" @@ -14,7 +14,7 @@ no_pin_required = TRUE var/ready = 0 -/obj/item/gun/projectile/bow/unload_ammo(mob/user, var/allow_dump =0) +/obj/item/gun/ballistic/bow/unload_ammo(mob/user, var/allow_dump =0) var/obj/item/ammo_casing/C = loaded[loaded.len] loaded.len-- user.put_in_hands(C) @@ -23,7 +23,7 @@ playsound(src.loc, 'sound/weapons/empty.ogg', 50, 1) update_icon() -/obj/item/gun/projectile/bow/load_ammo(var/obj/item/A, mob/user) +/obj/item/gun/ballistic/bow/load_ammo(var/obj/item/A, mob/user) if(istype(A, /obj/item/ammo_casing)) var/obj/item/ammo_casing/C = A if(!(load_method & SINGLE_CASING) || caliber != C.caliber) @@ -40,7 +40,7 @@ return update_icon() -/obj/item/gun/projectile/bow/attack_self(mob/living/user) +/obj/item/gun/ballistic/bow/attack_self(mob/living/user) if(loaded.len) src.ready = 1 to_chat(user, "You draw back the bowstring.") @@ -50,22 +50,22 @@ else return -/obj/item/gun/projectile/bow/attack_hand(mob/user as mob) +/obj/item/gun/ballistic/bow/attack_hand(mob/user as mob) if(user.get_inactive_held_item() == src) unload_ammo(user, allow_dump=0) else return ..() -/obj/item/gun/projectile/bow/attackby(var/obj/item/A as obj, mob/user as mob) +/obj/item/gun/ballistic/bow/attackby(var/obj/item/A as obj, mob/user as mob) if (istype(A, /obj/item/ammo_casing/arrow)) load_ammo(A, user) -/obj/item/gun/projectile/bow/afterattack(atom/A, mob/living/user) +/obj/item/gun/ballistic/bow/afterattack(atom/A, mob/living/user) ..() src.ready = 0 update_icon() -/obj/item/gun/projectile/bow/update_icon_state() +/obj/item/gun/ballistic/bow/update_icon_state() . = ..() if(ready) icon_state = "[initial(icon_state)]_firing" @@ -74,14 +74,14 @@ else icon_state = initial(icon_state) -/obj/item/gun/projectile/bow/ashen +/obj/item/gun/ballistic/bow/ashen name = "bone bow" desc = "Some sort of primitive projectile weapon made of bone and sinew. Used to fire arrows." icon_state = "bow_ashen" item_state = "bow_ashen" force = 8 -/obj/item/gun/projectile/bow/pipe +/obj/item/gun/ballistic/bow/pipe name = "pipe bow" desc = "Some sort of pipe-based projectile weapon made of string and lots of bending. Used to fire arrows." icon_state = "bow_pipe" diff --git a/code/modules/projectiles/guns/projectile/caseless.dm b/code/modules/projectiles/guns/projectile/caseless.dm index 92c98e2b5e9..b9c93b3a329 100644 --- a/code/modules/projectiles/guns/projectile/caseless.dm +++ b/code/modules/projectiles/guns/projectile/caseless.dm @@ -1,4 +1,4 @@ -/obj/item/gun/projectile/caseless/prototype +/obj/item/gun/ballistic/caseless/prototype name = "prototype caseless rifle" desc = "A rifle cooked up in NanoTrasen's R&D labs that operates with Kraut Space Magic™ clockwork internals. Uses solid phoron 5mm caseless rounds." icon_state = "caseless" @@ -12,17 +12,17 @@ allowed_magazines = list(/obj/item/ammo_magazine/m5mmcaseless) one_handed_penalty = 15 -/obj/item/gun/projectile/caseless/prototype/update_icon_state() +/obj/item/gun/ballistic/caseless/prototype/update_icon_state() . = ..() if(ammo_magazine) icon_state = initial(icon_state) else icon_state = "[initial(icon_state)]-empty" -/obj/item/gun/projectile/caseless/prototype/loaded +/obj/item/gun/ballistic/caseless/prototype/loaded magazine_type = /obj/item/ammo_magazine/m5mmcaseless -/obj/item/gun/projectile/caseless/usmc +/obj/item/gun/ballistic/caseless/usmc name = "M41A Pulse Rifle" desc = "A relic dating back to the Xenomorph Wars and the former primary battle rifle of the United Solar Marine Corps. Loads using 10x24mm caseless Magazines" icon_state = "usmc" diff --git a/code/modules/projectiles/guns/projectile/contender.dm b/code/modules/projectiles/guns/projectile/contender.dm index 61b4fdc5d39..9f0adad63e8 100644 --- a/code/modules/projectiles/guns/projectile/contender.dm +++ b/code/modules/projectiles/guns/projectile/contender.dm @@ -1,4 +1,4 @@ -/obj/item/gun/projectile/contender +/obj/item/gun/ballistic/contender name = "Thompson Contender" desc = "A perfect, pristine replica of an ancient one-shot hand-cannon. For when you really want to make a hole. This one has been modified to work almost like a bolt-action." icon_state = "pockrifle" @@ -13,7 +13,7 @@ load_method = SINGLE_CASING heavy = TRUE -/obj/item/gun/projectile/contender/attack_self(mob/user as mob) +/obj/item/gun/ballistic/contender/attack_self(mob/user as mob) if(chambered) chambered.loc = get_turf(src) chambered = null @@ -32,34 +32,34 @@ icon_state = initial(icon_state) retracted_bolt = 0 -/obj/item/gun/projectile/contender/load_ammo(var/obj/item/A, mob/user) +/obj/item/gun/ballistic/contender/load_ammo(var/obj/item/A, mob/user) if(!retracted_bolt) to_chat(user, "You can't load [src] without cycling the bolt.") return ..() -/obj/item/gun/projectile/contender/a44 +/obj/item/gun/ballistic/contender/a44 caliber = ".44" ammo_type = /obj/item/ammo_casing/a44 -/obj/item/gun/projectile/contender/a762 +/obj/item/gun/ballistic/contender/a762 caliber = "7.62mm" ammo_type = /obj/item/ammo_casing/a762 -/obj/item/gun/projectile/contender/tacticool +/obj/item/gun/ballistic/contender/tacticool desc = "A modified replica of an ancient one-shot hand-cannon, reinvented with a tactical look. For when you really want to make a hole. This one has been modified to work almost like a bolt-action." icon_state = "pockrifle_b" icon_retracted = "pockrifle_b-empty" -/obj/item/gun/projectile/contender/tacticool/a44 +/obj/item/gun/ballistic/contender/tacticool/a44 caliber = ".44" ammo_type = /obj/item/ammo_casing/a44 -/obj/item/gun/projectile/contender/tacticool/a762 +/obj/item/gun/ballistic/contender/tacticool/a762 caliber = "7.62mm" ammo_type = /obj/item/ammo_casing/a762 -/obj/item/gun/projectile/contender/holy +/obj/item/gun/ballistic/contender/holy name = "Divine Challenger" desc = "A beautifully engraved pocket rifle with a silvered barrel made of incense wood.Sometimes one good hit is all you need to vanquish a great evil and these handcannons will deliver that one shot." icon_state = "pockrifle_c" @@ -68,29 +68,29 @@ origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2, TECH_OCCULT = 1) holy = TRUE -/obj/item/gun/projectile/contender/holy/a44 +/obj/item/gun/ballistic/contender/holy/a44 caliber = ".44" ammo_type = /obj/item/ammo_casing/a44/silver -/obj/item/gun/projectile/contender/holy/a762 +/obj/item/gun/ballistic/contender/holy/a762 caliber = "7.62mm" ammo_type = /obj/item/ammo_casing/a762/silver -/obj/item/gun/projectile/contender/taj +/obj/item/gun/ballistic/contender/taj name = "Adhomai pocket rifle" desc = "A hand cannon produced by Akhan and Khan. Its simple design dates back to the civil war where hand cannons like it were rushed into service to counter the massive arms shortage the Kingdom of Adhomai faced at the start of the war. Since then A&K have refined the design into a mainstay backup weapon of solider and civilian alike." icon_state = "pockrifle_d" icon_retracted = "pockrifle_d-empty" -/obj/item/gun/projectile/contender/taj/a44 +/obj/item/gun/ballistic/contender/taj/a44 caliber = ".44" ammo_type = /obj/item/ammo_casing/a44 -/obj/item/gun/projectile/contender/taj/a762 +/obj/item/gun/ballistic/contender/taj/a762 caliber = "7.62mm" ammo_type = /obj/item/ammo_casing/a762 -/obj/item/gun/projectile/contender/pipegun +/obj/item/gun/ballistic/contender/pipegun name = "improvised pipe rifle" desc = "A single shot, handmade pipe rifle. It almost functions like a bolt action. Accepts shotgun shells." icon_state = "pipegun" @@ -102,7 +102,7 @@ var/unstable = 1 var/jammed -/obj/item/gun/projectile/contender/pipegun/consume_next_projectile(mob/user as mob) +/obj/item/gun/ballistic/contender/pipegun/consume_next_projectile(mob/user as mob) . = ..() if(.) if(unstable) diff --git a/code/modules/projectiles/guns/projectile/dartgun.dm b/code/modules/projectiles/guns/projectile/dartgun.dm index 247013ee9b4..824060ce6b8 100644 --- a/code/modules/projectiles/guns/projectile/dartgun.dm +++ b/code/modules/projectiles/guns/projectile/dartgun.dm @@ -40,7 +40,7 @@ max_ammo = 5 multiple_sprites = 1 -/obj/item/gun/projectile/dartgun +/obj/item/gun/ballistic/dartgun name = "dart gun" desc = "Zeng-Hu Pharmaceutical's entry into the arms market, the Z-H P Artemis is a gas-powered dart gun capable of delivering chemical cocktails swiftly across short distances." description_info = "The dart gun is capable of storing three beakers. In order to use the dart gun, you must first use it in-hand to open its mixing UI. The dart-gun will only draw from beakers with mixing enabled. If multiple are enabled, the gun will draw from them in equal amounts." @@ -69,7 +69,7 @@ var/container_type = /obj/item/reagent_containers/glass/beaker var/list/starting_chems = null -/obj/item/gun/projectile/dartgun/Initialize(mapload) +/obj/item/gun/ballistic/dartgun/Initialize(mapload) . = ..() if(starting_chems) for(var/chem in starting_chems) @@ -78,7 +78,7 @@ beakers += B update_icon() -/obj/item/gun/projectile/dartgun/update_icon_state() +/obj/item/gun/ballistic/dartgun/update_icon_state() . = ..() if(!ammo_magazine) icon_state = "[base_state]-empty" @@ -94,13 +94,13 @@ else icon_state = "[base_state]" -/obj/item/gun/projectile/dartgun/consume_next_projectile() +/obj/item/gun/ballistic/dartgun/consume_next_projectile() . = ..() var/obj/item/projectile/bullet/chemdart/dart = . if(istype(dart)) fill_dart(dart) -/obj/item/gun/projectile/dartgun/examine(mob/user) +/obj/item/gun/ballistic/dartgun/examine(mob/user) //update_icon() //if (!..(user, 2)) // return @@ -112,7 +112,7 @@ for(var/datum/reagent/R in B.reagents.reagent_list) . += "[R.volume] units of [R.name]" -/obj/item/gun/projectile/dartgun/attackby(obj/item/I as obj, mob/user as mob) +/obj/item/gun/ballistic/dartgun/attackby(obj/item/I as obj, mob/user as mob) if(istype(I, /obj/item/reagent_containers/glass)) if(!istype(I, container_type)) to_chat(user, "[I] doesn't seem to fit into [src].") @@ -130,13 +130,13 @@ return ..() //fills the given dart with reagents -/obj/item/gun/projectile/dartgun/proc/fill_dart(var/obj/item/projectile/bullet/chemdart/dart) +/obj/item/gun/ballistic/dartgun/proc/fill_dart(var/obj/item/projectile/bullet/chemdart/dart) if(mixing.len) var/mix_amount = dart.reagent_amount/mixing.len for(var/obj/item/reagent_containers/glass/beaker/B in mixing) B.reagents.trans_to_obj(dart, mix_amount) -/obj/item/gun/projectile/dartgun/attack_self(mob/user) +/obj/item/gun/ballistic/dartgun/attack_self(mob/user) user.set_machine(src) var/dat = "[src] mixing control:

" @@ -168,7 +168,7 @@ user << browse(dat, "window=dartgun") onclose(user, "dartgun", src) -/obj/item/gun/projectile/dartgun/proc/check_beaker_mixing(var/obj/item/B) +/obj/item/gun/ballistic/dartgun/proc/check_beaker_mixing(var/obj/item/B) if(!mixing || !beakers) return 0 for(var/obj/item/M in mixing) @@ -176,7 +176,7 @@ return 1 return 0 -/obj/item/gun/projectile/dartgun/Topic(href, href_list) +/obj/item/gun/ballistic/dartgun/Topic(href, href_list) if(..()) return 1 src.add_fingerprint(usr) if(href_list["stop_mix"]) @@ -206,7 +206,7 @@ ///Variants of the Dartgun and Chemdarts./// -/obj/item/gun/projectile/dartgun/research +/obj/item/gun/ballistic/dartgun/research name = "prototype dart gun" desc = "Zeng-Hu Pharmaceutical's entry into the arms market, the Z-H P Artemis is a gas-powered dart gun capable of delivering chemical cocktails swiftly across short distances. This one seems to be an early model with an NT stamp." description_info = "The dart gun is capable of storing two beakers. In order to use the dart gun, you must first use it in-hand to open its mixing UI. The dart-gun will only draw from beakers with mixing enabled. If multiple are enabled, the gun will draw from them in equal amounts." diff --git a/code/modules/projectiles/guns/projectile/musket.dm b/code/modules/projectiles/guns/projectile/musket.dm index 03153255c0f..5fc5f40b05d 100644 --- a/code/modules/projectiles/guns/projectile/musket.dm +++ b/code/modules/projectiles/guns/projectile/musket.dm @@ -1,4 +1,4 @@ -/obj/item/gun/projectile/musket +/obj/item/gun/ballistic/musket name = "musket" desc = "The precursor to the modern cased ammuntion firearms, muskets use simple hammer mechanism to produce a spark to ignite black \ powder which then propels a ball out the barrel of the gun. Though over a half millenium outdated muskets and other black powder weapons \ @@ -27,7 +27,7 @@ var/has_powder = FALSE -/obj/item/gun/projectile/musket/special_check(mob/user) +/obj/item/gun/ballistic/musket/special_check(mob/user) if(!has_powder) to_chat(user, SPAN_WARNING("\The [src] is not loaded with gunpowder!")) return FALSE @@ -44,7 +44,7 @@ has_powder = FALSE return ..() -/obj/item/gun/projectile/musket/attackby(obj/item/W, mob/user) +/obj/item/gun/ballistic/musket/attackby(obj/item/W, mob/user) ..() if (istype(W, /obj/item/reagent_containers)) if(has_powder) @@ -80,7 +80,7 @@ icon_state = "powderhorn-scor" -/obj/item/gun/projectile/musket/taj +/obj/item/gun/ballistic/musket/taj name = "adhomian musket" desc = "For the Tajara, the era of black powder warfare was not all that long ago. As result many genuine Adhomian both reproduction and \ even genuine muskets are often seen in the hands of Tajaran civilians, and weapons collectors, especially since such weapons circumvent the \ @@ -89,14 +89,14 @@ item_state = "musket-taj" wielded_item_state = "musket-taj-wielded" -/obj/item/gun/projectile/musket/tribal +/obj/item/gun/ballistic/musket/tribal name = "tribal musket" desc = "A musket housed in bone furnishing and held together with sinew. It uses as obsidian striker." icon_state = "musket-scor" item_state = "musket-scor" wielded_item_state = "musket-scor-wielded" -/obj/item/gun/projectile/musket/pistol +/obj/item/gun/ballistic/musket/pistol name = "flintlock pistol" desc = "A pistol sized black powder weapon used primarily by reenactors, criminals who can't get bullets, and collectors." icon_state = "flintlock" @@ -107,21 +107,21 @@ w_class = ITEMSIZE_NORMAL one_handed_penalty = 0 -/obj/item/gun/projectile/musket/pistol/brass +/obj/item/gun/ballistic/musket/pistol/brass name = "brass wheelock" desc = "A brass black powder pistol with a strange gear like firing mechanism. You are not quite certain how it actually works though." icon_state = "flintlock-brass" item_state = "deagleg" -/obj/item/gun/projectile/musket/pistol/tribal +/obj/item/gun/ballistic/musket/pistol/tribal name = "tribal flintlock" desc = "A flintlock pistol cased in bone and sinew. It uses an obsidian striking mechanism, perhaps it should be called an obsidian-lock?" icon_state = "flintlock-scor" -/obj/item/gun/projectile/musket/blunderbuss +/obj/item/gun/ballistic/musket/blunderbuss name = "blunderbuss" desc = "The precursor to the modern shotgun. It uses blackpowder to shoot a spread of shrapnel." icon_state = "blunderbuss" diff --git a/code/modules/projectiles/guns/projectile/pistol.dm b/code/modules/projectiles/guns/projectile/pistol.dm index 54043e0460f..31f6cec6601 100644 --- a/code/modules/projectiles/guns/projectile/pistol.dm +++ b/code/modules/projectiles/guns/projectile/pistol.dm @@ -1,4 +1,4 @@ -/obj/item/gun/projectile/colt +/obj/item/gun/ballistic/colt var/unique_reskin name = ".45 pistol" desc = "A cheap Martian knock-off of a Colt M1911. Uses .45 rounds." @@ -10,7 +10,7 @@ origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2) load_method = MAGAZINE -/obj/item/gun/projectile/colt/update_icon_state() +/obj/item/gun/ballistic/colt/update_icon_state() . = ..() if(ammo_magazine) if(unique_reskin) @@ -23,11 +23,11 @@ else icon_state = "[initial(icon_state)]-e" -/obj/item/gun/projectile/colt/detective +/obj/item/gun/ballistic/colt/detective desc = "A Martian recreation of an old pistol. Uses .45 rounds." magazine_type = /obj/item/ammo_magazine/m45/rubber -/obj/item/gun/projectile/colt/detective/verb/rename_gun() +/obj/item/gun/ballistic/colt/detective/verb/rename_gun() set name = "Name Gun" set category = "Object" set desc = "Rename your gun. If you're Security." @@ -46,7 +46,7 @@ to_chat(M, "You name the gun [input]. Say hello to your new friend.") return 1 -/obj/item/gun/projectile/colt/detective/verb/reskin_gun() +/obj/item/gun/ballistic/colt/detective/verb/reskin_gun() set name = "Resprite gun" set category = "Object" set desc = "Click to choose a sprite for your gun." @@ -68,20 +68,20 @@ to_chat(M, "Your gun is now sprited as [choice]. Say hello to your new friend.") return 1 -/obj/item/gun/projectile/colt/taj +/obj/item/gun/ballistic/colt/taj name = "Adhomai Pistol" desc = "The Adar'Mazy pistol, produced by the Hadii-Wrack group. This pistol is the primary sidearm for low ranking officers and officals in the People's Republic of Adhomai." icon_state = "colt-taj" /*//apart of reskins that have two sprites, touching may result in frustration and breaks -/obj/item/gun/projectile/colt/detective/attack_hand(var/mob/living/user) +/obj/item/gun/ballistic/colt/detective/attack_hand(var/mob/living/user) if(!unique_reskin && loc == user) reskin_gun(user) return ..() */ -/obj/item/gun/projectile/sec +/obj/item/gun/ballistic/sec name = ".45 pistol" desc = "The NT Mk58 is a cheap, ubiquitous sidearm, produced by a NanoTrasen subsidiary. Found pretty much everywhere humans are. This one is a less-lethal variant that only accepts .45 rubber or flash magazines." icon_state = "secguncomp" @@ -92,30 +92,30 @@ origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2) load_method = MAGAZINE -/obj/item/gun/projectile/sec/update_icon_state() +/obj/item/gun/ballistic/sec/update_icon_state() . = ..() if(ammo_magazine) icon_state = "secguncomp" else icon_state = "secguncomp-e" -/obj/item/gun/projectile/sec/flash +/obj/item/gun/ballistic/sec/flash name = ".45 signal pistol" magazine_type = /obj/item/ammo_magazine/m45/flash -/obj/item/gun/projectile/sec/wood +/obj/item/gun/ballistic/sec/wood desc = "The NT Mk58 is a cheap, ubiquitous sidearm, produced by a NanoTrasen subsidiary. This one has a sweet wooden grip and only accepts .45 rubber or flash magazines." name = "custom .45 pistol" icon_state = "secgundark" -/obj/item/gun/projectile/sec/wood/update_icon_state() +/obj/item/gun/ballistic/sec/wood/update_icon_state() . = ..() if(ammo_magazine) icon_state = "secgundark" else icon_state = "secgundark-e" -/obj/item/gun/projectile/silenced +/obj/item/gun/ballistic/silenced name = "silenced pistol" desc = "A small, quiet, easily concealable gun. Uses .45 rounds." icon_state = "silenced_pistol" @@ -130,7 +130,7 @@ allowed_magazines = list(/obj/item/ammo_magazine/m45) projectile_type = /obj/item/projectile/bullet/pistol/medium -/obj/item/gun/projectile/deagle +/obj/item/gun/ballistic/deagle name = "desert eagle" desc = "The perfect handgun for shooters with a need to hit targets through a wall and behind a fridge in your neighbor's house. Uses .44 rounds." icon_state = "deagle" @@ -142,29 +142,29 @@ magazine_type = /obj/item/ammo_magazine/m44 allowed_magazines = list(/obj/item/ammo_magazine/m44) -/obj/item/gun/projectile/deagle/update_icon_state() +/obj/item/gun/ballistic/deagle/update_icon_state() . = ..() if(ammo_magazine) icon_state = "[initial(icon_state)]" else icon_state = "[initial(icon_state)]-e" -/obj/item/gun/projectile/deagle/gold +/obj/item/gun/ballistic/deagle/gold desc = "A gold plated gun folded over a million times by superior martian gunsmiths. Uses .44 rounds." icon_state = "deagleg" item_state = "deagleg" -/obj/item/gun/projectile/deagle/camo +/obj/item/gun/ballistic/deagle/camo desc = "A Deagle brand Deagle for operators operating operationally. Uses .44 rounds." icon_state = "deaglecamo" item_state = "deagleg" -/obj/item/gun/projectile/deagle/taj +/obj/item/gun/ballistic/deagle/taj name = "Adhomai Hand Cannon" desc = "The Nal'dor heavy pistol, a powerful Hadii-Wrack group handcannon that has gained an infamous reputation through its use by Commissars of the People's Republic of Adhomai." icon_state = "deagle-taj" -/obj/item/gun/projectile/gyropistol // Does this even appear anywhere outside of admin abuse? +/obj/item/gun/ballistic/gyropistol // Does this even appear anywhere outside of admin abuse? name = "gyrojet pistol" desc = "Speak softly, and carry a big gun. Fires rare .75 caliber self-propelled exploding bolts--because fuck you and everything around you." icon_state = "gyropistol" @@ -179,14 +179,14 @@ auto_eject = 1 auto_eject_sound = 'sound/weapons/smg_empty_alarm.ogg' -/obj/item/gun/projectile/gyropistol/update_icon_state() +/obj/item/gun/ballistic/gyropistol/update_icon_state() . = ..() if(ammo_magazine) icon_state = "gyropistolloaded" else icon_state = "gyropistol" -/obj/item/gun/projectile/pistol +/obj/item/gun/ballistic/pistol name = "compact pistol" desc = "The Lumoco Arms P3 Whisper. A compact, easily concealable gun, though it's only compatible with compact magazines. Uses 9mm rounds." icon_state = "pistol" @@ -200,18 +200,18 @@ allowed_magazines = list(/obj/item/ammo_magazine/m9mm/compact) projectile_type = /obj/item/projectile/bullet/pistol -/obj/item/gun/projectile/pistol/update_icon_state() +/obj/item/gun/ballistic/pistol/update_icon_state() . = ..() if(ammo_magazine) icon_state = "[initial(icon_state)]" else icon_state = "[initial(icon_state)]-e" -/obj/item/gun/projectile/pistol/flash +/obj/item/gun/ballistic/pistol/flash name = "compact signal pistol" magazine_type = /obj/item/ammo_magazine/m9mm/compact/flash -/obj/item/gun/projectile/pistol/attack_hand(mob/living/user as mob) +/obj/item/gun/ballistic/pistol/attack_hand(mob/living/user as mob) if(user.get_inactive_held_item() == src) if(silenced) if(!user.is_holding(src)) @@ -225,7 +225,7 @@ return ..() -/obj/item/gun/projectile/pistol/attackby(obj/item/I as obj, mob/living/user as mob) +/obj/item/gun/ballistic/pistol/attackby(obj/item/I as obj, mob/living/user as mob) if(istype(I, /obj/item/silencer)) if(!user.is_holding(src)) //if we're not in his hands to_chat(user, "You'll need [src] in your hands to do that.") @@ -239,7 +239,7 @@ return CLICKCHAIN_DO_NOT_PROPAGATE return ..() -/obj/item/gun/projectile/pistol/update_icon_state() +/obj/item/gun/ballistic/pistol/update_icon_state() . = ..() if(silenced) icon_state = "pistol-silencer" @@ -253,7 +253,7 @@ icon_state = "silencer" w_class = ITEMSIZE_SMALL -/obj/item/gun/projectile/pirate +/obj/item/gun/ballistic/pirate name = "zip gun" desc = "Little more than a barrel, handle, and firing mechanism, cheap makeshift firearms like this one are not uncommon in frontier systems." icon_state = "sawnshotgun" @@ -281,7 +281,7 @@ /obj/item/ammo_casing/a545 = "5.45mm" ) -/obj/item/gun/projectile/pirate/Initialize(mapload) +/obj/item/gun/ballistic/pirate/Initialize(mapload) ammo_type = pick(ammo_types) desc += " Uses [ammo_types[ammo_type]] rounds." @@ -289,7 +289,7 @@ caliber = initial(ammo.caliber) return ..() -/obj/item/gun/projectile/derringer +/obj/item/gun/ballistic/derringer name = "derringer" desc = "It's not size of your gun that matters, just the size of your load. Uses .357 rounds." //OHHH MYYY~ icon_state = "derringer" @@ -302,7 +302,7 @@ ammo_type = /obj/item/ammo_casing/a357 projectile_type = /obj/item/projectile/bullet/pistol/strong -/obj/item/gun/projectile/luger +/obj/item/gun/ballistic/luger name = "\improper P08 Luger" desc = "Not some cheap scheisse Martian knockoff! This Luger is an authentic reproduction by RauMauser. Accuracy, easy handling, and its signature appearance make it popular among historic gun collectors. Uses 9mm rounds." icon_state = "p08" @@ -313,17 +313,17 @@ allowed_magazines = list(/obj/item/ammo_magazine/m9mm/compact) projectile_type = /obj/item/projectile/bullet/pistol -/obj/item/gun/projectile/luger/update_icon_state() +/obj/item/gun/ballistic/luger/update_icon_state() . = ..() if(ammo_magazine) icon_state = "[initial(icon_state)]" else icon_state = "[initial(icon_state)]-e" -/obj/item/gun/projectile/luger/brown +/obj/item/gun/ballistic/luger/brown icon_state = "p08b" -/obj/item/gun/projectile/p92x +/obj/item/gun/ballistic/p92x name = "9mm pistol" desc = "A widespread sidearm called the P92X which is used by military, police, and security forces across the galaxy. Uses 9mm rounds." icon_state = "p92x" @@ -333,35 +333,35 @@ magazine_type = /obj/item/ammo_magazine/m9mm allowed_magazines = list(/obj/item/ammo_magazine/m9mm) // Can accept illegal large capacity magazines, or compact magazines. -/obj/item/gun/projectile/p92x/update_icon_state() +/obj/item/gun/ballistic/p92x/update_icon_state() . = ..() if(ammo_magazine) icon_state = "[initial(icon_state)]" else icon_state = "[initial(icon_state)]-e" -/obj/item/gun/projectile/p92x/sec +/obj/item/gun/ballistic/p92x/sec desc = "A widespread sidearm called the P92X which is used by military, police, and security forces across the galaxy. This one is a less-lethal variant that only accepts 9mm rubber or flash magazines." magazine_type = /obj/item/ammo_magazine/m9mm/rubber allowed_magazines = list(/obj/item/ammo_magazine/m9mm/rubber, /obj/item/ammo_magazine/m9mm/flash) //Ported this over from the _vr before deletion. Commenting them out because I'm not sure we want these in. /* -/obj/item/gun/projectile/p92x/large/licensed +/obj/item/gun/ballistic/p92x/large/licensed icon_state = "p92x-brown" magazine_type = /obj/item/ammo_magazine/m9mm/large/licensed // Spawns with big magazines that are legal. -/obj/item/gun/projectile/p92x/large/licensed/hp +/obj/item/gun/ballistic/p92x/large/licensed/hp magazine_type = /obj/item/ammo_magazine/m9mm/large/licensed/hp // Spawns with legal hollow-point mag */ -/obj/item/gun/projectile/p92x/brown +/obj/item/gun/ballistic/p92x/brown icon_state = "p92x-brown" -/obj/item/gun/projectile/p92x/large +/obj/item/gun/ballistic/p92x/large magazine_type = /obj/item/ammo_magazine/m9mm/large // Spawns with illegal magazines. -/obj/item/gun/projectile/r9 +/obj/item/gun/ballistic/r9 name = "C96-Red 9" desc = "A variation on the Mauser C-96 - the first semi firearm ever to be widely adopted by a human military. This version is chambered for 9mm and reloads using stripper clips." icon_state = "r9" @@ -371,13 +371,13 @@ max_shells = 10 ammo_type = /obj/item/ammo_casing/a9mm -/obj/item/gun/projectile/r9/holy +/obj/item/gun/ballistic/r9/holy name = "Blessed Red 9" desc = "Ah, the choice of an avid gun collector! It's a nice gun, stranger." ammo_type = /obj/item/ammo_casing/a9mm/silver holy = TRUE -/obj/item/gun/projectile/clown_pistol +/obj/item/gun/ballistic/clown_pistol name = "clown pistol" desc = "This curious weapon feeds from a compressed biomatter cartridge, and seems to fabricate its ammunition from that supply." icon_state = "clownpistol" @@ -390,7 +390,7 @@ allowed_magazines = list(/obj/item/ammo_magazine/mcompressedbio/compact) projectile_type = /obj/item/projectile/bullet/organic -/obj/item/gun/projectile/clown_pistol/update_icon_state() +/obj/item/gun/ballistic/clown_pistol/update_icon_state() . = ..() if(ammo_magazine) icon_state = "[initial(icon_state)]" @@ -398,7 +398,7 @@ icon_state = "[initial(icon_state)]-e" //Hey did you ever see Kingsman? Well, you know this gun then. -/obj/item/gun/projectile/konigin +/obj/item/gun/ballistic/konigin name = "Konigin-63 compact" desc = "Originally produced in 2463 by GMC, the Konigin is generally considered to be a direct ancestor to the P3 Whisper. By the time GMC ended production, the Konigin-63 had undergone significant design changes - including the installment of a single capacity shotgun on the underbarrel. This rare design is certainly inspired, and has become something of a collector's item post-war." icon_state = "konigin" @@ -412,32 +412,32 @@ allowed_magazines = list(/obj/item/ammo_magazine/m9mm/compact) projectile_type = /obj/item/projectile/bullet/pistol -/obj/item/gun/projectile/konigin +/obj/item/gun/ballistic/konigin firemodes = list( list(mode_name="pistol", burst=1, fire_delay=0, move_delay=null, use_shotgun=null, burst_accuracy=null, dispersion=null), list(mode_name="shotgun", burst=null, fire_delay=null, move_delay=null, use_shotgun=1, burst_accuracy=null, dispersion=null) ) var/use_shotgun = 0 - var/obj/item/gun/projectile/shotgun/underslung/shotgun + var/obj/item/gun/ballistic/shotgun/underslung/shotgun -/obj/item/gun/projectile/konigin/Initialize(mapload) +/obj/item/gun/ballistic/konigin/Initialize(mapload) . = ..() shotgun = new(src) -/obj/item/gun/projectile/konigin/attackby(obj/item/I, mob/user) +/obj/item/gun/ballistic/konigin/attackby(obj/item/I, mob/user) if((istype(I, /obj/item/ammo_casing/a12g))) shotgun.load_ammo(I, user) else ..() -/obj/item/gun/projectile/konigin/attack_hand(mob/user) +/obj/item/gun/ballistic/konigin/attack_hand(mob/user) if(user.get_inactive_held_item() == src && use_shotgun) shotgun.unload_ammo(user) else ..() -/obj/item/gun/projectile/konigin/Fire(atom/target, mob/living/user, params, pointblank=0, reflex=0) +/obj/item/gun/ballistic/konigin/Fire(atom/target, mob/living/user, params, pointblank=0, reflex=0) if(use_shotgun) shotgun.Fire(target, user, params, pointblank, reflex) //if(!shotgun.chambered) @@ -445,7 +445,7 @@ else ..() -/obj/item/gun/projectile/konigin/update_icon_state() +/obj/item/gun/ballistic/konigin/update_icon_state() . = ..() if(ammo_magazine) icon_state = "[initial(icon_state)]" @@ -453,7 +453,7 @@ icon_state = "[initial(icon_state)]-e" /* Having issues with getting this to work atm. -/obj/item/gun/projectile/konigin/examine(mob/user) +/obj/item/gun/ballistic/konigin/examine(mob/user) . = ..() if(shotgun.loaded) @@ -463,7 +463,7 @@ */ //Exploration/Pathfinder Sidearms -/obj/item/gun/projectile/fnseven +/obj/item/gun/ballistic/fnseven name = "NT-57 'LES'" desc = "The NT-57 'LES' (Light Expeditionary Sidearm) is a tried and tested pistol often issued to Pathfinders. Featuring a polymer frame, collapsible stock, and integrated optics, the LES is lightweight and reliably functions in nearly any hazardous environment, including vacuum." icon_state = "nt57" @@ -478,7 +478,7 @@ var/collapsible = 1 var/extended = 0 -/obj/item/gun/projectile/fnseven/update_icon_state() +/obj/item/gun/ballistic/fnseven/update_icon_state() . = ..() if(!extended && ammo_magazine) icon_state = "nt57" @@ -489,7 +489,7 @@ else icon_state = "nt57-e" -/obj/item/gun/projectile/fnseven/attack_self(mob/user, obj/item/gun/G) +/obj/item/gun/ballistic/fnseven/attack_self(mob/user, obj/item/gun/G) if(collapsible && !extended) to_chat(user, "You pull out the stock on the [src], steadying the weapon.") w_class = ITEMSIZE_LARGE @@ -506,17 +506,17 @@ extended = 0 update_icon() -/obj/item/gun/projectile/fnseven/pathfinder +/obj/item/gun/ballistic/fnseven/pathfinder pin = /obj/item/firing_pin/explorer -/obj/item/gun/projectile/fnseven/vintage +/obj/item/gun/ballistic/fnseven/vintage name = "5.7 sidearm" desc = "This classic sidearm design utilizes an adaptable round considered to be superior to 9mm parabellum. It shares a round type with the H90K." icon_state = "fnseven" collapsible = 0 extended = 1 -/obj/item/gun/projectile/fnseven/vintage/update_icon_state() +/obj/item/gun/ballistic/fnseven/vintage/update_icon_state() . = ..() if(ammo_magazine) icon_state = "fnseven" @@ -524,7 +524,7 @@ icon_state = "fnseven-e" //Apidean Weapons -/obj/item/gun/projectile/apinae_pistol +/obj/item/gun/ballistic/apinae_pistol name = "\improper Apinae Enforcer pistol" desc = "Used by Hive-guards to detain deviants." icon_state = "apipistol" @@ -537,12 +537,12 @@ allowed_magazines = list(/obj/item/ammo_magazine/biovial) projectile_type = /obj/item/projectile/bullet/organic/wax -/obj/item/gun/projectile/apinae_pistol/update_icon_state() +/obj/item/gun/ballistic/apinae_pistol/update_icon_state() . = ..() icon_state = "apipistol-[ammo_magazine ? round(ammo_magazine.stored_ammo.len, 2) : "empty"]" //Tyrmalin Weapons -/obj/item/gun/projectile/pirate/junker_pistol +/obj/item/gun/ballistic/pirate/junker_pistol name = "scrap pistol" desc = "A strange handgun made from industrial parts. It appears to accept multiple rounds thanks to an internal magazine. Favored by Tyrmalin wannabe-gunslingers." icon_state = "junker_pistol" @@ -555,7 +555,7 @@ max_shells = 3 //Donksoft Weapons -/obj/item/gun/projectile/pistol/foam +/obj/item/gun/ballistic/pistol/foam name = "toy pistol" desc = "The Donk Co line of DONKsoft weapons is taking the galaxy by storm. Made of quality plastic, nothing launches darts better." icon = 'icons/obj/toy.dmi' @@ -568,22 +568,22 @@ allowed_magazines = list(/obj/item/ammo_magazine/mfoam/pistol) fire_sound = 'sound/items/syringeproj.ogg' -/obj/item/gun/projectile/pistol/foam/update_icon_state() +/obj/item/gun/ballistic/pistol/foam/update_icon_state() . = ..() if(ammo_magazine) icon_state = "[initial(icon_state)]" else icon_state = "[initial(icon_state)]-e" -/obj/item/gun/projectile/pistol/foam/handle_suicide(mob/living/user) +/obj/item/gun/ballistic/pistol/foam/handle_suicide(mob/living/user) user.show_message("You feel rather silly, trying to commit suicide with a toy.") mouthshoot = 0 return -/obj/item/gun/projectile/pistol/foam/blue +/obj/item/gun/ballistic/pistol/foam/blue icon_state = "toy_pistol_blue" -/obj/item/gun/projectile/pistol/foam/magnum +/obj/item/gun/ballistic/pistol/foam/magnum name = "toy automag" icon_state = "toy_pistol_orange" w_class = ITEMSIZE_NORMAL diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm index 446229261d6..dd7631158de 100644 --- a/code/modules/projectiles/guns/projectile/revolver.dm +++ b/code/modules/projectiles/guns/projectile/revolver.dm @@ -1,4 +1,4 @@ -/obj/item/gun/projectile/revolver +/obj/item/gun/ballistic/revolver name = "revolver" desc = "The Lumoco Arms HE Colt is a choice revolver for when you absolutely, positively need to put a hole in the other guy. Uses .357 rounds." icon_state = "revolver" @@ -13,11 +13,11 @@ mag_remove_sound = 'sound/weapons/guns/interaction/rev_magout.ogg' var/chamber_offset = 0 //how many empty chambers in the cylinder until you hit a round -/obj/item/gun/projectile/revolver/holy +/obj/item/gun/ballistic/revolver/holy name = "blessed revolver" ammo_type = /obj/item/ammo_casing/a357/silver -/obj/item/gun/projectile/revolver/verb/spin_cylinder() +/obj/item/gun/ballistic/revolver/verb/spin_cylinder() set name = "Spin cylinder" set desc = "Fun when you're bored out of your skull." set category = "Object" @@ -30,28 +30,28 @@ if(rand(1,max_shells) > loaded.len) chamber_offset = rand(0,max_shells - loaded.len) -/obj/item/gun/projectile/revolver/consume_next_projectile() +/obj/item/gun/ballistic/revolver/consume_next_projectile() if(chamber_offset) chamber_offset-- return return ..() -/obj/item/gun/projectile/revolver/load_ammo(var/obj/item/A, mob/user) +/obj/item/gun/ballistic/revolver/load_ammo(var/obj/item/A, mob/user) chamber_offset = 0 return ..() -/obj/item/gun/projectile/revolver/mateba +/obj/item/gun/ballistic/revolver/mateba name = "mateba" desc = "This unique looking handgun is named after an Italian company famous for the manufacture of these revolvers, and pasta kneading machines. Uses .357 rounds." // Yes I'm serious. -Spades icon_state = "mateba" origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2) -/obj/item/gun/projectile/revolver/mateba/taj +/obj/item/gun/ballistic/revolver/mateba/taj name = "Adhomai revolver" desc = "The Akhan and Khan Royal Service Revolver. Sophisticated but dated, this weapon is a metaphor for the New Kingdom of Adhomai itself." icon_state = "mateba-taj" -/obj/item/gun/projectile/revolver/mateba/taj/knife +/obj/item/gun/ballistic/revolver/mateba/taj/knife name = "Adhomai knife revolver" desc = "An ornate knife revolver from an Adhomai gunsmith. Popular among Tajaran nobility just before the civil war and even to this day, many of these revolvers found their way into the market when they were taken as trophies by Grand People's Army soldiers and DPRA guerillas." icon_state = "knifegun" @@ -61,7 +61,7 @@ sharp = 1 edge = 1 -/obj/item/gun/projectile/revolver/detective +/obj/item/gun/ballistic/revolver/detective name = "revolver" desc = "A cheap Martian knock-off of a Smith & Wesson Model 10. Uses .38-Special rounds." icon_state = "detective" @@ -69,7 +69,7 @@ origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2) ammo_type = /obj/item/ammo_casing/a38 -/obj/item/gun/projectile/revolver/detective/verb/rename_gun() +/obj/item/gun/ballistic/revolver/detective/verb/rename_gun() set name = "Name Gun" set category = "Object" set desc = "Click to rename your gun. If you're the detective." @@ -87,7 +87,7 @@ to_chat(M, "You name the gun [input]. Say hello to your new friend.") return 1 -/obj/item/gun/projectile/revolver/detective45 +/obj/item/gun/ballistic/revolver/detective45 name = ".45 revolver" desc = "A fancy replica of an old revolver, modified for .45 rounds and a seven-shot cylinder." icon_state = "detective" @@ -97,7 +97,7 @@ max_shells = 7 -/obj/item/gun/projectile/revolver/detective45/verb/rename_gun() +/obj/item/gun/ballistic/revolver/detective45/verb/rename_gun() set name = "Name Gun" set category = "Object" set desc = "Rename your gun. If you're the Detective." @@ -116,7 +116,7 @@ to_chat(M, "You name the gun [input]. Say hello to your new friend.") return 1 -/obj/item/gun/projectile/revolver/detective45/verb/reskin_gun() +/obj/item/gun/ballistic/revolver/detective45/verb/reskin_gun() set name = "Resprite gun" set category = "Object" set desc = "Click to choose a sprite for your gun." @@ -141,7 +141,7 @@ // Blade Runner pistol. -/obj/item/gun/projectile/revolver/deckard +/obj/item/gun/ballistic/revolver/deckard name = "\improper Deckard .38" desc = "A custom-built revolver, based off the semi-popular Detective Special model. Uses .38-Special rounds." icon_state = "deckard-empty" @@ -149,23 +149,23 @@ origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2) ammo_type = /obj/item/ammo_casing/a38 -/obj/item/gun/projectile/revolver/deckard/emp +/obj/item/gun/ballistic/revolver/deckard/emp ammo_type = /obj/item/ammo_casing/a38/emp -/obj/item/gun/projectile/revolver/deckard/update_icon_state() +/obj/item/gun/ballistic/revolver/deckard/update_icon_state() . = ..() if(loaded.len) icon_state = "deckard-loaded" else icon_state = "deckard-empty" -/obj/item/gun/projectile/revolver/deckard/load_ammo(var/obj/item/A, mob/user) +/obj/item/gun/ballistic/revolver/deckard/load_ammo(var/obj/item/A, mob/user) if(istype(A, /obj/item/ammo_magazine)) flick("deckard-reload",src) ..() -/obj/item/gun/projectile/revolver/capgun +/obj/item/gun/ballistic/revolver/capgun name = "cap gun" desc = "Looks almost like the real thing! Ages 8 and up." icon_state = "revolver" @@ -177,7 +177,7 @@ ammo_type = /obj/item/ammo_casing/cap projectile_type = /obj/item/projectile/bullet/pistol/strong -/obj/item/gun/projectile/revolver/judge +/obj/item/gun/ballistic/revolver/judge name = "\"The Judge\"" desc = "A revolving hand-shotgun by Cybersun Industries that packs the power of a 12 guage in the palm of your hand (if you don't break your wrist). Uses 12g rounds." icon_state = "judge" @@ -190,7 +190,7 @@ projectile_type = /obj/item/projectile/bullet/shotgun // ToDo: Remove accuracy debuf in exchange for slightly injuring your hand every time you fire it. -/obj/item/gun/projectile/revolver/lemat +/obj/item/gun/ballistic/revolver/lemat name = "LeMat Revolver" desc = "The LeMat Revolver is a 9 shot revolver with a secondary firing barrel loading shotgun shells. For when you really need something dead. Uses .38-Special and 12g rounds depending on the barrel." icon_state = "lemat" @@ -208,12 +208,12 @@ var/list/secondary_loaded = list() var/list/tertiary_loaded = list() -/obj/item/gun/projectile/revolver/lemat/Initialize(mapload) +/obj/item/gun/ballistic/revolver/lemat/Initialize(mapload) for(var/i in 1 to secondary_max_shells) secondary_loaded += new secondary_ammo_type(src) return ..() -/obj/item/gun/projectile/revolver/lemat/verb/swap_firingmode() +/obj/item/gun/ballistic/revolver/lemat/verb/swap_firingmode() set name = "Swap Firing Mode" set category = "Object" set desc = "Click to swap from one method of firing to another." @@ -255,7 +255,7 @@ flipped_firing = 0 -/obj/item/gun/projectile/revolver/lemat/spin_cylinder() +/obj/item/gun/ballistic/revolver/lemat/spin_cylinder() set name = "Spin cylinder" set desc = "Fun when you're bored out of your skull." set category = "Object" @@ -269,7 +269,7 @@ if(rand(1,max_shells) > loaded.len) chamber_offset = rand(0,max_shells - loaded.len) -/obj/item/gun/projectile/revolver/lemat/examine(mob/user) +/obj/item/gun/ballistic/revolver/lemat/examine(mob/user) . = ..() if(secondary_loaded) var/to_print @@ -279,13 +279,13 @@ else . += "\The [src] has a secondary barrel that is empty." -/obj/item/gun/projectile/revolver/lemat/holy +/obj/item/gun/ballistic/revolver/lemat/holy name = "Blessed LeMat Revolver" ammo_type = /obj/item/ammo_casing/a38/silver secondary_ammo_type = /obj/item/ammo_casing/a12g/silver //Ported from Bay -/obj/item/gun/projectile/revolver/webley +/obj/item/gun/ballistic/revolver/webley name = "service revolver" desc = "A rugged top break revolver based on the Webley Mk. VI model, with modern improvements. Uses .44 magnum rounds." icon_state = "webley2" @@ -296,11 +296,11 @@ max_shells = 6 ammo_type = /obj/item/ammo_casing/a44 -/obj/item/gun/projectile/revolver/webley/holy +/obj/item/gun/ballistic/revolver/webley/holy name = "blessed service revolver" ammo_type = /obj/item/ammo_casing/a44/silver -/obj/item/gun/projectile/revolver/webley/auto +/obj/item/gun/ballistic/revolver/webley/auto name = "autorevolver" icon_state = "mosley" desc = "A shiny Mosley Autococker automatic revolver, with black accents. Marketed as the 'Revolver for the Modern Era'. Uses .44 magnum rounds." @@ -308,7 +308,7 @@ fire_anim = "mosley_fire" origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 2) -/obj/item/gun/projectile/revolver/dirty_harry +/obj/item/gun/ballistic/revolver/dirty_harry name = "Model 29 Revolver" desc = "A powerful hand cannon made famous by the legendary lawman that wielded it. Even to this day people follow in his legacy. 'Are you feeling lucky punk?'" icon_state = "dirty_harry" @@ -320,11 +320,11 @@ max_shells = 6 ammo_type = /obj/item/ammo_casing/a44 -/obj/item/gun/projectile/revolver/dirty_harry/holy +/obj/item/gun/ballistic/revolver/dirty_harry/holy name = "Blessed Model 29" ammo_type = /obj/item/ammo_casing/a44/silver -/obj/item/gun/projectile/revolver/combat +/obj/item/gun/ballistic/revolver/combat name = "NT-R-7 combat revolver" desc = "A semiautomatic revolver tooled for NanoTrasen special operations. Chambered in .44 Magnum, it serves as the perfect sidearm for any off the books endeavor." icon_state = "combatrevolver" @@ -333,7 +333,7 @@ origin_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 3) ammo_type = /obj/item/ammo_casing/a44 -/obj/item/gun/projectile/revolver/combat/update_icon_state() +/obj/item/gun/ballistic/revolver/combat/update_icon_state() . = ..() if(loaded.len) icon_state = "combatrevolver" diff --git a/code/modules/projectiles/guns/projectile/rocket.dm b/code/modules/projectiles/guns/projectile/rocket.dm index daf7e44e0cc..076a4ae5c77 100644 --- a/code/modules/projectiles/guns/projectile/rocket.dm +++ b/code/modules/projectiles/guns/projectile/rocket.dm @@ -1,4 +1,4 @@ -/obj/item/gun/projectile/rocket +/obj/item/gun/ballistic/rocket name = "rocket launcher" desc = "MAGGOT." icon_state = "rocket" @@ -17,7 +17,7 @@ one_handed_penalty = 30 /* -/obj/item/gun/projectile/rocket/proc/load(obj/item/ammo_casing/rocket/R, mob/user) +/obj/item/gun/ballistic/rocket/proc/load(obj/item/ammo_casing/rocket/R, mob/user) if(R.loadable) if(rockets.len >= max_rockets) to_chat(user, "[src] is full.") @@ -29,7 +29,7 @@ return to_chat(user, "[R] doesn't seem to fit in the [src]!") -/obj/item/gun/projectile/rocket/proc/unload(mob/user) +/obj/item/gun/ballistic/rocket/proc/unload(mob/user) if(rockets.len) var/obj/item/ammo_casing/rocket/R = rockets[rockets.len] rockets.len-- @@ -39,13 +39,13 @@ else to_chat(user, "[src] is empty.") -/obj/item/gun/projectile/rocket/attackby(obj/item/I, mob/user) +/obj/item/gun/ballistic/rocket/attackby(obj/item/I, mob/user) if((istype(I, /obj/item/ammo_casing/rocket))) load(I, user) else ..() -/obj/item/gun/projectile/rocket/attack_hand(mob/user) +/obj/item/gun/ballistic/rocket/attack_hand(mob/user) if(user.get_inactive_held_item() == src) unload(user) else @@ -59,12 +59,12 @@ return null */ -/obj/item/gun/projectile/rocket/handle_post_fire(mob/user, atom/target) +/obj/item/gun/ballistic/rocket/handle_post_fire(mob/user, atom/target) message_admins("[key_name_admin(user)] fired a rocket from a rocket launcher ([src.name]) at [target].") log_game("[key_name_admin(user)] used a rocket launcher ([src.name]) at [target].") ..() -/obj/item/gun/projectile/rocket/collapsible +/obj/item/gun/ballistic/rocket/collapsible name = "disposable rocket launcher" desc = "A single use rocket launcher designed with portability in mind. This disposable launcher must be extended before it can fire." icon_state = "missile" @@ -76,24 +76,24 @@ var/collapsed = 1 var/empty = 0 -/obj/item/gun/projectile/rocket/collapsible/special_check(mob/user) +/obj/item/gun/ballistic/rocket/collapsible/special_check(mob/user) if(collapsed) to_chat(user, "[src] is collapsed! You must extend it before firing!") return 0 return ..() -/obj/item/gun/projectile/rocket/collapsible/attackby(var/obj/item/A as obj, mob/user as mob) +/obj/item/gun/ballistic/rocket/collapsible/attackby(var/obj/item/A as obj, mob/user as mob) to_chat(user, "You cannot reload the [src]!") return -/obj/item/gun/projectile/rocket/collapsible/attack_hand(mob/user as mob) +/obj/item/gun/ballistic/rocket/collapsible/attack_hand(mob/user as mob) if(user.get_inactive_held_item() == src) to_chat(user, "You cannot unload the [src]'s munition!") return else return ..() -/obj/item/gun/projectile/rocket/collapsible/attack_self(mob/user, obj/item/gun/G) +/obj/item/gun/ballistic/rocket/collapsible/attack_self(mob/user, obj/item/gun/G) if(collapsed) to_chat(user, "You pull out the tube on the [src], readying the weapon to be fired.") icon_state = "[initial(icon_state)]-extended" @@ -108,11 +108,11 @@ item_state = "[initial(item_state)]" collapsed = 1 -/obj/item/gun/projectile/rocket/collapsible/examine(mob/user) +/obj/item/gun/ballistic/rocket/collapsible/examine(mob/user) . = ..() return -/obj/item/gun/projectile/rocket/collapsible/consume_next_projectile(mob/user as mob) +/obj/item/gun/ballistic/rocket/collapsible/consume_next_projectile(mob/user as mob) . = ..() if(empty) return @@ -122,7 +122,7 @@ icon_state = "[initial(icon_state)]-empty" empty = 1 -/obj/item/gun/projectile/rocket/tyrmalin +/obj/item/gun/ballistic/rocket/tyrmalin name = "rokkit launcher" desc = "A sloppily machined tube designed to function as a recoilless rifle. Sometimes used by Tyrmalin defense teams, it draws skeptical looks even amongst their ranks." icon_state = "rokkitlauncher" @@ -130,7 +130,7 @@ var/unstable = 1 var/jammed = 0 -/obj/item/gun/projectile/rocket/tyrmalin/consume_next_projectile(mob/user as mob) +/obj/item/gun/ballistic/rocket/tyrmalin/consume_next_projectile(mob/user as mob) . = ..() if(.) if(unstable) diff --git a/code/modules/projectiles/guns/projectile/semiauto.dm b/code/modules/projectiles/guns/projectile/semiauto.dm index 8d555791d90..d8cddbe9bed 100644 --- a/code/modules/projectiles/guns/projectile/semiauto.dm +++ b/code/modules/projectiles/guns/projectile/semiauto.dm @@ -1,4 +1,4 @@ -/obj/item/gun/projectile/garand +/obj/item/gun/ballistic/garand name = "\improper M1 Garand" desc = "This is the vintage semi-automatic rifle that famously helped win the second World War. What the hell it's doing aboard a space station in the 26th century, you can only imagine. Uses 7.62mm rounds." icon_state = "garand" @@ -16,14 +16,14 @@ auto_eject_sound = 'sound/weapons/garand_ping.ogg' one_handed_penalty = 15 -/obj/item/gun/projectile/garand/update_icon_state() +/obj/item/gun/ballistic/garand/update_icon_state() . = ..() if(ammo_magazine) icon_state = initial(icon_state) else icon_state = "[initial(icon_state)]-e" -/obj/item/gun/projectile/garand/sniper +/obj/item/gun/ballistic/garand/sniper name = "M1A Garand" desc = "A reproduction model of the rare M1A Garand rifle. This one seems to have been modified by a gun smith." icon_state = "sgarand" @@ -33,14 +33,14 @@ accuracy = 70 //Forced missing fucking sucks ass scoped_accuracy = 100 -/obj/item/gun/projectile/garand/sniper/verb/scope() +/obj/item/gun/ballistic/garand/sniper/verb/scope() set category = "Object" set name = "Use Scope" set popup_menu = 1 toggle_scope(2.0) -/obj/item/gun/projectile/apinae_stinger +/obj/item/gun/ballistic/apinae_stinger name = "\improper Apinae Stinger Rifle" desc = "A biotechnological marvel, this living rifle can grow its ammo when provided with liquified wax. It fires poisonous bolts of barbed chitin." icon_state = "apigun" @@ -57,6 +57,6 @@ projectile_type = /obj/item/projectile/bullet/organic/stinger one_handed_penalty = 25 -/obj/item/gun/projectile/apinae_stinger/update_icon_state() +/obj/item/gun/ballistic/apinae_stinger/update_icon_state() . = ..() icon_state = "apigun-[ammo_magazine ? round(ammo_magazine.stored_ammo.len, 2) : "empty"]" diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm index f816deb1e82..8ed10896d32 100644 --- a/code/modules/projectiles/guns/projectile/shotgun.dm +++ b/code/modules/projectiles/guns/projectile/shotgun.dm @@ -1,4 +1,4 @@ -/obj/item/gun/projectile/shotgun/pump +/obj/item/gun/ballistic/shotgun/pump name = "shotgun" desc = "The mass-produced W-T Remmington 29x shotgun is a favourite of police and security forces on many worlds. Uses 12g rounds." icon_state = "shotgun" @@ -21,17 +21,17 @@ var/animated_pump = 0 //This is for cyling animations. var/empty_sprite = 0 //This is just a dirty var so it doesn't fudge up. -/obj/item/gun/projectile/shotgun/pump/consume_next_projectile() +/obj/item/gun/ballistic/shotgun/pump/consume_next_projectile() if(chambered) - return chambered.BB + return chambered.get_projectile() return null -/obj/item/gun/projectile/shotgun/pump/attack_self(mob/living/user as mob) +/obj/item/gun/ballistic/shotgun/pump/attack_self(mob/living/user as mob) if(world.time >= recentpump + 10) pump(user) recentpump = world.time -/obj/item/gun/projectile/shotgun/pump/proc/pump(mob/M as mob) +/obj/item/gun/ballistic/shotgun/pump/proc/pump(mob/M as mob) playsound(M, action_sound, 60, 1) if(chambered)//We have a shell in the chamber @@ -48,7 +48,7 @@ update_icon() -/obj/item/gun/projectile/shotgun/pump/update_icon_state() +/obj/item/gun/ballistic/shotgun/pump/update_icon_state() . = ..() if(!empty_sprite)//Just a dirty check return @@ -57,10 +57,10 @@ else icon_state = "[icon_state]-empty" -/obj/item/gun/projectile/shotgun/pump/slug +/obj/item/gun/ballistic/shotgun/pump/slug ammo_type = /obj/item/ammo_casing/a12g -/obj/item/gun/projectile/shotgun/pump/combat +/obj/item/gun/ballistic/shotgun/pump/combat name = "combat shotgun" desc = "Built for close quarters combat, the Hephaestus Industries KS-40 is widely regarded as a weapon of choice for repelling boarders. Uses 12g rounds." icon_state = "shotgun_c" @@ -70,7 +70,7 @@ ammo_type = /obj/item/ammo_casing/a12g load_method = SINGLE_CASING|SPEEDLOADER -/obj/item/gun/projectile/shotgun/pump/combat/warden +/obj/item/gun/ballistic/shotgun/pump/combat/warden name = "warden's shotgun" desc = "A heavily modified Hephaestus Industries KS-40. This version bears multiple after-market mods, including a laser sight to help compensate for its shortened stock. 'Property of the Warden' has been etched into the side of the reciever. Uses 12g rounds." icon_state = "shotgun_w" @@ -78,7 +78,7 @@ w_class = ITEMSIZE_NORMAL ammo_type = /obj/item/ammo_casing/a12g/beanbag -/obj/item/gun/projectile/shotgun/pump/combat/warden/verb/rename_gun() +/obj/item/gun/ballistic/shotgun/pump/combat/warden/verb/rename_gun() set name = "Name Gun" set category = "Object" set desc = "Rename your gun. If you're the Warden." @@ -97,7 +97,7 @@ to_chat(M, "You name the gun [input]. Lock and load.") return 1 -/obj/item/gun/projectile/shotgun/pump/combat/warden/verb/reskin_gun() +/obj/item/gun/ballistic/shotgun/pump/combat/warden/verb/reskin_gun() set name = "Resprite gun" set category = "Object" set desc = "Click to choose a sprite for your gun." @@ -117,7 +117,7 @@ return 1 //Don't you wish you had bigger arms? -/obj/item/gun/projectile/shotgun/pump/combat/grit +/obj/item/gun/ballistic/shotgun/pump/combat/grit name = "Grit" desc = "This exotic ten gauge shotgun sports a custom paint job and a cylinder choke. At close ranges, it packs quite the punch." icon_state = "grit" @@ -132,7 +132,7 @@ /* //This is being stubborn. Might need more input. / In fact, I'm gonna save this work for some larger kind of "Recoil Size Check" system later. -/obj/item/gun/projectile/shotgun/pump/combat/grit/Fire(atom/target, mob/living/user) +/obj/item/gun/ballistic/shotgun/pump/combat/grit/Fire(atom/target, mob/living/user) . = ..() if(user.mob_size < MOB_MEDIUM) var/mob/living/L = target @@ -142,7 +142,7 @@ user.emote("flip") */ -/obj/item/gun/projectile/shotgun/doublebarrel +/obj/item/gun/ballistic/shotgun/doublebarrel name = "double-barreled shotgun" desc = "A truely classic weapon. No need to change what works. Uses 12g rounds." icon_state = "shotgun_d" @@ -167,24 +167,24 @@ list(mode_name="fire both barrels at once", one_handed_penalty = 35, burst=2), ) -/obj/item/gun/projectile/shotgun/doublebarrel/pellet +/obj/item/gun/ballistic/shotgun/doublebarrel/pellet ammo_type = /obj/item/ammo_casing/a12g/pellet -/obj/item/gun/projectile/shotgun/doublebarrel/holy +/obj/item/gun/ballistic/shotgun/doublebarrel/holy ammo_type = /obj/item/ammo_casing/a12g/silver desc = "Alright you primitive screw heads, listen up. See this? This... is my BOOMSTICK." holy = TRUE -/obj/item/gun/projectile/shotgun/doublebarrel/flare +/obj/item/gun/ballistic/shotgun/doublebarrel/flare name = "signal shotgun" desc = "A double-barreled shotgun meant to fire signal flare shells. Uses 12g rounds." ammo_type = /obj/item/ammo_casing/a12g/flare -/obj/item/gun/projectile/shotgun/doublebarrel/unload_ammo(user, allow_dump) +/obj/item/gun/ballistic/shotgun/doublebarrel/unload_ammo(user, allow_dump) ..(user, allow_dump=1) //this is largely hacky and bad :( -Pete -/obj/item/gun/projectile/shotgun/doublebarrel/attackby(var/obj/item/A as obj, mob/user as mob) +/obj/item/gun/ballistic/shotgun/doublebarrel/attackby(var/obj/item/A as obj, mob/user as mob) if(istype(A, /obj/item/surgical/circular_saw) || istype(A, /obj/item/melee/energy) || istype(A, /obj/item/pickaxe/plasmacutter)) to_chat(user, "You begin to shorten the barrel of \the [src].") if(loaded.len) @@ -207,7 +207,7 @@ else ..() -/obj/item/gun/projectile/shotgun/doublebarrel/sawn +/obj/item/gun/ballistic/shotgun/doublebarrel/sawn name = "sawn-off shotgun" desc = "Omar's coming!" // I'm not gonna add "Uses 12g rounds." to this one. I'll just let this reference go undisturbed. icon_state = "sawnshotgun" @@ -220,15 +220,15 @@ force = 5 one_handed_penalty = 5 -/obj/item/gun/projectile/shotgun/doublebarrel/sawn/alt +/obj/item/gun/ballistic/shotgun/doublebarrel/sawn/alt icon_state = "shotpistol" accuracy = 40 -/obj/item/gun/projectile/shotgun/doublebarrel/sawn/alt/holy // A Special Skin for the sawn off,makes it look like the sawn off from Blood. +/obj/item/gun/ballistic/shotgun/doublebarrel/sawn/alt/holy // A Special Skin for the sawn off,makes it look like the sawn off from Blood. ammo_type = /obj/item/ammo_casing/a12g/silver holy = TRUE -/obj/item/gun/projectile/shotgun/doublebarrel/quad +/obj/item/gun/ballistic/shotgun/doublebarrel/quad name = "quad-barreled shotgun" desc = "A shotgun pattern designed to make the most out of the limited machining capability of the frontier. 4 Whole barrels of death, loads using 12 gauge rounds." icon_state = "shotgun_q" @@ -252,7 +252,7 @@ list(mode_name="fire one barrel at a time", burst=1), ) -/obj/item/gun/projectile/shotgun/doublebarrel/sawn/super +/obj/item/gun/ballistic/shotgun/doublebarrel/sawn/super name = "super shotgun" desc = "Rip and tear, until it is done." icon_state = "supershotgun" @@ -267,7 +267,7 @@ force = 15 //Flaregun Code that may work? -/obj/item/gun/projectile/shotgun/flare +/obj/item/gun/ballistic/shotgun/flare name = "Emergency Flare Gun" desc = "A common mass produced emergency flare gun capable of shooting a single flare great distances for signalling air and ground forces alike. As it loads 12g flare shells it can also function as improvised 12g shotgun. On it a description reads: 'Warning: Possession is prohibited outside of emergency situations'." icon_state = "flareg" @@ -284,25 +284,25 @@ projectile_type = /obj/item/projectile/energy/flash one_handed_penalty = 0 -/obj/item/gun/projectile/shotgun/flare/paramed +/obj/item/gun/ballistic/shotgun/flare/paramed name = "Paramedic Flare Gun" desc = "A common mass produced emergency flare gun capable of shooting a single flare great distances for signalling air and ground forces alike. As it loads 12g flare shells it can also function as improvised 12g shotgun. On it a description reads: 'For use by emergency medical services only.'" icon_state = "flareg-para" -/obj/item/gun/projectile/shotgun/flare/explo +/obj/item/gun/ballistic/shotgun/flare/explo name = "Exploration Flare Gun" desc = "A common mass produced emergency flare gun capable of shooting a single flare great distances for signalling air and ground forces alike. As it loads 12g flare shells it can also function as improvised 12g shotgun. On it a description reads: 'For use on extraplanetary excursions only.'" icon_state = "flareg-explo" -/obj/item/gun/projectile/shotgun/flare/holy +/obj/item/gun/ballistic/shotgun/flare/holy name = "Brass Flare Gun" desc = "A Brass Flare Gun far more exspensuve and well made then the plastic ones mass produced for signalling. It fires using an odd clockwork mechanism. Loads using 12g" icon_state = "flareg-holy" accuracy = 50 //Strong Gun Better Accuracy holy = TRUE -/obj/item/gun/projectile/shotgun/doublebarrel/axe +/obj/item/gun/ballistic/shotgun/doublebarrel/axe name = "Shot Axe" desc = " A single barrel shotgun with a long curved stock and an axe head wrapped around the end of the barrel. More axe than shotgun, the blade has been treated with an odd smelling incense. Loads using 12g shells." icon_state = "axeshotgun" @@ -319,7 +319,7 @@ edge = 1 holy = TRUE -/obj/item/gun/projectile/shotgun/underslung +/obj/item/gun/ballistic/shotgun/underslung name = "underslung shotgun" desc = "A compact shotgun designed to be mounted underneath a proper weapon, this secondary unit usually has a limited capacity." icon_state = null @@ -334,7 +334,7 @@ safety_state = GUN_SAFETY_OFF //Foam Shotguns -/obj/item/gun/projectile/shotgun/pump/foam +/obj/item/gun/ballistic/shotgun/pump/foam name = "toy shotgun" desc = "A relatively faithful recreation of a pump action shotgun, this one only accepts foam darts." icon = 'icons/obj/toy.dmi' @@ -347,12 +347,12 @@ one_handed_penalty = 5 fire_sound = 'sound/items/syringeproj.ogg' -/obj/item/gun/projectile/shotgun/pump/foam/handle_suicide(mob/living/user) +/obj/item/gun/ballistic/shotgun/pump/foam/handle_suicide(mob/living/user) user.show_message("You feel rather silly, trying to commit suicide with a toy.") mouthshoot = 0 return -/obj/item/gun/projectile/shotgun/pump/foam/pump(mob/M as mob) +/obj/item/gun/ballistic/shotgun/pump/foam/pump(mob/M as mob) playsound(M, action_sound, 60, 1) if(chambered)//We have a shell in the chamber @@ -367,5 +367,5 @@ flick("[icon_state]-cycling", src)//This plays any pumping update_icon() -/obj/item/gun/projectile/shotgun/pump/foam/blue +/obj/item/gun/ballistic/shotgun/pump/foam/blue icon_state = "toy_shotgun_blue" diff --git a/code/modules/projectiles/guns/projectile/sniper.dm b/code/modules/projectiles/guns/projectile/sniper.dm index 4328be3bda9..fa561200118 100644 --- a/code/modules/projectiles/guns/projectile/sniper.dm +++ b/code/modules/projectiles/guns/projectile/sniper.dm @@ -1,6 +1,6 @@ ////////////// PTR-7 Anti-Materiel Rifle ////////////// -/obj/item/gun/projectile/heavysniper +/obj/item/gun/ballistic/heavysniper name = "anti-materiel rifle" desc = "A portable anti-armour rifle fitted with a scope, the HI PTR-7 Rifle was originally designed to used against armoured exosuits. It is capable of punching through windows and non-reinforced walls with ease. Fires armor piercing 14.5mm shells." icon_state = "heavysniper" @@ -23,13 +23,13 @@ one_handed_penalty = 90 var/bolt_open = 0 -/obj/item/gun/projectile/heavysniper/update_icon() +/obj/item/gun/ballistic/heavysniper/update_icon() if(bolt_open) icon_state = "heavysniper-open" else icon_state = "heavysniper" -/obj/item/gun/projectile/heavysniper/attack_self(mob/user as mob) +/obj/item/gun/ballistic/heavysniper/attack_self(mob/user as mob) playsound(src.loc, 'sound/weapons/flipblade.ogg', 50, 1) bolt_open = !bolt_open if(bolt_open) @@ -48,23 +48,23 @@ add_fingerprint(user) update_icon() -/obj/item/gun/projectile/heavysniper/special_check(mob/user) +/obj/item/gun/ballistic/heavysniper/special_check(mob/user) if(bolt_open) to_chat(user, "You can't fire [src] while the bolt is open!") return 0 return ..() -/obj/item/gun/projectile/heavysniper/load_ammo(var/obj/item/A, mob/user) +/obj/item/gun/ballistic/heavysniper/load_ammo(var/obj/item/A, mob/user) if(!bolt_open) return ..() -/obj/item/gun/projectile/heavysniper/unload_ammo(mob/user, var/allow_dump=1) +/obj/item/gun/ballistic/heavysniper/unload_ammo(mob/user, var/allow_dump=1) if(!bolt_open) return ..() -/obj/item/gun/projectile/heavysniper/verb/scope() +/obj/item/gun/ballistic/heavysniper/verb/scope() set category = "Object" set name = "Use Scope" set popup_menu = 1 @@ -73,7 +73,7 @@ ////////////// Dragunov Sniper Rifle ////////////// -/obj/item/gun/projectile/SVD +/obj/item/gun/ballistic/SVD name = "\improper Dragunov" desc = "The SVD, also known as the Dragunov, is mass produced with an Optical Sniper Sight so simple that even Ivan can use it. Too bad for you that the inscriptions are written in Russian. Uses 7.62mm rounds." icon_state = "SVD" @@ -93,21 +93,21 @@ magazine_type = /obj/item/ammo_magazine/m762svd allowed_magazines = list(/obj/item/ammo_magazine/m762svd) -/obj/item/gun/projectile/SVD/update_icon_state() +/obj/item/gun/ballistic/SVD/update_icon_state() . = ..() if(ammo_magazine) icon_state = "SVD" else icon_state = "SVD-empty" -/obj/item/gun/projectile/SVD/verb/scope() +/obj/item/gun/ballistic/SVD/verb/scope() set category = "Object" set name = "Use Scope" set popup_menu = 1 toggle_scope(2.0) -/obj/item/gun/projectile/SVD/taj +/obj/item/gun/ballistic/SVD/taj name = "Adhomai sniper rifle" desc = "The Hotaki Marksman rifle, in stark contrast to the usual products of Hotak's arms, is an elegant and precise rifle that has taken the lives of many high value targets in the name of defending the Democratic People's Republic of Adhomai." icon_state = "svd-taj" @@ -115,7 +115,7 @@ wielded_item_state = "svd-taj-wielded" -/obj/item/gun/projectile/SVD/taj/update_icon_state() +/obj/item/gun/ballistic/SVD/taj/update_icon_state() . = ..() if(ammo_magazine) icon_state = "SVD-taj" diff --git a/code/modules/projectiles/guns/projectile/sniper/collapsible_sniper.dm b/code/modules/projectiles/guns/projectile/sniper/collapsible_sniper.dm index aa4715798d7..1cf3a698022 100644 --- a/code/modules/projectiles/guns/projectile/sniper/collapsible_sniper.dm +++ b/code/modules/projectiles/guns/projectile/sniper/collapsible_sniper.dm @@ -1,8 +1,8 @@ ////////////// PTR-7 Anti-Materiel Rifle ////////////// -/obj/item/gun/projectile/heavysniper/collapsible +/obj/item/gun/ballistic/heavysniper/collapsible -/obj/item/gun/projectile/heavysniper/collapsible/verb/take_down() +/obj/item/gun/ballistic/heavysniper/collapsible/verb/take_down() set category = "Object" set name = "Disassemble Rifle" @@ -15,7 +15,7 @@ else collapse_rifle(user) -/obj/item/gun/projectile/heavysniper/proc/collapse_rifle(mob/user) +/obj/item/gun/ballistic/heavysniper/proc/collapse_rifle(mob/user) to_chat(user, "You begin removing \the [src]'s barrel.") if(do_after(user, 40)) to_chat(user, "You remove \the [src]'s barrel.") @@ -161,14 +161,14 @@ w_class = ITEMSIZE_LARGE if(3) - var/obj/item/gun/projectile/heavysniper/collapsible/gun = new (get_turf(src), 0) + var/obj/item/gun/ballistic/heavysniper/collapsible/gun = new (get_turf(src), 0) if(usr && istype(usr, /mob/living/carbon/human)) var/mob/living/carbon/human/user = usr user.temporarily_remove_from_inventory(src, INV_OP_FORCE | INV_OP_SHOULD_NOT_INTERCEPT | INV_OP_SILENT) user.put_in_hands_or_drop(gun) qdel(src) -/obj/item/gun/projectile/heavysniper/update_icon_state() +/obj/item/gun/ballistic/heavysniper/update_icon_state() . = ..() if(bolt_open) icon_state = "heavysniper-open" diff --git a/code/modules/projectiles/ammunition.dm b/code/modules/projectiles/magazines/magazine.dm similarity index 69% rename from code/modules/projectiles/ammunition.dm rename to code/modules/projectiles/magazines/magazine.dm index ad1a09134b9..6614f99d5a0 100644 --- a/code/modules/projectiles/ammunition.dm +++ b/code/modules/projectiles/magazines/magazine.dm @@ -1,62 +1,3 @@ -/obj/item/ammo_casing - name = "bullet casing" - desc = "A bullet casing." - icon = 'icons/obj/ammo.dmi' - icon_state = "s-casing" - slot_flags = SLOT_BELT | SLOT_EARS - throw_force = 1 - w_class = ITEMSIZE_TINY - preserve_item = 1 - drop_sound = 'sound/items/drop/ring.ogg' - pickup_sound = 'sound/items/pickup/ring.ogg' - - var/leaves_residue = 1 - var/caliber = "" //Which kind of guns it can be loaded into - var/projectile_type //The bullet type to create when New() is called - var/obj/item/projectile/BB = null //The loaded bullet - make it so that the projectiles are created only when needed? - var/caseless = null //Caseless ammo deletes its self once the projectile is fired. - var/fall_sounds = list('sound/weapons/guns/casingfall1.ogg','sound/weapons/guns/casingfall2.ogg','sound/weapons/guns/casingfall3.ogg') - -/obj/item/ammo_casing/Initialize(mapload) - . = ..() - if(ispath(projectile_type)) - BB = new projectile_type(src) - pixel_x = rand(-10, 10) - pixel_y = rand(-10, 10) - -//removes the projectile from the ammo casing -/obj/item/ammo_casing/proc/expend() - . = BB - BB = null - setDir(pick(GLOB.cardinal)) //spin spent casings - update_icon() - -/obj/item/ammo_casing/attackby(obj/item/W as obj, mob/user as mob) - if(W.is_screwdriver()) - if(!BB) - to_chat(user, "There is no bullet in the casing to inscribe anything into.") - return - - var/tmp_label = "" - var/label_text = sanitizeSafe(input(user, "Inscribe some text into \the [initial(BB.name)]","Inscription",tmp_label), MAX_NAME_LEN) - if(length(label_text) > 20) - to_chat(user, "The inscription can be at most 20 characters long.") - else if(!label_text) - to_chat(user, "You scratch the inscription off of [initial(BB)].") - BB.name = initial(BB.name) - else - to_chat(user, "You inscribe \"[label_text]\" into \the [initial(BB.name)].") - BB.name = "[initial(BB.name)] (\"[label_text]\")" - -/obj/item/ammo_casing/update_icon() - if(!BB) - icon_state = "[initial(icon_state)]-spent" - -/obj/item/ammo_casing/examine(mob/user) - . = ..() - if (!BB) - . += "This one is spent." - //An item that holds casings and can be used to put them inside guns /obj/item/ammo_magazine name = "magazine" @@ -210,7 +151,3 @@ magazine_icondata_keys["[M.type]"] = icon_keys magazine_icondata_states["[M.type]"] = ammo_states - -/obj/item/ammo_casing/proc/newshot() //For energy weapons, syringe gun, shotgun shells and wands (!). - if(!BB) - BB = new projectile_type(src, src) diff --git a/code/modules/projectiles/ammunition/smartmag.dm b/code/modules/projectiles/magazines/smartmag.dm similarity index 100% rename from code/modules/projectiles/ammunition/smartmag.dm rename to code/modules/projectiles/magazines/smartmag.dm diff --git a/code/modules/projectiles/ammunition/magazines.dm b/code/modules/projectiles/magazines/unsorted.dm similarity index 100% rename from code/modules/projectiles/ammunition/magazines.dm rename to code/modules/projectiles/magazines/unsorted.dm diff --git a/code/modules/projectiles/ammunition/magic.dm b/code/modules/projectiles/unsorted/magic.dm similarity index 100% rename from code/modules/projectiles/ammunition/magic.dm rename to code/modules/projectiles/unsorted/magic.dm diff --git a/code/modules/projectiles/ammunition/magnetic.dm b/code/modules/projectiles/unsorted/magnetic.dm similarity index 100% rename from code/modules/projectiles/ammunition/magnetic.dm rename to code/modules/projectiles/unsorted/magnetic.dm diff --git a/code/modules/random_map/drop/drop_types.dm b/code/modules/random_map/drop/drop_types.dm index e8c0199c0ef..3fdf9ec9932 100644 --- a/code/modules/random_map/drop/drop_types.dm +++ b/code/modules/random_map/drop/drop_types.dm @@ -61,10 +61,10 @@ var/global/list/datum/supply_drop_loot/supply_drop /obj/item/shield/riot/tele, /obj/item/storage/box/emps, /obj/item/storage/box/flashbangs, - /obj/item/gun/projectile/automatic/sts35, + /obj/item/gun/ballistic/automatic/sts35, /obj/item/ammo_magazine/m762/ap, /obj/item/ammo_magazine/m762/ap, - /obj/item/gun/projectile/colt, + /obj/item/gun/ballistic/colt, /obj/item/ammo_magazine/m45, /obj/item/material/knife/tacknife/combatknife) @@ -82,7 +82,7 @@ var/global/list/datum/supply_drop_loot/supply_drop /obj/item/storage/belt/security/tactical/bandolier, /obj/item/clothing/accessory/storage/black_drop_pouches, /obj/item/storage/backpack/dufflebag/sec, - /obj/item/gun/projectile/automatic/bullpup, + /obj/item/gun/ballistic/automatic/bullpup, /obj/item/ammo_magazine/m762/ap, /obj/item/ammo_magazine/m762, /obj/item/shield/energy, @@ -115,7 +115,7 @@ var/global/list/datum/supply_drop_loot/supply_drop /obj/item/storage/belt/security, /obj/item/clothing/shoes/boots/jackboots, /obj/item/clothing/gloves/black, - /obj/item/gun/projectile/shotgun/pump, + /obj/item/gun/ballistic/shotgun/pump, /obj/item/gun/energy/gun, /obj/item/clothing/accessory/holster, /obj/item/gun/launcher/grenade, diff --git a/code/modules/research/designs/weapons.dm b/code/modules/research/designs/weapons.dm index a2e8dd2947a..9b8b4241990 100644 --- a/code/modules/research/designs/weapons.dm +++ b/code/modules/research/designs/weapons.dm @@ -81,7 +81,7 @@ desc = "An advanced 9mm SMG with a reflective laser optic." req_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 3) materials = list(MAT_STEEL = 8000, MAT_SILVER = 2000, MAT_DIAMOND = 1000) - build_path = /obj/item/gun/projectile/automatic/advanced_smg + build_path = /obj/item/gun/ballistic/automatic/advanced_smg sort_string = "MABAA" /datum/design/item/weapon/ballistic/p90 @@ -89,7 +89,7 @@ desc = "The H90K is a compact, large capacity submachine gun produced by Hephaestus Industries. Despite its fierce reputation, it still manages to feel like a toy. Uses 9mm rounds." req_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 4) materials = list(MAT_STEEL = 5000, MAT_PLASTIC = 5000, MAT_URANIUM = 1000) - build_path = /obj/item/gun/projectile/automatic/p90 + build_path = /obj/item/gun/ballistic/automatic/p90 sort_string = "MABAB" // Ballistic ammo @@ -215,7 +215,7 @@ id = "dartgun_r" req_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 4, TECH_BIO = 4, TECH_MAGNET = 3, TECH_ILLEGAL = 1) materials = list(MAT_STEEL = 5000, MAT_GOLD = 5000, MAT_SILVER = 2500, MAT_GLASS = 750) - build_path = /obj/item/gun/projectile/dartgun/research + build_path = /obj/item/gun/ballistic/dartgun/research sort_string = "MADAB" /datum/design/item/weapon/chemsprayer @@ -388,7 +388,7 @@ id = "nsfw_prototype" req_tech = list(TECH_MATERIAL = 6, TECH_MAGNET = 4, TECH_POWER = 4, TECH_COMBAT = 7) materials = list(MAT_STEEL = 10000, MAT_GLASS = 6000, MAT_PHORON = 8000, MAT_URANIUM = 4000) - build_path = /obj/item/gun/projectile/cell_loaded/combat/prototype + build_path = /obj/item/gun/ballistic/cell_loaded/combat/prototype sort_string = "MAVAA" /datum/design/item/weapon/cell_based/prototype_nsfw_mag diff --git a/code/modules/vore/fluffstuff/custom_boxes.dm b/code/modules/vore/fluffstuff/custom_boxes.dm index da0f3051dea..caf45e50c5f 100644 --- a/code/modules/vore/fluffstuff/custom_boxes.dm +++ b/code/modules/vore/fluffstuff/custom_boxes.dm @@ -48,7 +48,7 @@ /obj/item/clothing/suit/storage/det_suit/fluff/tas_coat, /obj/item/clothing/under/det/fluff/tasald, /obj/item/clothing/accessory/permit/gun/fluff/tasald_corlethian, - /obj/item/gun/projectile/revolver/mateba/fluff/tasald_corlethian, + /obj/item/gun/ballistic/revolver/mateba/fluff/tasald_corlethian, /obj/item/implanter/loyalty) //bwoincognito:Octavious Ward @@ -182,7 +182,7 @@ /obj/item/storage/box/fluff/sebastian_aji name = "Sebastian's Lumoco Arms P3 Box" has_items = list( - /obj/item/gun/projectile/pistol, + /obj/item/gun/ballistic/pistol, /obj/item/ammo_magazine/m9mm/compact/flash, /obj/item/ammo_magazine/m9mm/compact/flash, /obj/item/clothing/accessory/permit/gun/fluff/sebastian_aji) @@ -191,7 +191,7 @@ /obj/item/storage/box/fluff/briana_moore name = "Briana's Derringer Box" has_items = list( - /obj/item/gun/projectile/derringer/fluff/briana, + /obj/item/gun/ballistic/derringer/fluff/briana, /obj/item/clothing/accessory/permit/gun/fluff/briana_moore) */ @@ -201,7 +201,7 @@ name = "Serdy's Weapon Box" has_items = list( /obj/item/clothing/accessory/permit/gun/fluff/silencedmp5a5, - /obj/item/gun/projectile/colt/fluff/serdy) + /obj/item/gun/ballistic/colt/fluff/serdy) */ //BeyondMyLife: Ne'tra Ky'ram //Made a box because they have so many items that it'd spam the debug log. diff --git a/code/modules/vore/fluffstuff/custom_guns.dm b/code/modules/vore/fluffstuff/custom_guns.dm index e27b98b84d9..7b20bbbf9c2 100644 --- a/code/modules/vore/fluffstuff/custom_guns.dm +++ b/code/modules/vore/fluffstuff/custom_guns.dm @@ -36,7 +36,7 @@ //////////////////// Projectile Weapons //////////////////// //////////////////////////////////////////////////////////// // For general use -/obj/item/gun/projectile/automatic/battlerifle +/obj/item/gun/ballistic/automatic/battlerifle name = "\improper JSDF service rifle" desc = "You had your chance to be afraid before you joined my beloved Corps! But, to guide you back to the true path, I have brought this motivational device! Uses 9.5x40mm rounds." icon_state = "battlerifle" @@ -56,7 +56,7 @@ one_handed_penalty = 60 // The weapon itself is heavy // For general use -/obj/item/gun/projectile/shotgun/pump/JSDF +/obj/item/gun/ballistic/shotgun/pump/JSDF name = "\improper JSDF tactical shotgun" desc = "All you greenhorns who wanted to see Xenomorphs up close... this is your lucky day. Uses 12g rounds." icon_state = "haloshotgun" @@ -67,7 +67,7 @@ max_shells = 12 // For general use -/obj/item/gun/projectile/automatic/pdw +/obj/item/gun/ballistic/automatic/pdw name = "personal defense weapon" desc = "The X-9MM is a select-fire personal defense weapon designed in-house by Xing Private Security. It was made to compete with the WT550 Saber, but never caught on with NanoTrasen. Uses 9mm rounds." icon_state = "pdw" @@ -85,11 +85,11 @@ list(mode_name="3-round bursts", burst=3, fire_delay=null, move_delay=6, burst_accuracy=list(0,-15,-30), dispersion=list(0.0, 0.6, 0.6)) ) -/obj/item/gun/projectile/automatic/pdw/update_icon() +/obj/item/gun/ballistic/automatic/pdw/update_icon() . = ..() update_held_icon() -/obj/item/gun/projectile/automatic/pdw/update_icon_state() +/obj/item/gun/ballistic/automatic/pdw/update_icon_state() . = ..() if(istype(ammo_magazine,/obj/item/ammo_magazine/m9mm)) icon_state = "pdw-short" @@ -113,14 +113,14 @@ projectile_type = /obj/item/projectile/beam/imperial /* CITADEL CHANGE - Removes Virgo Fluff // jertheace : Jeremiah 'Ace' Acacius -/obj/item/gun/projectile/shotgun/pump/USDF/fluff/ace +/obj/item/gun/ballistic/shotgun/pump/USDF/fluff/ace name = "Ace's tactical shotgun" // D-model holds half as many shells as the normal version so as not OP as shit. Better than normal shotgun, worse than combat shotgun. desc = "Owned by the respected (or feared?) veteran Captain of the original NSS Adephagia. Inscribed on the barrel are the words \"Speak softly, and carry a big stick.\"" ammo_type = /obj/item/ammo_casing/a12g/stunshell max_shells = 6 // bwoincognito:Tasald Corlethian -/obj/item/gun/projectile/revolver/mateba/fluff/tasald_corlethian //Now that it is actually Single-Action and not hacky broken SA, I see no reason to nerf this down to .38. --Joan Risu +/obj/item/gun/ballistic/revolver/mateba/fluff/tasald_corlethian //Now that it is actually Single-Action and not hacky broken SA, I see no reason to nerf this down to .38. --Joan Risu name = "\improper \"Big Iron\" revolver" desc = "A .357 revolver for veteran rangers on the planet Orta. The right side of the handle has a logo for Quarion industries, and the left is the Rangers. The primary ammo for this gun is .357 rubber. According to the CentCom Chief of Security, this revolver was more controversial than it needed to be." icon = 'icons/vore/custom_guns_vr.dmi' @@ -150,26 +150,26 @@ chambered = AC update_icon() -/obj/item/gun/projectile/revolver/mateba/fluff/tasald_corlethian/attack_hand(mob/user as mob) +/obj/item/gun/ballistic/revolver/mateba/fluff/tasald_corlethian/attack_hand(mob/user as mob) if(user.get_inactive_held_item() == src) unload_ammo(user, allow_dump = 1) else ..() // wankersonofjerkin : Glenn Pink -/obj/item/gun/projectile/revolver/fluff/admiral_pink_revolver +/obj/item/gun/ballistic/revolver/fluff/admiral_pink_revolver name = "Admiral Pink's 'Devilgun'" desc = "You notice the serial number on the revolver is 666. The word 'Sin' is engraved on the blood-red rosewood grip. Uses .357 rounds." //Edgy, but based on real guns the player owns. icon = 'icons/vore/custom_guns_vr.dmi' icon_state = "ryan_winz" item_state = "revolver" -/obj/item/gun/projectile/revolver/fluff/admiral_pink_revolver/redemption +/obj/item/gun/ballistic/revolver/fluff/admiral_pink_revolver/redemption name = "Admiral Pink's 'Redeemer'" desc = "You notice the serial number on the revolver is 667. The word 'Redemption' is engraved on dark rosewood grip. Uses .357 rounds." //Edgy, but based on real guns the player owns. // sasoperative : Joseph Skinner -/obj/item/gun/projectile/revolver/judge/fluff/sasoperative +/obj/item/gun/ballistic/revolver/judge/fluff/sasoperative name = "\"The Jury\"" desc = "A customized variant of the \"The Judge\" revolver sold by Cybersun Industries, built specifically for Joseph Skinner. Uses 12g shells." icon = 'icons/vore/custom_guns_vr.dmi' @@ -178,7 +178,7 @@ ammo_type = /obj/item/ammo_casing/a12g/beanbag // Dhaeleena : Dhaeleena M'iar -/obj/item/gun/projectile/revolver/mateba/fluff/dhael +/obj/item/gun/ballistic/revolver/mateba/fluff/dhael name = "Dhaeleena's engraved mateba" desc = "This unique looking handgun is engraved with roses along the barrel and the cylinder as well as the initials DM under the grip. Along the middle of the barrel an engraving shows the words 'Mateba Unica 6'. Uses .357 rounds." icon_state = "mateba" @@ -186,7 +186,7 @@ ammo_type = /obj/item/ammo_casing/a357/stun // SilencedMP5A5 : Serdykov Antoz -/obj/item/gun/projectile/colt/fluff/serdy +/obj/item/gun/ballistic/colt/fluff/serdy name = "Raikov PPS/45" desc = "An expertly crafted and reliable .45 sidearm with a 7 round single-stack magazine, originally built and in 2369 for frontier men and peacekeepers. The frame and slide are nickel plated, and it has a synthetic black ivory grip. The words 'Krasnaya Raketa' are engraved on the slide near the muzzle. It's relatively thin, but heavy. It also has an ambidextrous mag release and safety lever, making it grippable in either hand comfortably." icon = 'icons/vore/custom_guns_vr.dmi' @@ -196,7 +196,7 @@ magazine_type = /obj/item/ammo_magazine/m45/rubber /* //Commented out due to weapon change. -/obj/item/gun/projectile/revolver/detective/fluff/serdy //This forces it to be .38 bullets only +/obj/item/gun/ballistic/revolver/detective/fluff/serdy //This forces it to be .38 bullets only name = "Vintage S&W Model 10" desc = "It's a classic S&W Model 10 revolver. This one in particular is beautifully restored with a chromed black frame and cylinder, and a nice redwood grip. The name 'Serdykov A.' is engraved into the base of the grip." icon = 'icons/vore/custom_guns_vr.dmi' @@ -208,14 +208,14 @@ */ // LuminescentRing : Briana Moore -/obj/item/gun/projectile/derringer/fluff/briana +/obj/item/gun/ballistic/derringer/fluff/briana name = "second-hand derringer" desc = "It's a palm sized gun. One of the few things that won't break an angel's wrists. Uses 10mm rounds." caliber = "10mm" ammo_type = /obj/item/ammo_casing/a10mm END OF CITADEL CHANGES */ // For general use -/obj/item/gun/projectile/automatic/stg +/obj/item/gun/ballistic/automatic/stg name = "\improper Sturmgewehr" desc = "An STG-560 built by RauMauser. Experience the terror of the Siegfried line, redone for the 26th century! The Kaiser would be proud. Uses unique 7.92x33mm Kurz rounds." icon_state = "stg60" @@ -228,17 +228,17 @@ END OF CITADEL CHANGES */ allowed_magazines = list(/obj/item/ammo_magazine/mtg) load_method = MAGAZINE -/obj/item/gun/projectile/automatic/stg/update_icon() +/obj/item/gun/ballistic/automatic/stg/update_icon() . = ..() update_held_icon() -/obj/item/gun/projectile/automatic/stg/update_icon_state() +/obj/item/gun/ballistic/automatic/stg/update_icon_state() . = ..() icon_state = (ammo_magazine)? "stg60" : "stg60-empty" item_state = (ammo_magazine)? "arifle" : "arifle-empty" //-----------------------Tranq Gun---------------------------------- -/obj/item/gun/projectile/dartgun/tranq +/obj/item/gun/ballistic/dartgun/tranq name = "tranquilizer gun" desc = "A gas-powered dart gun designed by the National Armory of Gaia. This gun is used primarily by United Federation special forces for Tactical Espionage missions. Don't forget your bandana." icon_state = "tranqgun" @@ -256,7 +256,7 @@ END OF CITADEL CHANGES */ // Removed because gun64_vr.dmi guns don't work. /*//-----------------------UF-ARC---------------------------------- -/obj/item/gun/projectile/automatic/carbine/fluff/ufarc +/obj/item/gun/ballistic/automatic/carbine/fluff/ufarc name = "UF-ARC" desc = "The UF-ARC is a lightweight assault rifle manufactured by the National Armory of Gaia and sold almost exclusively to the United Federation's standing army, the Military Assault Command Operations Department (MACOs)." icon = 'icons/obj/gun64_vr.dmi' @@ -266,7 +266,7 @@ END OF CITADEL CHANGES */ item_icons = null pixel_x = -16 -/obj/item/gun/projectile/automatic/carbine/fluff/ufarc/update_icon(var/ignore_inhands) +/obj/item/gun/ballistic/automatic/carbine/fluff/ufarc/update_icon(var/ignore_inhands) ..() // TODO - Fix this for spriting different size magazines icon_state = (ammo_magazine)? "ufarc" : "ufarc-empty" @@ -276,7 +276,7 @@ END OF CITADEL CHANGES */ //-----------------------G44---------------------------------- -/obj/item/gun/projectile/automatic/carbine/fluff/g44 +/obj/item/gun/ballistic/automatic/carbine/fluff/g44 name = "G44 Rifle" desc = "The G44 is a lightweight assault rifle manufactured by the National Armory of Gaia and sold almost exclusively to the United Federation's standing army, the Military Assault Command Operations Department (MACOs)." icon = 'icons/obj/gun64_vr.dmi' @@ -284,7 +284,7 @@ END OF CITADEL CHANGES */ item_state = "bullpup" pixel_x = -16 -/obj/item/gun/projectile/automatic/carbine/fluff/g44/update_icon(var/ignore_inhands) +/obj/item/gun/ballistic/automatic/carbine/fluff/g44/update_icon(var/ignore_inhands) ..() // TODO - Fix this for spriting different size magazines icon_state = (ammo_magazine)? "g44" : "g44-empty" @@ -320,7 +320,7 @@ END OF CITADEL CHANGES */ /* CITADEL CHANGE - Removes Virgo Fluff // molenar:Kari Akiren -/obj/item/gun/projectile/shotgun/pump/rifle/fluff/kari_akiren +/obj/item/gun/ballistic/shotgun/pump/rifle/fluff/kari_akiren name = "clockwork rifle" desc = "Brass, copper, and lots of gears. Well lubricated for fluid movement as each round is loaded, locked, and fired. Just like clockwork." icon = 'icons/vore/custom_guns_vr.dmi' @@ -331,12 +331,12 @@ END OF CITADEL CHANGES */ /* Permit Expired //Razerwing:Archer Maximus -/obj/item/gun/projectile/colt/fluff/archercolt +/obj/item/gun/ballistic/colt/fluff/archercolt name = "\improper MEUSOC .45" desc = "Some serious drywall work, coming up!" */ //hzdonut:Jesse Soemmer -/obj/item/gun/projectile/revolver/fluff/jesselemat +/obj/item/gun/ballistic/revolver/fluff/jesselemat name = "Modified LeMat" desc = "The LeMat Revolver is a 9 shot revolver with a secondary firing barrel for loading shotgun shells. Uses .38-Special and 12g rounds depending on the barrel. This one appears to have had it's secondary barrel sealed off and looks to be in pristine condition. Either it's brand new, or its owner takes very good care of it." icon_state = "lemat" @@ -365,7 +365,7 @@ END OF CITADEL CHANGES */ //////////////////// Eris Ported Guns //////////////////// //HoS Gun -/*/obj/item/gun/projectile/lamia +/*/obj/item/gun/ballistic/lamia name = "FS HG .44 \"Lamia\"" desc = "Uses .44 rounds." icon = 'icons/obj/gun_vr.dmi' @@ -380,7 +380,7 @@ END OF CITADEL CHANGES */ auto_eject_sound = 'sound/weapons/smg_empty_alarm.ogg' origin_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 4) -/obj/item/gun/projectile/lamia/update_icon() +/obj/item/gun/ballistic/lamia/update_icon() cut_overlay() if(!ammo_magazine) return @@ -390,7 +390,7 @@ END OF CITADEL CHANGES */ //Civilian gun -/obj/item/gun/projectile/giskard +/obj/item/gun/ballistic/giskard name = "\improper \"Giskard\" holdout pistol" desc = "The FS HG .380 \"Giskard\" can even fit into the pocket! Uses .380 rounds." icon_state = "giskardcivil" @@ -402,7 +402,7 @@ END OF CITADEL CHANGES */ fire_sound = 'sound/weapons/gunshot_pathetic.ogg' origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 3) -/obj/item/gun/projectile/giskard/update_icon_state() +/obj/item/gun/ballistic/giskard/update_icon_state() . = ..() if(ammo_magazine && ammo_magazine.stored_ammo.len) icon_state = "giskardcivil" @@ -410,7 +410,7 @@ END OF CITADEL CHANGES */ icon_state = "giskardcivil_empty" //Not so civilian gun -/obj/item/gun/projectile/giskard/olivaw +/obj/item/gun/ballistic/giskard/olivaw name = "\improper \"Olivaw\" holdout burst-pistol" desc = "The FS HG .380 \"Olivaw\" is a more advanced version of the \"Giskard\". This one seems to have a two-round burst-fire mode. Uses .380 rounds." icon_state = "olivawcivil" @@ -419,7 +419,7 @@ END OF CITADEL CHANGES */ list(mode_name="2-round bursts", burst=2, fire_delay=0.2, move_delay=4, burst_accuracy=list(0,-15), dispersion=list(1.2, 1.8)), ) -/obj/item/gun/projectile/giskard/olivaw/update_icon_state() +/obj/item/gun/ballistic/giskard/olivaw/update_icon_state() . = ..() if(ammo_magazine && ammo_magazine.stored_ammo.len) icon_state = "olivawcivil" @@ -427,7 +427,7 @@ END OF CITADEL CHANGES */ icon_state = "olivawcivil_empty" //Detective gun -/obj/item/gun/projectile/revolver/consul +/obj/item/gun/ballistic/revolver/consul name = "\improper \"Consul\" Revolver" desc = "Are you feeling lucky, punk? Uses .44 rounds." icon_state = "inspector" @@ -437,7 +437,7 @@ END OF CITADEL CHANGES */ handle_casings = CYCLE_CASINGS origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 3) -/obj/item/gun/projectile/revolver/consul/update_overlays() +/obj/item/gun/ballistic/revolver/consul/update_overlays() . = ..() if(loaded.len==0) . += "inspector_off" @@ -445,7 +445,7 @@ END OF CITADEL CHANGES */ . += "inspector_on" // No idea what this is for. -/obj/item/gun/projectile/automatic/sol +/obj/item/gun/ballistic/automatic/sol name = "\improper \"Sol\" SMG" desc = "The FS 9x19mm \"Sol\" is a compact and reliable submachine gun. Uses 9mm rounds." icon_state = "SMG-IS" @@ -464,7 +464,7 @@ END OF CITADEL CHANGES */ list(mode_name="3-round bursts", burst=3, fire_delay=null, move_delay=4, burst_accuracy=list(0,-15,-15), dispersion=list(0.0, 0.6, 1.0)), ) -/obj/item/gun/projectile/automatic/sol/proc/update_charge() +/obj/item/gun/ballistic/automatic/sol/proc/update_charge() if(!ammo_magazine) return var/ratio = ammo_magazine.stored_ammo.len / ammo_magazine.max_ammo @@ -473,7 +473,7 @@ END OF CITADEL CHANGES */ ratio = round(ratio, 0.25) * 100 add_overlay("smg_[ratio]") -/obj/item/gun/projectile/automatic/sol/update_icon() +/obj/item/gun/ballistic/automatic/sol/update_icon() icon_state = (ammo_magazine)? "SMG-IS" : "SMG-IS-empty" cut_overlay() update_charge() diff --git a/code/modules/vore/fluffstuff/guns/cell_loaded/cell_loaded.dm b/code/modules/vore/fluffstuff/guns/cell_loaded/cell_loaded.dm index f093202fad0..b5368f9902d 100644 --- a/code/modules/vore/fluffstuff/guns/cell_loaded/cell_loaded.dm +++ b/code/modules/vore/fluffstuff/guns/cell_loaded/cell_loaded.dm @@ -1,5 +1,5 @@ // The Gun // -/obj/item/gun/projectile/cell_loaded //this one can load both medical and security cells! for ERT/admin use. +/obj/item/gun/ballistic/cell_loaded //this one can load both medical and security cells! for ERT/admin use. name = "multipurpose cell-loaded revolver" desc = "Variety is the spice of life! This weapon is a hybrid of the NT-102b 'Nanotech Selectable-Fire Weapon' and the Vey-Med ML-3 'Medigun', dubbed the 'NSFW-ML3M'. \ It can fire both harmful and healing cells with an internal nanite fabricator and energy weapon cell loader. Up to three combinations of \ @@ -27,7 +27,7 @@ var/max_charge = 0 charge_sections = 5 -/obj/item/gun/projectile/cell_loaded/consume_next_projectile() +/obj/item/gun/ballistic/cell_loaded/consume_next_projectile() if(chambered && ammo_magazine) var/obj/item/ammo_casing/microbattery/batt = chambered if(batt.shots_left) @@ -39,7 +39,7 @@ switch_to(other_batt) return new chambered.projectile_type() -/obj/item/gun/projectile/cell_loaded/proc/update_charge() +/obj/item/gun/ballistic/cell_loaded/proc/update_charge() charge_left = 0 max_charge = 0 @@ -57,7 +57,7 @@ charge_left += bullet.shots_left max_charge += initial(bullet.shots_left) -/obj/item/gun/projectile/cell_loaded/proc/switch_to(obj/item/ammo_casing/microbattery/new_batt) +/obj/item/gun/ballistic/cell_loaded/proc/switch_to(obj/item/ammo_casing/microbattery/new_batt) if(ishuman(loc)) if(chambered && new_batt.type == chambered.type) to_chat(loc,"\The [src] is now using the next [new_batt.type_name] power cell.") @@ -68,7 +68,7 @@ update_charge() update_icon() -/obj/item/gun/projectile/cell_loaded/attack_self(mob/user) +/obj/item/gun/ballistic/cell_loaded/attack_self(mob/user) if(!chambered) return @@ -87,7 +87,7 @@ switch_to(next_batt) break /* -/obj/item/gun/projectile/cell_loaded/special_check(mob/user) +/obj/item/gun/ballistic/cell_loaded/special_check(mob/user) if(!chambered) return @@ -97,16 +97,16 @@ return TRUE */ -/obj/item/gun/projectile/cell_loaded/load_ammo(var/obj/item/A, mob/user) +/obj/item/gun/ballistic/cell_loaded/load_ammo(var/obj/item/A, mob/user) . = ..() if(ammo_magazine && ammo_magazine.stored_ammo.len) switch_to(ammo_magazine.stored_ammo[1]) -/obj/item/gun/projectile/cell_loaded/unload_ammo(mob/user, var/allow_dump=1) +/obj/item/gun/ballistic/cell_loaded/unload_ammo(mob/user, var/allow_dump=1) chambered = null return ..() -/obj/item/gun/projectile/cell_loaded/update_overlays() +/obj/item/gun/ballistic/cell_loaded/update_overlays() . = ..() update_charge() @@ -243,7 +243,7 @@ max_w_class = ITEMSIZE_NORMAL /obj/item/storage/secure/briefcase/nsfw_pack_hybrid/PopulateContents() - new /obj/item/gun/projectile/cell_loaded(src) + new /obj/item/gun/ballistic/cell_loaded(src) new /obj/item/ammo_magazine/cell_mag/advanced(src) new /obj/item/ammo_casing/microbattery/combat/stun(src) new /obj/item/ammo_casing/microbattery/combat/stun(src) @@ -263,7 +263,7 @@ max_w_class = ITEMSIZE_NORMAL /obj/item/storage/secure/briefcase/nsfw_pack_hybrid_combat/PopulateContents() - new /obj/item/gun/projectile/cell_loaded(src) + new /obj/item/gun/ballistic/cell_loaded(src) new /obj/item/ammo_magazine/cell_mag/advanced(src) new /obj/item/ammo_casing/microbattery/combat/shotstun(src) new /obj/item/ammo_casing/microbattery/combat/shotstun(src) diff --git a/code/modules/vore/fluffstuff/guns/cell_loaded/ml3m.dm b/code/modules/vore/fluffstuff/guns/cell_loaded/ml3m.dm index dc6432c007c..ad9c2b13672 100644 --- a/code/modules/vore/fluffstuff/guns/cell_loaded/ml3m.dm +++ b/code/modules/vore/fluffstuff/guns/cell_loaded/ml3m.dm @@ -1,5 +1,5 @@ // The Gun // -/obj/item/gun/projectile/cell_loaded/medical +/obj/item/gun/ballistic/cell_loaded/medical name = "cell-loaded medigun" desc = "The ML-3 'Medigun', or ML3M for short, is a powerful cell-based ranged healing device designed by NanoTrasen with a partnership with Vey-Med. \ It uses an internal nanite fabricator, powered and controlled by discrete cells, to deliver a variety of effects at range. Up to six combinations of \ @@ -14,7 +14,7 @@ allowed_magazines = list(/obj/item/ammo_magazine/cell_mag/medical) no_pin_required = 1 -/obj/item/gun/projectile/cell_loaded/medical/cmo +/obj/item/gun/ballistic/cell_loaded/medical/cmo name = "advanced cell-loaded medigun" desc = "This is a variation on the ML-3 'Medigun', a powerful cell-based ranged healing device based on the same model made by NanoTrasen and Vey-Med \ It has an extended sight for increased accuracy, and much more comfortable grip. Ammo not included." @@ -49,7 +49,7 @@ max_w_class = ITEMSIZE_NORMAL /obj/item/storage/secure/briefcase/ml3m_pack_med/PopulateContents() - new /obj/item/gun/projectile/cell_loaded/medical(src) + new /obj/item/gun/ballistic/cell_loaded/medical(src) new /obj/item/ammo_magazine/cell_mag/medical(src) new /obj/item/ammo_casing/microbattery/medical/brute(src) new /obj/item/ammo_casing/microbattery/medical/burn(src) @@ -62,7 +62,7 @@ max_w_class = ITEMSIZE_NORMAL /obj/item/storage/secure/briefcase/ml3m_pack_cmo/PopulateContents() - new /obj/item/gun/projectile/cell_loaded/medical/cmo(src) + new /obj/item/gun/ballistic/cell_loaded/medical/cmo(src) new /obj/item/ammo_magazine/cell_mag/medical(src) new /obj/item/ammo_casing/microbattery/medical/brute(src) new /obj/item/ammo_casing/microbattery/medical/burn(src) diff --git a/code/modules/vore/fluffstuff/guns/cell_loaded/nsfw.dm b/code/modules/vore/fluffstuff/guns/cell_loaded/nsfw.dm index 3f15fe6c660..b881815f58c 100644 --- a/code/modules/vore/fluffstuff/guns/cell_loaded/nsfw.dm +++ b/code/modules/vore/fluffstuff/guns/cell_loaded/nsfw.dm @@ -1,5 +1,5 @@ // The Gun // -/obj/item/gun/projectile/cell_loaded/combat +/obj/item/gun/ballistic/cell_loaded/combat name = "cell-loaded revolver" desc = "Variety is the spice of life! The NT-102b 'Nanotech Selectable-Fire Weapon', or NSFW for short, is an unholy hybrid of an ammo-driven \ energy weapon that allows the user to mix and match their own fire modes. Up to four combinations of \ @@ -9,7 +9,7 @@ description_fluff = "The Nanotrasen 'Nanotech Selectable Fire Weapon' allows one to customize their loadout in the field, or before deploying, to achieve various results in a weapon they are already familiar with wielding." allowed_magazines = list(/obj/item/ammo_magazine/cell_mag/combat) -/obj/item/gun/projectile/cell_loaded/combat/prototype +/obj/item/gun/ballistic/cell_loaded/combat/prototype name = "prototype cell-loaded revolver" desc = "Variety is the spice of life! A prototype based on NT-102b 'Nanotech Selectable-Fire Weapon', or NSFW for short, is an unholy hybrid of an ammo-driven \ energy weapon that allows the user to mix and match their own fire modes. Up to two combinations of \ @@ -50,7 +50,7 @@ max_w_class = ITEMSIZE_NORMAL /obj/item/storage/secure/briefcase/nsfw_pack/PopulateContents() - new /obj/item/gun/projectile/cell_loaded/combat(src) + new /obj/item/gun/ballistic/cell_loaded/combat(src) new /obj/item/ammo_magazine/cell_mag/combat(src) for(var/path in subtypesof(/obj/item/ammo_casing/microbattery/combat)) new path(src) @@ -62,7 +62,7 @@ max_w_class = ITEMSIZE_NORMAL /obj/item/storage/secure/briefcase/nsfw_pack_hos/PopulateContents() - new /obj/item/gun/projectile/cell_loaded/combat(src) + new /obj/item/gun/ballistic/cell_loaded/combat(src) new /obj/item/ammo_magazine/cell_mag/combat(src) new /obj/item/ammo_casing/microbattery/combat/lethal(src) new /obj/item/ammo_casing/microbattery/combat/lethal(src) diff --git a/code/modules/vore/fluffstuff/guns/crestrose.dm b/code/modules/vore/fluffstuff/guns/crestrose.dm index c6ef4afd6f9..2aaeed5b388 100644 --- a/code/modules/vore/fluffstuff/guns/crestrose.dm +++ b/code/modules/vore/fluffstuff/guns/crestrose.dm @@ -1,4 +1,4 @@ -/obj/item/gun/projectile/automatic/fluff/crestrose +/obj/item/gun/ballistic/automatic/fluff/crestrose name = "Crescent Rose" desc = "Can you match my resolve? If so then you will succeed. I believe that the human spirit is indomitable. Keep Moving Forward. Uses 7.62mm rounds." icon = 'icons/vore/custom_guns_vr.dmi' @@ -26,13 +26,13 @@ list(mode_name="scythe", icon_state="crestrose",item_state = "crestrose",force=15), ) -/obj/item/gun/projectile/automatic/fluff/crestrose/switch_firemodes(mob/user) +/obj/item/gun/ballistic/automatic/fluff/crestrose/switch_firemodes(mob/user) if(..()) update_icon() update_held_icon() -/obj/item/gun/projectile/automatic/fluff/crestrose/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack") +/obj/item/gun/ballistic/automatic/fluff/crestrose/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack") if(default_parry_check(user, attacker, damage_source) && prob(50)) user.visible_message("\The [user] parries [attack_text] with \the [src]!") playsound(user.loc, 'sound/weapons/punchmiss.ogg', 50, 1) diff --git a/code/modules/vore/fluffstuff/guns/nsfw.dm b/code/modules/vore/fluffstuff/guns/nsfw.dm index 4c2d5404c85..21c783ad2b3 100644 --- a/code/modules/vore/fluffstuff/guns/nsfw.dm +++ b/code/modules/vore/fluffstuff/guns/nsfw.dm @@ -1,4 +1,4 @@ -/obj/item/gun/projectile/nsfw +/obj/item/gun/ballistic/nsfw name = "Hephaestus Hydra" desc = "The Hydra is a recent product from Hephaestus Industries, offering such a variety of fire modes that combatants will not know what to expect." diff --git a/code/modules/xenoarcheaology/finds/find_spawning.dm b/code/modules/xenoarcheaology/finds/find_spawning.dm index 4f0bfa22343..8803abdbb23 100644 --- a/code/modules/xenoarcheaology/finds/find_spawning.dm +++ b/code/modules/xenoarcheaology/finds/find_spawning.dm @@ -316,7 +316,7 @@ item_type = "gun" if(27) //revolver - var/obj/item/gun/projectile/new_gun = new /obj/item/gun/projectile/revolver(src.loc) + var/obj/item/gun/ballistic/new_gun = new /obj/item/gun/ballistic/revolver(src.loc) new_item = new_gun new_item.icon_state = "gun[rand(1,4)]" new_item.icon = 'icons/obj/xenoarchaeology.dmi'