diff --git a/code/datums/autolathe/arms.dm b/code/datums/autolathe/arms.dm index f1dbc75192..efe5791b11 100644 --- a/code/datums/autolathe/arms.dm +++ b/code/datums/autolathe/arms.dm @@ -139,45 +139,38 @@ /////// 5.56mm /datum/category_item/autolathe/arms/rifle_556 - name = "10rnd rifle magazine (5.56mm)" - path =/obj/item/ammo_magazine/a556 + name = "rifle magazine (5.56mm)" + path =/obj/item/ammo_magazine/c556 hidden = 1 /datum/category_item/autolathe/arms/rifle_556p - name = "10rnd rifle magazine (5.56mm practice)" - path =/obj/item/ammo_magazine/a556/practice + name = "rifle magazine (5.56mm practice)" + path =/obj/item/ammo_magazine/c556/practice -/datum/category_item/autolathe/arms/rifle_556m - name = "20rnd rifle magazine (5.56mm)" - path =/obj/item/ammo_magazine/a556m +/datum/category_item/autolathe/arms/machinegun_556 + name = "machinegun box magazine (5.56)" + path =/obj/item/ammo_magazine/a556 hidden = 1 - -/datum/category_item/autolathe/arms/rifle_556mp - name = "20rnd rifle magazine (5.56mm practice)" - path =/obj/item/ammo_magazine/a556m/practice - hidden = 1 - /////// 7.62 -/datum/category_item/autolathe/arms/rifle_small_762 - name = "10rnd rifle magazine (7.62mm)" - path =/obj/item/ammo_magazine/s762 - hidden = 1 + /datum/category_item/autolathe/arms/rifle_762 - name = "20rnd rifle magazine (7.62mm)" + name = "rifle magazine (7.62mm)" path =/obj/item/ammo_magazine/c762 hidden = 1 -/datum/category_item/autolathe/arms/machinegun_762 - name = "machinegun box magazine (7.62)" - path =/obj/item/ammo_magazine/a762 - hidden = 1 - /datum/category_item/autolathe/arms/shotgun_magazine name = "24rnd shotgun magazine (12g)" path =/obj/item/ammo_magazine/g12 hidden = 1 +/* +/datum/category_item/autolathe/arms/rifle_small_762 + name = "rifle magazine (7.62mm)" + path =/obj/item/ammo_magazine/s762 + hidden = 1 +*/ + /* Commented out until autolathe stuff is decided/fixed. Will probably remove these entirely. -Spades // These should always be/empty! The idea is to fill them up manually with ammo clips. @@ -351,7 +344,7 @@ path =/obj/item/ammo_magazine/clip/a50 category = "Arms and Ammunition" hidden = 1 - +*/ /datum/category_item/autolathe/arms/rifle_clip_556 name = "ammo clip (5.56mm)" path =/obj/item/ammo_magazine/clip/a556 @@ -362,7 +355,6 @@ name = "ammo clip (5.56mm practice)" path =/obj/item/ammo_magazine/clip/a556/practice category = "Arms and Ammunition" -*/ /datum/category_item/autolathe/arms/rifle_clip_762 name = "ammo clip (7.62mm)" diff --git a/code/datums/uplink/ammunition.dm b/code/datums/uplink/ammunition.dm index 2611ad18d3..4aefe349fd 100644 --- a/code/datums/uplink/ammunition.dm +++ b/code/datums/uplink/ammunition.dm @@ -48,42 +48,41 @@ name = "Anti-Materiel Rifle ammo box (14.5mm)" path = /obj/item/weapon/storage/box/sniperammo -/datum/uplink_item/item/ammo/a556 - name = "10rnd Rifle Magazine (5.56mm)" - path = /obj/item/ammo_magazine/a556 +/datum/uplink_item/item/ammo/c556 + name = "Rifle Magazine (5.56mm)" + path = /obj/item/ammo_magazine/c556 -/datum/uplink_item/item/ammo/a556/ap - name = "10rnd Rifle Magazine (5.56mm AP)" - path = /obj/item/ammo_magazine/a556/ap +/datum/uplink_item/item/ammo/c556/ext + name = "Rifle Magazine (5.56mm Extended)" + path = /obj/item/ammo_magazine/c556/ext + +/datum/uplink_item/item/ammo/c556/ap + name = "Rifle Magazine (5.56mm AP)" + path = /obj/item/ammo_magazine/c556/ap + +/datum/uplink_item/item/ammo/c556/ap/ext + name = "Rifle Magazine (5.56mm AP Extended)" + path = /obj/item/ammo_magazine/c556/ap/ext /datum/uplink_item/item/ammo/c762 - name = "20rnd Rifle Magazine (7.62mm)" + name = "Rifle Magazine (7.62mm)" path = /obj/item/ammo_magazine/c762 /datum/uplink_item/item/ammo/c762/ap - name = "20rnd Rifle Magazine (7.62mm AP)" + name = "Rifle Magazine (7.62mm AP)" path = /obj/item/ammo_magazine/c762/ap -/datum/uplink_item/item/ammo/s762 - name = "10rnd Rifle Magazine (7.62mm)" - path = /obj/item/ammo_magazine/s762 - item_cost = 10 // Half the capacity. - -/datum/uplink_item/item/ammo/s762/ap - name = "10rnd Rifle Magazine (7.62mm AP)" - path = /obj/item/ammo_magazine/s762/ap - /datum/uplink_item/item/ammo/a10mm name = "SMG Magazine (10mm)" path = /obj/item/ammo_magazine/a10mm -/datum/uplink_item/item/ammo/a762 - name = "Machinegun Magazine (7.62mm)" - path = /obj/item/ammo_magazine/a762 +/datum/uplink_item/item/ammo/a556 + name = "Machinegun Magazine (5.56mm)" + path = /obj/item/ammo_magazine/a556 -/datum/uplink_item/item/ammo/a762/ap - name = "Machinegun Magazine (7.62mm AP)" - path = /obj/item/ammo_magazine/a762/ap +/datum/uplink_item/item/ammo/a556/ap + name = "Machinegun Magazine (5.56mm AP)" + path = /obj/item/ammo_magazine/a556/ap /datum/uplink_item/item/ammo/g12 name = "12g Shotgun Ammo Box (Slug)" diff --git a/code/modules/projectiles/ammunition/boxes.dm b/code/modules/projectiles/ammunition/boxes.dm index ae55edeb00..8a259b6342 100644 --- a/code/modules/projectiles/ammunition/boxes.dm +++ b/code/modules/projectiles/ammunition/boxes.dm @@ -286,49 +286,43 @@ ///////// 5.56mm ///////// -/obj/item/ammo_magazine/a556 +/obj/item/ammo_magazine/c556 name = "magazine (5.56mm)" - icon_state = "5.56" + icon_state = "c5.56" origin_tech = list(TECH_COMBAT = 2) mag_type = MAGAZINE caliber = "a556" matter = list(DEFAULT_WALL_MATERIAL = 1800) ammo_type = /obj/item/ammo_casing/a556 - max_ammo = 10 - multiple_sprites = 1 - -/obj/item/ammo_magazine/a556/empty - initial_ammo = 0 - -/obj/item/ammo_magazine/a556/practice - name = "magazine (5.56mm practice)" - ammo_type = /obj/item/ammo_casing/a556p - -/obj/item/ammo_magazine/a556/ap - name = "magazine (5.56mm armor-piercing)" - ammo_type = /obj/item/ammo_casing/a556/ap - -/obj/item/ammo_magazine/a556m - name = "20rnd magazine (5.56mm)" - icon_state = "5.56mid" - origin_tech = list(TECH_COMBAT = 2) - mag_type = MAGAZINE - caliber = "a556" - matter = list(DEFAULT_WALL_MATERIAL = 3600) - ammo_type = /obj/item/ammo_casing/a556 max_ammo = 20 multiple_sprites = 1 -/obj/item/ammo_magazine/a556m/empty +/obj/item/ammo_magazine/c556/ext + name = "extended magazine (5.56mm)" + matter = list(DEFAULT_WALL_MATERIAL = 2700) + max_ammo = 30 + +/obj/item/ammo_magazine/c556/empty initial_ammo = 0 -/obj/item/ammo_magazine/a556m/ap - name = "20rnd magazine (5.56mm armor-piercing)" +/obj/item/ammo_magazine/c556/ext/empty + initial_ammo = 0 + +/obj/item/ammo_magazine/c556/practice + name = "magazine (5.56mm practice)" + ammo_type = /obj/item/ammo_casing/a556p + +/obj/item/ammo_magazine/c556/practice/ext + name = "extended magazine (5.56mm practice)" + max_ammo = 30 + +/obj/item/ammo_magazine/c556/ap + name = "magazine (5.56mm armor-piercing)" ammo_type = /obj/item/ammo_casing/a556/ap -/obj/item/ammo_magazine/a556m/practice - name = "20rnd magazine (5.56mm practice)" - ammo_type = /obj/item/ammo_casing/a556p +/obj/item/ammo_magazine/c556/ap/ext + name = "extended magazine (5.56mm armor-piercing)" + max_ammo = 30 /obj/item/ammo_magazine/clip/a556 name = "ammo clip (5.56mm)" @@ -347,6 +341,25 @@ name = "rifle clip (5.56mm practice)" ammo_type = /obj/item/ammo_casing/a556 +/obj/item/ammo_magazine/a556 + name = "magazine box (5.56mm)" + icon_state = "a556" + origin_tech = list(TECH_COMBAT = 2) + mag_type = MAGAZINE + caliber = "a556" + matter = list(DEFAULT_WALL_MATERIAL = 10000) + ammo_type = /obj/item/ammo_casing/a556 + w_class = ITEMSIZE_NORMAL // This should NOT fit in your pocket!! + max_ammo = 50 + multiple_sprites = 1 + +/obj/item/ammo_magazine/a556/ap + name = "magazine box (5.56mm armor-piercing)" + ammo_type = /obj/item/ammo_casing/a556/ap + +/obj/item/ammo_magazine/a556/empty + initial_ammo = 0 + ///////// .50 AE ///////// /obj/item/ammo_magazine/a50 @@ -375,33 +388,14 @@ ///////// 7.62mm ///////// -/obj/item/ammo_magazine/a762 - name = "magazine box (7.62mm)" - icon_state = "a762" - origin_tech = list(TECH_COMBAT = 2) - mag_type = MAGAZINE - caliber = "a762" - matter = list(DEFAULT_WALL_MATERIAL = 10000) - ammo_type = /obj/item/ammo_casing/a762 - w_class = ITEMSIZE_NORMAL // This should NOT fit in your pocket!! - max_ammo = 50 - multiple_sprites = 1 - -/obj/item/ammo_magazine/a762/ap - name = "magazine box (7.62mm armor-piercing)" - ammo_type = /obj/item/ammo_casing/a762/ap - -/obj/item/ammo_magazine/a762/empty - initial_ammo = 0 - /obj/item/ammo_magazine/c762 name = "magazine (7.62mm)" - icon_state = "c762" + icon_state = "c7.62" mag_type = MAGAZINE caliber = "a762" - matter = list(DEFAULT_WALL_MATERIAL = 4000) + matter = list(DEFAULT_WALL_MATERIAL = 2000) ammo_type = /obj/item/ammo_casing/a762 - max_ammo = 20 + max_ammo = 10 multiple_sprites = 1 /obj/item/ammo_magazine/c762/ap @@ -416,7 +410,7 @@ icon_state = "SVD" mag_type = MAGAZINE caliber = "a762" - matter = list(DEFAULT_WALL_MATERIAL = 2000) + matter = list(DEFAULT_WALL_MATERIAL = 1000) ammo_type = /obj/item/ammo_casing/a762 max_ammo = 10 multiple_sprites = 1 diff --git a/code/modules/projectiles/ammunition/bullets.dm b/code/modules/projectiles/ammunition/bullets.dm index add0170643..dfbd721952 100644 --- a/code/modules/projectiles/ammunition/bullets.dm +++ b/code/modules/projectiles/ammunition/bullets.dm @@ -257,6 +257,11 @@ icon_state = "rifle-casing" // Need to make an icon for these projectile_type = /obj/item/projectile/bullet/rifle/practice +/obj/item/ammo_casing/a556/blank + desc = "A blank 5.56mm bullet casing." + projectile_type = /obj/item/projectile/bullet/blank + matter = list(DEFAULT_WALL_MATERIAL = 90) + /obj/item/ammo_casing/a556/hp desc = "A 5.56mm hollow-point bullet casing." projectile_type = /obj/item/projectile/bullet/rifle/a556/hollow diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm index 0be77be543..bf30c19991 100644 --- a/code/modules/projectiles/guns/projectile/automatic.dm +++ b/code/modules/projectiles/guns/projectile/automatic.dm @@ -51,17 +51,17 @@ /obj/item/weapon/gun/projectile/automatic/sts35 name = "assault rifle" - desc = "The rugged STS-35 is a durable automatic weapon of a make popular on the frontier worlds. Uses 7.62mm rounds. This one is unmarked." + desc = "The rugged STS-35 is a durable automatic weapon of a make popular on the frontier worlds. Uses 5.56mm rounds. This one is unmarked." icon_state = "arifle" item_state = null w_class = ITEMSIZE_LARGE force = 10 - caliber = "a762" + caliber = "a556" origin_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 1, TECH_ILLEGAL = 4) slot_flags = SLOT_BACK load_method = MAGAZINE - magazine_type = /obj/item/ammo_magazine/c762 - allowed_magazines = list(/obj/item/ammo_magazine/c762, /obj/item/ammo_magazine/s762) + magazine_type = /obj/item/ammo_magazine/c556 + allowed_magazines = list(/obj/item/ammo_magazine/c556) one_handed_penalty = 4 @@ -104,19 +104,19 @@ /obj/item/weapon/gun/projectile/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 5.56mm rounds and has an under barrel grenade launcher." + 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 item_state = "z8carbine" w_class = ITEMSIZE_LARGE force = 10 - caliber = "a556" + caliber = "a762" origin_tech = list(TECH_COMBAT = 8, TECH_MATERIAL = 3) ammo_type = "/obj/item/ammo_casing/a556" // Is this really needed anymore? fire_sound = 'sound/weapons/Gunshot.ogg' slot_flags = SLOT_BACK load_method = MAGAZINE - magazine_type = /obj/item/ammo_magazine/a556 - allowed_magazines = list(/obj/item/ammo_magazine/a556) + magazine_type = /obj/item/ammo_magazine/c762 + allowed_magazines = list(/obj/item/ammo_magazine/c762) auto_eject = 1 auto_eject_sound = 'sound/weapons/smg_empty_alarm.ogg' @@ -181,14 +181,14 @@ force = 10 slot_flags = 0 max_shells = 50 - caliber = "a762" + caliber = "a556" origin_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 1, TECH_ILLEGAL = 2) slot_flags = SLOT_BACK - ammo_type = "/obj/item/ammo_casing/a762" // Is this really needed anymore? + ammo_type = "/obj/item/ammo_casing/a556" // Is this really needed anymore? fire_sound = 'sound/weapons/machinegun.ogg' load_method = MAGAZINE - magazine_type = /obj/item/ammo_magazine/a762 - allowed_magazines = list(/obj/item/ammo_magazine/a762, /obj/item/ammo_magazine/c762) + magazine_type = /obj/item/ammo_magazine/a556 + allowed_magazines = list(/obj/item/ammo_magazine/a556, /obj/item/ammo_magazine/c556) one_handed_penalty = 6 @@ -346,16 +346,16 @@ /obj/item/weapon/gun/projectile/automatic/carbine name = "assault carbine" desc = "The bullpup configured GP3000 is a lightweight, compact, military-grade assault rifle produced by Gurov Projectile Weapons LLC. It is sold almost exclusively to standing armies. The serial number on this one has been scratched off. Uses 5.56mm rounds." - icon_state = "bullpupm" + icon_state = "bullpup" item_state = "bullpup" w_class = ITEMSIZE_LARGE force = 10 - caliber = "a556" + caliber = "a762" origin_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 1, TECH_ILLEGAL = 4) slot_flags = SLOT_BACK load_method = MAGAZINE - magazine_type = /obj/item/ammo_magazine/a556m - allowed_magazines = list(/obj/item/ammo_magazine/a556, /obj/item/ammo_magazine/a556m) + magazine_type = /obj/item/ammo_magazine/c762 + allowed_magazines = list(/obj/item/ammo_magazine/c762) one_handed_penalty = 4 @@ -366,9 +366,9 @@ /obj/item/weapon/gun/projectile/automatic/carbine/update_icon(var/ignore_inhands) ..() - if(istype(ammo_magazine,/obj/item/ammo_magazine/a556m)) - icon_state = "bullpupm" + if(ammo_magazine) + icon_state = "bullpup" else - icon_state = (ammo_magazine)? "bullpup" : "bullpup-empty" + icon_state = "bullpup-empty" item_state = (ammo_magazine)? "bullpup" : "bullpup-empty" if(!ignore_inhands) update_held_icon() diff --git a/code/modules/projectiles/guns/projectile/boltaction.dm b/code/modules/projectiles/guns/projectile/boltaction.dm index e07c45294c..b38ca554e0 100644 --- a/code/modules/projectiles/guns/projectile/boltaction.dm +++ b/code/modules/projectiles/guns/projectile/boltaction.dm @@ -2,29 +2,29 @@ /obj/item/weapon/gun/projectile/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." + 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 5.56mm rounds." item_state = "boltaction" icon_state = "boltaction" fire_sound = 'sound/weapons/rifleshot.ogg' max_shells = 5 - caliber = "a762" + caliber = "a556" origin_tech = list(TECH_COMBAT = 1)// Old as shit rifle doesn't have very good tech. - ammo_type = /obj/item/ammo_casing/a762 + ammo_type = /obj/item/ammo_casing/a556 load_method = SINGLE_CASING|SPEEDLOADER action_sound = 'sound/weapons/riflebolt.ogg' /obj/item/weapon/gun/projectile/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/a762p + 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 5.56mm rounds." + ammo_type = /obj/item/ammo_casing/a556p /obj/item/weapon/gun/projectile/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." - ammo_type = /obj/item/ammo_casing/a762/blank + 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 5.56mm rounds." + ammo_type = /obj/item/ammo_casing/a556/blank /obj/item/weapon/gun/projectile/shotgun/pump/rifle/mosin name = "\improper Mosin Nagant" - desc = "Despite its age, the Mosin Nagant continues to be a favorite weapon among colonists, conscripts, and militias across the cosmos. Most today are built by Chen-Iltchenko Firearms, but it's hard to say who built this particular gun, considering the design has been ripped off by just about every arms manufacturer in the galaxy. Uses 7.62mm rounds." + desc = "Despite its age, the Mosin Nagant continues to be a favorite weapon among colonists, conscripts, and militias across the cosmos. Most today are built by Chen-Iltchenko Firearms, but it's hard to say who built this particular gun, considering the design has been ripped off by just about every arms manufacturer in the galaxy. Uses 5.56mm rounds." icon_state = "mosin" item_state = "mosin" @@ -55,13 +55,13 @@ //Lever actions are the same thing, but bigger. /obj/item/weapon/gun/projectile/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 5.56mm rounds." + 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 7.62mm rounds." item_state = "leveraction" icon_state = "leveraction" fire_sound = 'sound/weapons/rifleshot.ogg' max_shells = 5 - caliber = "a556" + caliber = "a762" origin_tech = list(TECH_COMBAT = 1)// Old as shit rifle doesn't have very good tech. - ammo_type = /obj/item/ammo_casing/a556 + ammo_type = /obj/item/ammo_casing/a762 load_method = SINGLE_CASING|SPEEDLOADER action_sound = 'sound/weapons/riflebolt.ogg' \ No newline at end of file diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm index cf62d9e0c8..c234242678 100644 --- a/code/modules/projectiles/projectile/bullets.dm +++ b/code/modules/projectiles/projectile/bullets.dm @@ -198,26 +198,26 @@ penetrating = 1 /obj/item/projectile/bullet/rifle/a762 - damage = 25 + damage = 35 /obj/item/projectile/bullet/rifle/a762/ap - damage = 20 - armor_penetration = 50 // At 40 or more armor, this will do more damage than standard rounds. + damage = 30 + armor_penetration = 50 // At 30 or more armor, this will do more damage than standard rounds. /obj/item/projectile/bullet/rifle/a762/hollow - damage = 35 + damage = 40 armor_penetration = -50 penetrating = 0 /obj/item/projectile/bullet/rifle/a556 - damage = 35 + damage = 25 /obj/item/projectile/bullet/rifle/a556/ap - damage = 30 - armor_penetration = 50 // At 30 or more armor, this will do more damage than standard rounds. + damage = 20 + armor_penetration = 50 // At 40 or more armor, this will do more damage than standard rounds. /obj/item/projectile/bullet/rifle/a556/hollow - damage = 40 + damage = 35 armor_penetration = -50 penetrating = 0 diff --git a/code/modules/random_map/drop/drop_types.dm b/code/modules/random_map/drop/drop_types.dm index 514e173896..43f89b4ec7 100644 --- a/code/modules/random_map/drop/drop_types.dm +++ b/code/modules/random_map/drop/drop_types.dm @@ -83,8 +83,8 @@ var/global/list/datum/supply_drop_loot/supply_drop /obj/item/clothing/accessory/storage/black_drop_pouches, /obj/item/weapon/storage/backpack/dufflebag/sec, /obj/item/weapon/gun/projectile/automatic/carbine, - /obj/item/ammo_magazine/a556m/ap, - /obj/item/ammo_magazine/a556m, + /obj/item/ammo_magazine/c762/ap, + /obj/item/ammo_magazine/c762, /obj/item/weapon/shield/energy, /obj/item/weapon/grenade/frag, /obj/item/weapon/grenade/frag, diff --git a/icons/obj/ammo.dmi b/icons/obj/ammo.dmi index a1f1fb20eb..0e0959705e 100644 Binary files a/icons/obj/ammo.dmi and b/icons/obj/ammo.dmi differ diff --git a/maps/northern_star/polaris-2.dmm b/maps/northern_star/polaris-2.dmm index ed76518225..3f14b89489 100644 --- a/maps/northern_star/polaris-2.dmm +++ b/maps/northern_star/polaris-2.dmm @@ -869,11 +869,11 @@ "aqK" = (/obj/machinery/door/blast/regular{icon_state = "pdoor1"; id = "ASSAULT"; name = "Assault Weapon Storage"; p_open = 0},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "aqL" = (/obj/structure/sign/securearea,/turf/simulated/shuttle/wall/dark/hard_corner,/area/centcom/specops) "aqM" = (/obj/machinery/door/airlock/centcom,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"aqN" = (/obj/structure/table/rack,/obj/item/ammo_magazine/a556,/obj/item/ammo_magazine/a556,/obj/item/ammo_magazine/a556,/obj/item/ammo_magazine/a556,/obj/item/ammo_magazine/a556,/obj/item/ammo_magazine/a556,/obj/item/ammo_magazine/a556,/obj/item/ammo_magazine/a556,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"aqN" = (/obj/structure/table/rack,/obj/item/ammo_magazine/c762,/obj/item/ammo_magazine/c762,/obj/item/ammo_magazine/c762,/obj/item/ammo_magazine/c762,/obj/item/ammo_magazine/c762,/obj/item/ammo_magazine/c762,/obj/item/ammo_magazine/c762,/obj/item/ammo_magazine/c762,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "aqO" = (/obj/structure/table/rack,/obj/item/weapon/gun/projectile/automatic/z8,/obj/item/weapon/gun/projectile/automatic/z8,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "aqP" = (/obj/structure/table/rack,/obj/item/weapon/gun/energy/sniperrifle,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "aqQ" = (/obj/structure/table/rack,/obj/item/ammo_magazine/p90,/obj/item/ammo_magazine/p90,/obj/item/ammo_magazine/p90,/obj/item/ammo_magazine/p90,/obj/item/weapon/gun/projectile/automatic/p90,/obj/item/weapon/gun/projectile/automatic/p90,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"aqR" = (/obj/structure/table/rack,/obj/item/ammo_magazine/a762,/obj/item/ammo_magazine/a762,/obj/item/ammo_magazine/a762,/obj/item/ammo_magazine/a762,/obj/item/weapon/gun/projectile/automatic/l6_saw,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"aqR" = (/obj/structure/table/rack,/obj/item/ammo_magazine/a556,/obj/item/ammo_magazine/a556,/obj/item/ammo_magazine/a556,/obj/item/ammo_magazine/a556,/obj/item/weapon/gun/projectile/automatic/l6_saw,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "aqS" = (/obj/effect/wingrille_spawn/reinforced/crescent,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/centcom/specops) "aqT" = (/obj/structure/closet/crate,/obj/item/clothing/shoes/magboots,/obj/item/clothing/shoes/magboots,/obj/item/clothing/shoes/magboots,/obj/item/clothing/shoes/magboots,/obj/item/clothing/shoes/magboots,/obj/item/clothing/shoes/magboots,/obj/item/weapon/storage/box,/obj/item/weapon/storage/box,/obj/item/weapon/storage/box,/obj/item/weapon/storage/box,/obj/item/weapon/storage/box,/obj/item/weapon/storage/box,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "aqU" = (/obj/machinery/autolathe{desc = "Your typical Autolathe. It appears to have much more options than your regular one, however..."; hacked = 1; name = "Unlocked Autolathe"},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops)