diff --git a/code/datums/outfits/ert/kosmostrelki.dm b/code/datums/outfits/ert/kosmostrelki.dm index 21292a349b2..3228a8ad678 100644 --- a/code/datums/outfits/ert/kosmostrelki.dm +++ b/code/datums/outfits/ert/kosmostrelki.dm @@ -12,7 +12,7 @@ belt = /obj/item/storage/belt/military belt_contents = list( - /obj/item/ammo_magazine/boltaction = 5, + /obj/item/ammo_magazine/a68 = 3, /obj/item/grenade/smokebomb = 1, /obj/item/ammo_magazine/mc9mm = 1, /obj/item/gun/projectile/pistol/adhomai = 1, @@ -152,7 +152,7 @@ backpack_contents = list( /obj/item/gun/projectile/shotgun/pump/rifle/obrez = 1, - /obj/item/ammo_magazine/boltaction = 4, + /obj/item/ammo_magazine/boltaction/adhomai = 4, /obj/item/gun/projectile/pistol/adhomai = 1, /obj/item/material/knife/trench = 1 ) diff --git a/code/datums/uplink/ammunition.dm b/code/datums/uplink/ammunition.dm index 42a88aaa634..3d4fa95a9be 100644 --- a/code/datums/uplink/ammunition.dm +++ b/code/datums/uplink/ammunition.dm @@ -79,6 +79,16 @@ path = /obj/item/ammo_magazine/boltaction desc = "Contains five rounds of 7.62mm bullets." +/datum/uplink_item/item/ammo/adhomai_mag + name = "R33 Tamparii magazine" + path = /obj/item/ammo_magazine/a68 + desc = "Contains 25 rounds of 6.8mm bullets for Adhomian rifles." + +/datum/uplink_item/item/ammo/adhomai_mag/boltaction + name = "R33 Tamparii clip" + path = /obj/item/ammo_magazine/boltaction/adhomai + desc = "Contains 5 rounds of 6.8mm bullets for Adhomian rifles." + /datum/uplink_item/item/ammo/carbine_mag name = "5.56 carbine magazine" telecrystal_cost = 1 diff --git a/code/game/machinery/vending/misc_offship.dm b/code/game/machinery/vending/misc_offship.dm index 698479a616c..8371d4c2fc7 100644 --- a/code/game/machinery/vending/misc_offship.dm +++ b/code/game/machinery/vending/misc_offship.dm @@ -17,7 +17,7 @@ ) premium = list( /obj/item/gun/projectile/shotgun/pump/rifle/blank = 3, - /obj/item/ammo_magazine/boltaction/blank = 10, + /obj/item/ammo_magazine/boltaction/adhomai/blank = 10, /obj/item/storage/box/fancy/cigarettes/dpra = 5, /obj/item/storage/chewables/tobacco/bad = 5, /obj/item/reagent_containers/food/drinks/bottle/messa_mead = 5, diff --git a/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm b/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm index 684012c549b..ad5d8a61063 100644 --- a/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm +++ b/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm @@ -412,13 +412,13 @@ new /obj/item/clothing/suit/space/void/pra(src) new /obj/item/gun/projectile/automatic/rifle/adhomian(src) new /obj/item/gun/projectile/automatic/rifle/adhomian(src) - new /obj/item/ammo_magazine/boltaction(src) - new /obj/item/ammo_magazine/boltaction(src) - new /obj/item/ammo_magazine/boltaction(src) - new /obj/item/ammo_magazine/boltaction(src) - new /obj/item/ammo_magazine/boltaction(src) - new /obj/item/ammo_magazine/boltaction(src) - new /obj/item/ammo_magazine/boltaction(src) + new /obj/item/ammo_magazine/a68(src) + new /obj/item/ammo_magazine/a68(src) + new /obj/item/ammo_magazine/a68(src) + new /obj/item/ammo_magazine/a68(src) + new /obj/item/ammo_magazine/a68(src) + new /obj/item/ammo_magazine/a68(src) + new /obj/item/ammo_magazine/a68(src) new /obj/item/gun/energy/rifle/icelance(src) new /obj/item/gun/projectile/pistol/adhomai(src) new /obj/item/gun/projectile/pistol/adhomai(src) @@ -439,10 +439,10 @@ new /obj/item/clothing/head/helmet/space/void/pra(src) new /obj/item/clothing/suit/space/void/pra(src) new /obj/item/gun/projectile/automatic/rifle/adhomian(src) - new /obj/item/ammo_magazine/boltaction(src) - new /obj/item/ammo_magazine/boltaction(src) - new /obj/item/ammo_magazine/boltaction(src) - new /obj/item/ammo_magazine/boltaction(src) + new /obj/item/ammo_magazine/a68(src) + new /obj/item/ammo_magazine/a68(src) + new /obj/item/ammo_magazine/a68(src) + new /obj/item/ammo_magazine/a68(src) new /obj/item/gun/projectile/pistol/adhomai(src) new /obj/item/ammo_magazine/mc9mm(src) new /obj/item/ammo_magazine/mc9mm(src) @@ -770,9 +770,9 @@ new /obj/item/gun/projectile/automatic/rifle/shorty(src) new /obj/item/ammo_magazine/c762(src) new /obj/item/ammo_magazine/c762(src) - new /obj/item/gun/projectile/automatic/rifle/dpra/gold(src) - new /obj/item/ammo_magazine/c762/dpra(src) - new /obj/item/ammo_magazine/c762/dpra(src) + new /obj/item/gun/projectile/automatic/rifle/dpra(src) + new /obj/item/ammo_magazine/a68(src) + new /obj/item/ammo_magazine/a68(src) new /obj/item/storage/box/unathi_pirate(src) new /obj/item/voidsuit_modkit_multi/unathi_pirate/captain(src) @@ -811,12 +811,12 @@ new /obj/item/gun/projectile/automatic/rifle/dpra(src) new /obj/item/gun/projectile/automatic/rifle/dpra(src) new /obj/item/gun/projectile/automatic/rifle/dpra(src) - new /obj/item/ammo_magazine/c762/dpra(src) - new /obj/item/ammo_magazine/c762/dpra(src) - new /obj/item/ammo_magazine/c762/dpra(src) - new /obj/item/ammo_magazine/c762/dpra(src) - new /obj/item/ammo_magazine/c762/dpra(src) - new /obj/item/ammo_magazine/c762/dpra(src) + new /obj/item/ammo_magazine/a68(src) + new /obj/item/ammo_magazine/a68(src) + new /obj/item/ammo_magazine/a68(src) + new /obj/item/ammo_magazine/a68(src) + new /obj/item/ammo_magazine/a68(src) + new /obj/item/ammo_magazine/a68(src) new /obj/item/material/knife/bayonet(src) new /obj/item/material/knife/bayonet(src) new /obj/item/gun/projectile/shotgun/pump/rifle/scope(src) @@ -840,8 +840,8 @@ new /obj/item/clothing/suit/space/void/dpra(src) new /obj/item/clothing/head/helmet/space/void/dpra(src) new /obj/item/gun/projectile/automatic/rifle/dpra(src) - new /obj/item/ammo_magazine/c762/dpra(src) - new /obj/item/ammo_magazine/c762/dpra(src) + new /obj/item/ammo_magazine/a68(src) + new /obj/item/ammo_magazine/a68(src) new /obj/item/material/knife/bayonet(src) new /obj/item/gun/projectile/silenced(src) new /obj/item/ammo_magazine/c45m(src) diff --git a/code/modules/clothing/suits/xeno/tajara.dm b/code/modules/clothing/suits/xeno/tajara.dm index 38b59a215dd..bb52b9aa271 100644 --- a/code/modules/clothing/suits/xeno/tajara.dm +++ b/code/modules/clothing/suits/xeno/tajara.dm @@ -332,7 +332,7 @@ BOMB = ARMOR_BOMB_MINOR ) siemens_coefficient = 0.50 - allowed = list(/obj/item/gun/projectile/shotgun/pump/rifle, /obj/item/ammo_magazine/boltaction, /obj/item/gun/projectile/automatic/rifle/adhomian, /obj/item/flashlight) + allowed = list(/obj/item/gun/projectile/shotgun/pump/rifle, /obj/item/ammo_magazine/boltaction/adhomai, /obj/item/ammo_magazine/a68, /obj/item/gun/projectile/automatic/rifle/adhomian, /obj/item/flashlight) /obj/item/clothing/suit/storage/tajaran/dpra_jacket name = "al'mariist jacket" diff --git a/code/modules/ghostroles/spawner/human/pra.dm b/code/modules/ghostroles/spawner/human/pra.dm index e91ee59c9dd..314aa326fd9 100644 --- a/code/modules/ghostroles/spawner/human/pra.dm +++ b/code/modules/ghostroles/spawner/human/pra.dm @@ -43,7 +43,7 @@ id = /obj/item/card/id/syndicate accessory = /obj/item/clothing/accessory/badge/hadii_card belt_contents = list( - /obj/item/ammo_magazine/boltaction = 3, + /obj/item/ammo_magazine/a68 = 3, /obj/item/grenade/smokebomb = 2, /obj/item/plastique = 1, /obj/item/gun/projectile/pistol/adhomai = 1, diff --git a/code/modules/projectiles/ammunition/boxes.dm b/code/modules/projectiles/ammunition/boxes.dm index 4e39d28c44f..cded65a7f2d 100644 --- a/code/modules/projectiles/ammunition/boxes.dm +++ b/code/modules/projectiles/ammunition/boxes.dm @@ -545,6 +545,15 @@ If nothing is chosen, reload sounds revert to the default, which is metal_slide_ ammo_type = /obj/item/ammo_casing/vintage caliber = "vintage" +/obj/item/ammo_magazine/boltaction/adhomai + name = "ammo clip (6.8mm)" + icon_state = "762" + ammo_type = /obj/item/ammo_casing/a68 + caliber = "6.8mm" + +/obj/item/ammo_magazine/boltaction/adhomai/blank + ammo_type = /obj/item/ammo_casing/a68/blank + /obj/item/ammo_magazine/d762 name = "magazine (7.62mm)" icon_state = "SVD" @@ -558,6 +567,25 @@ If nothing is chosen, reload sounds revert to the default, which is metal_slide_ /obj/item/ammo_magazine/d762/empty initial_ammo = 0 +/obj/item/ammo_magazine/a68 + name = "magazine (6.8mm)" + icon_state = "a68" + mag_type = MAGAZINE + caliber = "6.8mm" + matter = list(DEFAULT_WALL_MATERIAL = 1800) + ammo_type = /obj/item/ammo_casing/a68/ + max_ammo = 25 + multiple_sprites = 1 + insert_sound = SFX_RELOAD_RIFLE_SLIDE + +/obj/item/ammo_magazine/a68/empty + initial_ammo = 0 + +/obj/item/ammo_magazine/a68/hotaki + icon_state = "SVD" + ammo_type = /obj/item/ammo_casing/a68/ap + max_ammo = 10 + // Shotguns and special // /obj/item/ammo_magazine/flechette name = "flechette rounds" diff --git a/code/modules/projectiles/ammunition/bullets.dm b/code/modules/projectiles/ammunition/bullets.dm index 53f350ae774..6058f16b269 100644 --- a/code/modules/projectiles/ammunition/bullets.dm +++ b/code/modules/projectiles/ammunition/bullets.dm @@ -263,6 +263,27 @@ . = ..() expend() +/obj/item/ammo_casing/a68 + desc = "A Z33 Tamparii bullet casing." + caliber = "6.8mm" + projectile_type = /obj/projectile/bullet/rifle/a68 + icon_state = "rifle-casing" + spent_icon = "rifle-casing-spent" + max_stack = 5 + +/obj/item/ammo_casing/a68/spent/Initialize() + . = ..() + expend() + +/obj/item/ammo_casing/a68/ap + desc = "A Z33r Tamparii bullet casing." + projectile_type = /obj/projectile/bullet/rifle/a68/ap + max_stack = 5 + +/obj/item/ammo_casing/a68/blank + desc = "A Z33t Tamparii blank casing." + projectile_type = /obj/projectile/bullet/blank + /obj/item/ammo_casing/a762/blank desc = "A 7.62mm blank casing." projectile_type = /obj/projectile/bullet/blank diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm index 8de28415e6f..c6bc54f437a 100644 --- a/code/modules/projectiles/guns/projectile/automatic.dm +++ b/code/modules/projectiles/guns/projectile/automatic.dm @@ -545,13 +545,15 @@ automatic rifle. Laser weapons are usually used by high-ranking soldiers or special operatives. Regardless of advances in the small arms field, artillery is the Republican army’s \ main weapon and pride." - load_method = SINGLE_CASING|SPEEDLOADER - - ammo_type = /obj/item/ammo_casing/a762 - allowed_magazines = null - magazine_type = null + load_method = MAGAZINE|SPEEDLOADER + caliber = "6.8mm" + ammo_type = /obj/item/ammo_casing/a68 + allowed_magazines = list(/obj/item/ammo_magazine/a68, /obj/item/ammo_magazine/boltaction/adhomai) + magazine_type = /obj/item/ammo_magazine/a68 max_shells = 25 + worn_x_dimension = 48 //Uses 48x32 gun sprite + origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 2) fire_sound = 'sound/weapons/gunshot/gunshot_rifle.ogg' @@ -561,6 +563,17 @@ knife_x_offset = 23 knife_y_offset = 14 +/obj/item/gun/projectile/automatic/rifle/adhomian/update_icon() + item_state = (ammo_magazine)? "tsarrayut" : "tsarrayut_nomag" + ..() //Placed here so in-hand sprite reflects no magazine properly. + icon_state = (ammo_magazine)? "tsarrayut" : "tsarrayut_nomag" + +/obj/item/gun/projectile/automatic/rifle/adhomian/attackby(obj/item/attacking_item, mob/user) + if(istype(attacking_item, /obj/item/ammo_magazine/boltaction) && !ammo_magazine) + to_chat(user, SPAN_WARNING("\The [src] cannot be reloaded without a magazine!")) + return + ..() + /obj/item/gun/projectile/automatic/rifle/dpra name = "adhomian assault rifle" desc = "The Mrrazhak Model-1 is the newest Al'mariist automatic rifle. The Mrrazhak is notorious for its simple and reliable design; it can be fabricated and assembled without the \ @@ -568,33 +581,32 @@ icon = 'icons/obj/guns/mrrazhak.dmi' icon_state = "mrrazhak" item_state = "mrrazhak" - - can_bayonet = TRUE - knife_x_offset = 22 - knife_y_offset = 13 + contained_sprite = TRUE origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2) + + load_method = MAGAZINE|SPEEDLOADER + caliber = "6.8mm" + ammo_type = /obj/item/ammo_casing/a68 + allowed_magazines = list(/obj/item/ammo_magazine/a68) + magazine_type = /obj/item/ammo_magazine/a68 + max_shells = 25 + + worn_x_dimension = 48 //Uses 48x32 gun sprite + + origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 2) fire_sound = 'sound/weapons/gunshot/gunshot_rifle.ogg' is_wieldable = TRUE - magazine_type = /obj/item/ammo_magazine/c762/dpra - allowed_magazines = list(/obj/item/ammo_magazine/c762/dpra) + can_bayonet = TRUE + knife_x_offset = 23 + knife_y_offset = 14 /obj/item/gun/projectile/automatic/rifle/dpra/update_icon() - if(ammo_magazine) - icon_state = "mrrazhak" - item_state = "mrrazhak" - else - icon_state = "mrrazhak_nomag" - item_state = "mrrazhak_nomag" - ..() - -/obj/item/gun/projectile/automatic/rifle/dpra/gold - name = "gold plated adhomian assault rifle" - desc = "The Mrrazhak Model-1 is the newest Al'mariist automatic rifle. The Mrrazhak is notorious for its simple and reliable design; it can be fabricated and assembled without the \ - need of a specialized industry or a highly trained workforce. This one is golden plated." - icon = 'icons/obj/guns/golden_mrrazhak.dmi' + item_state = (ammo_magazine)? "mrrazhak" : "mrrazhak_nomag" + ..() //Placed here so in-hand sprite reflects no magazine properly. + icon_state = (ammo_magazine)? "mrrazhak" : "mrrazhak_nomag" /obj/item/gun/projectile/automatic/tommygun name = "submachine gun" diff --git a/code/modules/projectiles/guns/projectile/rifle.dm b/code/modules/projectiles/guns/projectile/rifle.dm index 6844cb5cd9f..15103c5d1f9 100644 --- a/code/modules/projectiles/guns/projectile/rifle.dm +++ b/code/modules/projectiles/guns/projectile/rifle.dm @@ -6,9 +6,9 @@ item_state = "moistnugget" origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2) fire_sound = 'sound/weapons/gunshot/gunshot_rifle.ogg' - caliber = "a762" - ammo_type = /obj/item/ammo_casing/a762 - magazine_type = /obj/item/ammo_magazine/boltaction + caliber = "6.8mm" + ammo_type = /obj/item/ammo_casing/a68 + magazine_type = /obj/item/ammo_magazine/boltaction/adhomai max_shells = 5 rack_sound = 'sound/weapons/riflebolt.ogg' @@ -37,7 +37,7 @@ /obj/item/gun/projectile/shotgun/pump/rifle/blank desc = "A replica of a traditional Adhomian bolt action rifle. It has the seal of the Grand Romanovich Casino on its stock." - ammo_type = /obj/item/ammo_casing/a762/blank + ammo_type = /obj/item/ammo_casing/a68/blank /obj/item/gun/projectile/shotgun/pump/rifle/scope name = "sniper bolt action rifle" diff --git a/code/modules/projectiles/guns/projectile/sniper.dm b/code/modules/projectiles/guns/projectile/sniper.dm index afabaf4af1b..6dc0db9206c 100644 --- a/code/modules/projectiles/guns/projectile/sniper.dm +++ b/code/modules/projectiles/guns/projectile/sniper.dm @@ -189,14 +189,16 @@ force = 15 slot_flags = SLOT_BACK origin_tech = list(TECH_COMBAT = 8, TECH_MATERIAL = 3, TECH_MAGNET = 2, TECH_ILLEGAL = 5) - caliber = "a762" + caliber = "6.8mm" recoil = 2 fire_sound = 'sound/weapons/gunshot/gunshot_svd.ogg' load_method = MAGAZINE max_shells = 10 - magazine_type = /obj/item/ammo_magazine/d762 - allowed_magazines = list(/obj/item/ammo_magazine/d762) + worn_x_dimension = 48 //Uses 48x32 gun sprite + + magazine_type = /obj/item/ammo_magazine/a68/hotaki + allowed_magazines = list(/obj/item/ammo_magazine/a68/hotaki) accuracy = -4 scoped_accuracy = 3 @@ -208,11 +210,9 @@ fire_delay = ROF_SUPERHEAVY /obj/item/gun/projectile/dragunov/update_icon() - ..() - if(ammo_magazine) - icon_state = "dragunov" - else - icon_state = "dragunov-empty" + item_state = (ammo_magazine)? "dragunov" : "dragunov_nomag" + ..() //Placed here so in-hand sprite reflects no magazine properly. + icon_state = (ammo_magazine)? "dragunov" : "dragunov_nomag" /obj/item/gun/projectile/dragunov/special_check(mob/user) if(!wielded) diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm index 34d927607cb..178201d5d93 100644 --- a/code/modules/projectiles/projectile/bullets.dm +++ b/code/modules/projectiles/projectile/bullets.dm @@ -302,6 +302,18 @@ armor_penetration = 30 penetrating = FALSE +/obj/projectile/bullet/rifle/a68 + name = "R33 Tamparii bullet" + damage = 40 + armor_penetration = 17 + penetrating = FALSE + +/obj/projectile/bullet/rifle/a68/ap + name = "R33s Tamparii bullet" + damage = 30 + armor_penetration = 30 + penetrating = TRUE + /obj/projectile/bullet/rifle/a145 damage = 80 stun = 3 diff --git a/html/changelogs/CatsinHD-Tajgun.yml b/html/changelogs/CatsinHD-Tajgun.yml new file mode 100644 index 00000000000..6fc97267dfc --- /dev/null +++ b/html/changelogs/CatsinHD-Tajgun.yml @@ -0,0 +1,59 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: CatsinHD + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - imageadd: "Resprites the Mrrazhak, Tsarayut, and Hotaki rifles." + - rscadd: "Adds the Z33 Tamparii bullet." diff --git a/icons/obj/ammo.dmi b/icons/obj/ammo.dmi index ac7970fbf5f..340abea2718 100644 Binary files a/icons/obj/ammo.dmi and b/icons/obj/ammo.dmi differ diff --git a/icons/obj/guns/dragunov.dmi b/icons/obj/guns/dragunov.dmi index 5e91fb00c09..3f9e801d81c 100644 Binary files a/icons/obj/guns/dragunov.dmi and b/icons/obj/guns/dragunov.dmi differ diff --git a/icons/obj/guns/mrrazhak.dmi b/icons/obj/guns/mrrazhak.dmi index a55ff26e268..7df437bb68c 100644 Binary files a/icons/obj/guns/mrrazhak.dmi and b/icons/obj/guns/mrrazhak.dmi differ diff --git a/icons/obj/guns/tsarrayut.dmi b/icons/obj/guns/tsarrayut.dmi index 537bd2b8fb7..9b57ecec0a6 100644 Binary files a/icons/obj/guns/tsarrayut.dmi and b/icons/obj/guns/tsarrayut.dmi differ diff --git a/maps/away/away_site/pirate_base/pirate_base.dmm b/maps/away/away_site/pirate_base/pirate_base.dmm index 03fc5892f44..463701268cc 100644 --- a/maps/away/away_site/pirate_base/pirate_base.dmm +++ b/maps/away/away_site/pirate_base/pirate_base.dmm @@ -8117,7 +8117,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/gun/projectile/automatic/rifle/dpra/gold, +/obj/item/gun/projectile/automatic/rifle/dpra, /turf/simulated/floor/tiled, /area/piratebase/hallway_north) "OI" = ( diff --git a/maps/away/away_site/tajara/peoples_station/peoples_station.dmm b/maps/away/away_site/tajara/peoples_station/peoples_station.dmm index 39ef000a621..86785a3c591 100644 --- a/maps/away/away_site/tajara/peoples_station/peoples_station.dmm +++ b/maps/away/away_site/tajara/peoples_station/peoples_station.dmm @@ -5737,15 +5737,15 @@ name = "gun cabinet (rifle ammo)" }, /obj/effect/floor_decal/industrial/outline/security, -/obj/item/ammo_magazine/boltaction, -/obj/item/ammo_magazine/boltaction, -/obj/item/ammo_magazine/boltaction, -/obj/item/ammo_magazine/boltaction, -/obj/item/ammo_magazine/boltaction, -/obj/item/ammo_magazine/boltaction, -/obj/item/ammo_magazine/boltaction, -/obj/item/ammo_magazine/boltaction, -/obj/item/ammo_magazine/boltaction, +/obj/item/ammo_magazine/a68, +/obj/item/ammo_magazine/a68, +/obj/item/ammo_magazine/a68, +/obj/item/ammo_magazine/a68, +/obj/item/ammo_magazine/a68, +/obj/item/ammo_magazine/a68, +/obj/item/ammo_magazine/a68, +/obj/item/ammo_magazine/a68, +/obj/item/ammo_magazine/a68, /turf/simulated/floor/tiled/dark, /area/peoples_station/armory) "uP" = ( diff --git a/maps/away/away_site/tajara/saniorios_outpost/saniorios_outpost.dmm b/maps/away/away_site/tajara/saniorios_outpost/saniorios_outpost.dmm index 03db6f949e5..b0daac328ad 100644 --- a/maps/away/away_site/tajara/saniorios_outpost/saniorios_outpost.dmm +++ b/maps/away/away_site/tajara/saniorios_outpost/saniorios_outpost.dmm @@ -1130,12 +1130,12 @@ req_access = list(214); name = "gun cabinet (rifle ammo)" }, -/obj/item/ammo_magazine/boltaction, -/obj/item/ammo_magazine/boltaction, -/obj/item/ammo_magazine/boltaction, -/obj/item/ammo_magazine/boltaction, -/obj/item/ammo_magazine/boltaction, -/obj/item/ammo_magazine/boltaction, +/obj/item/ammo_magazine/a68, +/obj/item/ammo_magazine/a68, +/obj/item/ammo_magazine/a68, +/obj/item/ammo_magazine/a68, +/obj/item/ammo_magazine/a68, +/obj/item/ammo_magazine/a68, /turf/simulated/floor/tiled{ temperature = 278.15 }, @@ -1423,12 +1423,12 @@ req_access = list(214); name = "gun cabinet (assault rifle ammo)" }, -/obj/item/ammo_magazine/c762/dpra, -/obj/item/ammo_magazine/c762/dpra, -/obj/item/ammo_magazine/c762/dpra, -/obj/item/ammo_magazine/c762/dpra, -/obj/item/ammo_magazine/c762/dpra, -/obj/item/ammo_magazine/c762/dpra, +/obj/item/ammo_magazine/a68, +/obj/item/ammo_magazine/a68, +/obj/item/ammo_magazine/a68, +/obj/item/ammo_magazine/a68, +/obj/item/ammo_magazine/a68, +/obj/item/ammo_magazine/a68, /obj/machinery/alarm/cold/north{ req_one_access = list(214) }, diff --git a/maps/away/ships/dpra/hailstorm/hailstorm_ship.dmm b/maps/away/ships/dpra/hailstorm/hailstorm_ship.dmm index efd81b20172..cd57b0e14cf 100644 --- a/maps/away/ships/dpra/hailstorm/hailstorm_ship.dmm +++ b/maps/away/ships/dpra/hailstorm/hailstorm_ship.dmm @@ -3611,10 +3611,10 @@ req_access = list(214); name = "Personal Arms" }, -/obj/item/gun/projectile/automatic/rifle/dpra/gold, -/obj/item/ammo_magazine/c762/dpra, -/obj/item/ammo_magazine/c762/dpra, -/obj/item/ammo_magazine/c762/dpra, +/obj/item/gun/projectile/automatic/rifle/dpra, +/obj/item/ammo_magazine/a68, +/obj/item/ammo_magazine/a68, +/obj/item/ammo_magazine/a68, /obj/item/clothing/suit/armor/carrier/heavy, /obj/item/clothing/head/helmet/merc, /obj/item/gun/projectile/silenced, @@ -3947,9 +3947,9 @@ /obj/item/ammo_magazine/boltaction, /obj/item/ammo_magazine/boltaction, /obj/item/gun/projectile/automatic/rifle/dpra, -/obj/item/ammo_magazine/c762/dpra, -/obj/item/ammo_magazine/c762/dpra, -/obj/item/ammo_magazine/c762/dpra, +/obj/item/ammo_magazine/a68, +/obj/item/ammo_magazine/a68, +/obj/item/ammo_magazine/a68, /obj/item/gun/projectile/shotgun/foldable, /obj/item/storage/box/shells/buckshot, /obj/item/storage/box/shells/buckshot, diff --git a/maps/away/ships/pra/headmaster/headmaster_ship.dmm b/maps/away/ships/pra/headmaster/headmaster_ship.dmm index 8f44c774a60..3575f22be88 100644 --- a/maps/away/ships/pra/headmaster/headmaster_ship.dmm +++ b/maps/away/ships/pra/headmaster/headmaster_ship.dmm @@ -7215,12 +7215,12 @@ req_access = list(209); name = "gun cabinet (rifle ammo)" }, -/obj/item/ammo_magazine/boltaction, -/obj/item/ammo_magazine/boltaction, -/obj/item/ammo_magazine/boltaction, -/obj/item/ammo_magazine/boltaction, -/obj/item/ammo_magazine/boltaction, -/obj/item/ammo_magazine/boltaction, +/obj/item/ammo_magazine/a68, +/obj/item/ammo_magazine/a68, +/obj/item/ammo_magazine/a68, +/obj/item/ammo_magazine/a68, +/obj/item/ammo_magazine/a68, +/obj/item/ammo_magazine/a68, /obj/item/ammo_magazine/submachinedrum, /obj/item/ammo_magazine/submachinedrum, /obj/item/ammo_magazine/submachinedrum, diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_silo.dm b/maps/random_ruins/exoplanets/adhomai/adhomai_silo.dm index 09eb0aff30c..67003e5ecef 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_silo.dm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_silo.dm @@ -66,7 +66,7 @@ belt_contents = list( /obj/item/gun/projectile/pistol/adhomai = 1, /obj/item/ammo_magazine/mc9mm = 2, - /obj/item/ammo_magazine/boltaction = 3, + /obj/item/ammo_magazine/a68 = 2, /obj/item/melee/baton/stunrod = 1, /obj/item/handcuffs = 1 ) diff --git a/maps/random_ruins/exoplanets/adhomai/ala_base.dmm b/maps/random_ruins/exoplanets/adhomai/ala_base.dmm index b935f72d9a9..06d331a761b 100644 --- a/maps/random_ruins/exoplanets/adhomai/ala_base.dmm +++ b/maps/random_ruins/exoplanets/adhomai/ala_base.dmm @@ -321,13 +321,13 @@ req_access = list(214); name = "ammunition cabinet (rifle)" }, -/obj/item/ammo_magazine/boltaction, -/obj/item/ammo_magazine/boltaction, -/obj/item/ammo_magazine/boltaction, -/obj/item/ammo_magazine/boltaction, -/obj/item/ammo_magazine/boltaction, -/obj/item/ammo_magazine/boltaction, -/obj/item/ammo_magazine/boltaction, +/obj/item/ammo_magazine/a68, +/obj/item/ammo_magazine/a68, +/obj/item/ammo_magazine/a68, +/obj/item/ammo_magazine/a68, +/obj/item/ammo_magazine/a68, +/obj/item/ammo_magazine/a68, +/obj/item/ammo_magazine/a68, /obj/machinery/light/small{ dir = 1 }, @@ -465,12 +465,12 @@ req_access = list(214); name = "ammunition cabinet (automatic rifle)" }, -/obj/item/ammo_magazine/c762/dpra, -/obj/item/ammo_magazine/c762/dpra, -/obj/item/ammo_magazine/c762/dpra, -/obj/item/ammo_magazine/c762/dpra, -/obj/item/ammo_magazine/c762/dpra, -/obj/item/ammo_magazine/c762/dpra, +/obj/item/ammo_magazine/a68, +/obj/item/ammo_magazine/a68, +/obj/item/ammo_magazine/a68, +/obj/item/ammo_magazine/a68, +/obj/item/ammo_magazine/a68, +/obj/item/ammo_magazine/a68, /turf/simulated/floor/exoplanet/tiled/dark, /area/ala_base) "vJ" = ( diff --git a/maps/random_ruins/exoplanets/adhomai/pra_base.dmm b/maps/random_ruins/exoplanets/adhomai/pra_base.dmm index 2567c938fc2..4d2cde16929 100644 --- a/maps/random_ruins/exoplanets/adhomai/pra_base.dmm +++ b/maps/random_ruins/exoplanets/adhomai/pra_base.dmm @@ -289,13 +289,13 @@ req_access = list(209); name = "ammunition cabinet (rifle)" }, -/obj/item/ammo_magazine/boltaction, -/obj/item/ammo_magazine/boltaction, -/obj/item/ammo_magazine/boltaction, -/obj/item/ammo_magazine/boltaction, -/obj/item/ammo_magazine/boltaction, -/obj/item/ammo_magazine/boltaction, -/obj/item/ammo_magazine/boltaction, +/obj/item/ammo_magazine/a68, +/obj/item/ammo_magazine/a68, +/obj/item/ammo_magazine/a68, +/obj/item/ammo_magazine/a68, +/obj/item/ammo_magazine/a68, +/obj/item/ammo_magazine/a68, +/obj/item/ammo_magazine/a68, /turf/simulated/floor/concrete/square{ temperature = 268.15 },