From 16949993966a2f5552e79fce99b366485a0dd3b6 Mon Sep 17 00:00:00 2001 From: Steeclad Cat Date: Sun, 2 Jun 2024 01:47:41 -0500 Subject: [PATCH 01/15] ATTACHMENT FLAVOR TEXT GO --- code/modules/projectiles/gun_attachables.dm | 34 +++++++++++++++------ 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/code/modules/projectiles/gun_attachables.dm b/code/modules/projectiles/gun_attachables.dm index d7ec91b8ec..012b57e106 100644 --- a/code/modules/projectiles/gun_attachables.dm +++ b/code/modules/projectiles/gun_attachables.dm @@ -250,7 +250,7 @@ Defined in conflicts.dm of the #defines folder. /obj/item/attachable/suppressor name = "suppressor" - desc = "A small tube with exhaust ports to expel noise and gas.\n Does not completely silence a weapon, but does make it much quieter and a little more accurate and stable at the cost of slightly reduced damage." + desc = "Small muzzle device that reduces flash and noise with special internal geometry.\n Reduces noise of the shot, increases accuracy and stability, but penalizes damage marginally." icon = 'icons/obj/items/weapons/guns/attachments/barrel.dmi' icon_state = "suppressor" slot = "muzzle" @@ -278,7 +278,7 @@ Defined in conflicts.dm of the #defines folder. icon = 'icons/obj/items/weapons/guns/attachments/barrel.dmi' icon_state = "bayonet" item_state = "combat_knife" - desc = "The standard-issue bayonet of the Colonial Marines. You can slide this knife into your boots, or attach it to the end of a rifle." + desc = "USCMC standard issue combat knife. Can be put into boot holster or affixed to the bayonet lug of a rifle. Can also be used to extract shrapnel..." sharp = IS_SHARP_ITEM_ACCURATE force = MELEE_FORCE_NORMAL throwforce = MELEE_FORCE_NORMAL @@ -375,7 +375,7 @@ Defined in conflicts.dm of the #defines folder. /obj/item/attachable/extended_barrel name = "extended barrel" - desc = "The lengthened barrel speeds up and stabilizes the bullet, increasing velocity and accuracy." + desc = "Longer barrel reduces unburnt powder, improving muzzle velocity and accuracy." slot = "muzzle" icon = 'icons/obj/items/weapons/guns/attachments/barrel.dmi' icon_state = "ebarrel" @@ -608,8 +608,7 @@ Defined in conflicts.dm of the #defines folder. /obj/item/attachable/reddot name = "S5 red-dot sight" - desc = "An ARMAT S5 red-dot sight. A zero-magnification optic that offers faster, and more accurate target acquisition." - desc_lore = "An all-weather collimator sight, designated as the AN/PVQ-64 Dot Sight. Equipped with a sunshade to increase clarity in bright conditions and resist weathering. Compact and efficient, a marvel of military design, until you realize that this is actually just an off-the-shelf design that got a military designation slapped on." + desc = "An ARMAT S5 red-dot, type designated as the AN/PVQ-62 Dot Sight. Zero-magnification optic equipped with a sunshade, for better clarity under bright conditions and weather resistance. Unobtrusive and compact, increases wielded accuracy." icon = 'icons/obj/items/weapons/guns/attachments/rail.dmi' icon_state = "reddot" attach_icon = "reddot_a" @@ -621,10 +620,14 @@ Defined in conflicts.dm of the #defines folder. accuracy_unwielded_mod = HIT_ACCURACY_MULT_TIER_1 movement_onehanded_acc_penalty_mod = MOVEMENT_ACCURACY_PENALTY_MULT_TIER_5 +/obj/item/attachable/reddot/union + . = ..() + name = "EKP-9-M Red Dot Sight" + desc = "Cutting edge UPP sight with automated reticle correction for a fixed zero point. Increases accuracy significantly. \nStatistically identical to the S5 Dot Sight." + /obj/item/attachable/reflex name = "S6 reflex sight" - desc = "An ARMAT S6 reflex sight. A zero-magnification alternative to iron sights with a more open optic window when compared to the S5 red-dot. Helps to reduce scatter during automated fire." - desc_lore = "A simple folding reflex sight designated as the AN/PVG-72 Reflex Sight, compatible with most rail systems. Bulky and built to last, it can link with military HUDs for limited point-of-aim calculations." + desc = "An ARMAT S6 reflex sight, type designated as the AN/PVG-72 Reflex. Zero-magnification alternative to irons, decreases scatter during burst fire. Can link with mil-HUDs for a limited CCIP. icon = 'icons/obj/items/weapons/guns/attachments/rail.dmi' icon_state = "reflex" attach_icon = "reflex_a" @@ -638,6 +641,9 @@ Defined in conflicts.dm of the #defines folder. burst_scatter_mod = -1 movement_onehanded_acc_penalty_mod = MOVEMENT_ACCURACY_PENALTY_MULT_TIER_5 +/obj/item/attachable/reflex/union + name = "PK-12 Reflex Sight" + desc = "Reflector type gunsight compatible with most standard issue UPP firearms. Durable but the power supply is notoriously unreliable. Reduces scatter significantly and boosts accuracy slightly. \nStatistically identical to the S6 Reflex Sight." /obj/item/attachable/flashlight name = "rail flashlight" @@ -3181,6 +3187,10 @@ Defined in conflicts.dm of the #defines folder. accuracy_unwielded_mod = -HIT_ACCURACY_MULT_TIER_3 scatter_unwielded_mod = SCATTER_AMOUNT_TIER_10 +/obj/item/attachable/verticalgrip/union + name = "RK-5 Vertical Grip" + desc = "Sturdy grip positioned at optimal place offers enhanced stability in rapid fire. Increases weapon size, penalizes one handed fire, improves scatter and accuracy while wielded." + /obj/item/attachable/angledgrip name = "angled grip" desc = "An angled foregrip that improves weapon ergonomics resulting in faster wielding time. \nHowever, it also increases weapon size." @@ -3192,6 +3202,10 @@ Defined in conflicts.dm of the #defines folder. slot = "under" pixel_shift_x = 20 +/obj/item/attachable/angledgrip/union + name = "RK-9 Vertical Grip" + desc = "Ergonomic grip decreases time for shouldering the weapon. Increases weapon size, accelerates wield speed." + /obj/item/attachable/gyro name = "gyroscopic stabilizer" desc = "A set of weights and balances to stabilize the weapon when fired with one hand. Slightly decreases firing speed." @@ -3219,8 +3233,7 @@ Defined in conflicts.dm of the #defines folder. /obj/item/attachable/lasersight name = "laser sight" - desc = "A laser sight that attaches to the underside of most weapons. Increases accuracy and decreases scatter, especially while one-handed." - desc_lore = "A standard visible-band laser module designated as the AN/PEQ-42 Laser Sight. Can be mounted onto any firearm that has a lower rail large enough to accommodate it." + desc = "Standard issue visible-band underbarrel laser module, type designation AN/PEQ-42. Increases accuracy and decreases scatter, especially while one-handed. Also improves handling on the move." icon = 'icons/obj/items/weapons/guns/attachments/under.dmi' icon_state = "lasersight" attach_icon = "lasersight_a" @@ -3236,6 +3249,9 @@ Defined in conflicts.dm of the #defines folder. scatter_unwielded_mod = -SCATTER_AMOUNT_TIER_9 accuracy_unwielded_mod = HIT_ACCURACY_MULT_TIER_1 +/obj/item/attachable/lasersight/union + name = "Zvezda Laser Module" + desc = "Visible band 512nm green laser, compatible with NVG and IR. Bears striking resemblance to an old Weyland Yutani offering... Decreases scatter, especially onehanded, slightly boosts accuracy. " /obj/item/attachable/bipod name = "bipod" From 0624eb271731a4b3b37fefbb39f5efb755efb325 Mon Sep 17 00:00:00 2001 From: KoishiVibe Date: Sun, 2 Jun 2024 02:14:21 -0500 Subject: [PATCH 02/15] fixed minor errors --- code/modules/projectiles/gun_attachables.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/modules/projectiles/gun_attachables.dm b/code/modules/projectiles/gun_attachables.dm index 012b57e106..6ae5e35aa2 100644 --- a/code/modules/projectiles/gun_attachables.dm +++ b/code/modules/projectiles/gun_attachables.dm @@ -621,13 +621,12 @@ Defined in conflicts.dm of the #defines folder. movement_onehanded_acc_penalty_mod = MOVEMENT_ACCURACY_PENALTY_MULT_TIER_5 /obj/item/attachable/reddot/union - . = ..() name = "EKP-9-M Red Dot Sight" desc = "Cutting edge UPP sight with automated reticle correction for a fixed zero point. Increases accuracy significantly. \nStatistically identical to the S5 Dot Sight." /obj/item/attachable/reflex name = "S6 reflex sight" - desc = "An ARMAT S6 reflex sight, type designated as the AN/PVG-72 Reflex. Zero-magnification alternative to irons, decreases scatter during burst fire. Can link with mil-HUDs for a limited CCIP. + desc = "An ARMAT S6 reflex sight, type designated as the AN/PVG-72 Reflex. Zero-magnification alternative to irons, decreases scatter during burst fire. Can link with mil-HUDs for a limited CCIP." icon = 'icons/obj/items/weapons/guns/attachments/rail.dmi' icon_state = "reflex" attach_icon = "reflex_a" From 1c29ffbe033b0f1e95ace80c1b03c55991246cc8 Mon Sep 17 00:00:00 2001 From: KoishiVibe Date: Sun, 2 Jun 2024 02:47:27 -0500 Subject: [PATCH 03/15] fuckem buckem zuccem --- code/modules/projectiles/gun_attachables.dm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/code/modules/projectiles/gun_attachables.dm b/code/modules/projectiles/gun_attachables.dm index 6ae5e35aa2..a59b707f86 100644 --- a/code/modules/projectiles/gun_attachables.dm +++ b/code/modules/projectiles/gun_attachables.dm @@ -646,7 +646,7 @@ Defined in conflicts.dm of the #defines folder. /obj/item/attachable/flashlight name = "rail flashlight" - desc = "A flashlight, for rails, on guns. Can be toggled on and off. A better light source than standard M3 pattern armor lights." + desc = "Railmounted flashlight. Pretty generic. Surprisingly high intensity, as it's a better light source than the suit lamps of most armor systems." icon = 'icons/obj/items/weapons/guns/attachments/rail.dmi' icon_state = "flashlight" attach_icon = "flashlight_a" @@ -899,8 +899,7 @@ Defined in conflicts.dm of the #defines folder. icon = 'icons/obj/items/weapons/guns/attachments/rail.dmi' icon_state = "sniperscope" attach_icon = "sniperscope_a" - desc = "An ARMAT S8 telescopic eye piece. Fixed at 4x zoom. Press the 'use rail attachment' HUD icon or use the verb of the same name to zoom." - desc_lore = "An intermediate-power Armat scope designated as the AN/PVQ-31 4x Optic. Fairly basic, but both durable and functional... enough. 780 meters is about as far as one can push the 10x24mm cartridge, really." + desc = "An ARMAT S8 scope, type designation AN/PVQ-31. Fixed 4x zoom, reduces fire rate and increases wield time but increases accuracy while scoped." slot = "rail" aim_speed_mod = SLOWDOWN_ADS_SCOPE //Extra slowdown when wielded wield_delay_mod = WIELD_DELAY_FAST @@ -989,6 +988,9 @@ Defined in conflicts.dm of the #defines folder. #define ZOOM_LEVEL_2X 0 #define ZOOM_LEVEL_4X 1 +/obj/item/attachable/scope/union + name = "S8 4x telescopic scope" + /obj/item/attachable/scope/variable_zoom name = "S10 variable zoom telescopic scope" desc = "An ARMAT S10 telescopic eye piece. Can be switched between 2x zoom, which allows the user to move while scoped in, and 4x zoom. Press the 'use rail attachment' HUD icon or use the verb of the same name to zoom." @@ -1095,6 +1097,8 @@ Defined in conflicts.dm of the #defines folder. G.slowdown -= dynamic_aim_slowdown ..() + + /obj/item/attachable/scope/mini/flaregun wield_delay_mod = 0 dynamic_aim_slowdown = SLOWDOWN_ADS_MINISCOPE_DYNAMIC From dd2404645eb43fc57dd33aa8051a7d67ab5d48bb Mon Sep 17 00:00:00 2001 From: KoishiVibe Date: Sun, 2 Jun 2024 03:25:57 -0500 Subject: [PATCH 04/15] im gonna grab androbetel. nominally makes UPP weapons now accept their variants properly, and only spawn with union attachments. Glory to Socialism. --- code/modules/projectiles/gun_attachables.dm | 21 ++++++---- code/modules/projectiles/guns/rifles.dm | 38 +++++++++++++------ code/modules/projectiles/guns/shotguns.dm | 11 +++++- .../projectiles/guns/specialist/sniper.dm | 1 + 4 files changed, 50 insertions(+), 21 deletions(-) diff --git a/code/modules/projectiles/gun_attachables.dm b/code/modules/projectiles/gun_attachables.dm index a59b707f86..b9283693b1 100644 --- a/code/modules/projectiles/gun_attachables.dm +++ b/code/modules/projectiles/gun_attachables.dm @@ -806,6 +806,10 @@ Defined in conflicts.dm of the #defines folder. to_chat(user, SPAN_NOTICE("Hold on there cowboy, that grip is bolted on. You are unable to modify it.")) return +/obj/item/attachable/flashlight/grip/union + name = "RK-9 Flashlight Grip" + desc = "Folding grip with an integrated flashlight. Reduces recoil and scatter marginally, boosts accuracy slightly. \nStatistically udentical to the underbarrel flashlight grip." + /obj/item/attachable/flashlight/laser_light_combo //Unique attachment for the VP78 based on the fact it has a Laser-Light Module in AVP2010 name = "VP78 Laser-Light Module" desc = "A Laser-Light module for the VP78 Service Pistol which is currently undergoing limited field testing as part of the USCMs next generation pistol program. All VP78 pistols come equipped with the module." @@ -989,7 +993,8 @@ Defined in conflicts.dm of the #defines folder. #define ZOOM_LEVEL_4X 1 /obj/item/attachable/scope/union - name = "S8 4x telescopic scope" + name = "PO-M 4x Optic" + desc = "Old fashioned 4x scope. Sturdy, but a little unergonomic. UPP tradition. Reduces RoF and increases wield time. Major accuracy bonus when scoped. \nStatistically identical to the S8 Scope." /obj/item/attachable/scope/variable_zoom name = "S10 variable zoom telescopic scope" @@ -1073,8 +1078,7 @@ Defined in conflicts.dm of the #defines folder. name = "S4 2x telescopic mini-scope" icon_state = "miniscope" attach_icon = "miniscope_a" - desc = "An ARMAT S4 telescoping eye piece. Fixed at a modest 2x zoom. Press the 'use rail attachment' HUD icon or use the verb of the same name to zoom." - desc_lore = "A light-duty optic, designated as the AN/PVQ-45 2x Optic. Suited towards short to medium-range engagements. Users are advised to zero it often, as the first mass-production batch had a tendency to drift in one direction or another with sustained use." + desc = "An ARMAT S4 scope, type designation AN/PVQ-45. 2x magnification optic, increases accuracy while scoped, decreases RoF and increased wield speed. \nZero often, first production batch suffered from drifting under heavy use and some of them might be in circulation still." slot = "rail" zoom_offset = 6 zoom_viewsize = 7 @@ -1097,7 +1101,9 @@ Defined in conflicts.dm of the #defines folder. G.slowdown -= dynamic_aim_slowdown ..() - +/obj/item/attachable/scope/mini/union + name = "1P93 2x Optic" + desc = "Mild update of a 2159 UPP design. Holds zero in all conditions, antiglint grid prevents glare, but the reticle is unfortunately cluttered and busy. Reduces RoF and increases wield time, boosts accuracy while scoped. \nStatistically identical to the S4 Scope." /obj/item/attachable/scope/mini/flaregun wield_delay_mod = 0 @@ -1120,7 +1126,7 @@ Defined in conflicts.dm of the #defines folder. name = "2x hunting mini-scope" icon_state = "huntingscope" attach_icon = "huntingscope" - desc = "This civilian-grade scope is a common sight on hunting rifles due to its cheap price and great optics. Fixed at a modest 2x zoom. Press the 'use rail attachment' HUD icon or use the verb of the same name to zoom." + desc = "Generic fixed-magnification 2x optic. Common just about everywhere in civil hands, and sometimes used by law enforcement too." /obj/item/attachable/scope/mini/nsg23 name = "W-Y S4 2x advanced telescopic mini-scope" @@ -1132,7 +1138,7 @@ Defined in conflicts.dm of the #defines folder. /obj/item/attachable/scope/mini/xm88 name = "XS-9 targeting relay" - desc = "An ARMAT XS-9 optical interface. Unlike a traditional scope, this rail-mounted device features no telescoping lens. Instead, the firearm's onboard targeting system relays data directly to the optic for the system operator to reference in realtime." + desc = "An ARMAT XS-9 optical interface, type designation XAN/PVG-90. Computer controlled 2x magnification with electronic fire control system, interfacing with the rifle's sensors to provide near perfect shooting accuracy... In theory." icon_state = "boomslang-scope" zoom_offset = 7 dynamic_aim_slowdown = SLOWDOWN_ADS_NONE @@ -1146,8 +1152,7 @@ Defined in conflicts.dm of the #defines folder. name = "B8 Smart-Scope" icon_state = "iffbarrel" attach_icon = "iffbarrel_a" - desc = "An experimental B8 Smart-Scope. Based on the technologies used in the Smart Gun by ARMAT, this sight has integrated IFF systems. It can only attach to the M4RA Battle Rifle and M44 Combat Revolver." - desc_lore = "An experimental fire-control optic capable of linking into compatible IFF systems on certain weapons, designated the XAN/PVG-110 Smart Scope. Currently programmed for usage with the M4RA battle rifle and M44 Combat Revolver, due to their relatively lower rates of fire. Experimental technology developed by Armat, who have assured that all previously reported issues with false-negative IFF recognitions have been solved. Make sure to check the sight after every op, just in case." + desc = "An experimental B8 Smart-Scope, type designation XAN/PVG-110. Limited automated IFF trigger interlock system allows for use with the M44 Combat Revolver and M4RA Battle Rifle. Reduces damage due to the momentary trigger delay." slot = "rail" zoom_offset = 6 zoom_viewsize = 7 diff --git a/code/modules/projectiles/guns/rifles.dm b/code/modules/projectiles/guns/rifles.dm index 76470513f3..4197a11861 100644 --- a/code/modules/projectiles/guns/rifles.dm +++ b/code/modules/projectiles/guns/rifles.dm @@ -1287,17 +1287,24 @@ /obj/item/attachable/flashlight, // Rail /obj/item/attachable/magnetic_harness, /obj/item/attachable/scope, + /obj/item/attachable/scope/union, /obj/item/attachable/scope/mini, + /obj/item/attachable/scope/mini/union, /obj/item/attachable/reddot, + /obj/item/attachable/reddot/union, /obj/item/attachable/reflex, + /obj/item/attachable/reflex/union, /obj/item/attachable/suppressor, // Muzzle /obj/item/attachable/bayonet, /obj/item/attachable/bayonet/upp, /obj/item/attachable/extended_barrel, /obj/item/attachable/heavy_barrel, /obj/item/attachable/verticalgrip, // Underbarrel + /obj/item/attachable/verticalgrip/union, /obj/item/attachable/flashlight/grip, + /obj/item/attachable/flashlight/grip/union, /obj/item/attachable/lasersight, + /obj/item/attachable/lasersight/union, /obj/item/attachable/burstfire_assembly, /obj/item/attachable/attached_gun/flamer, /obj/item/attachable/attached_gun/flamer/advanced, @@ -1336,7 +1343,7 @@ random_spawn_chance = 100 random_rail_chance = 70 random_spawn_rail = list( - /obj/item/attachable/reflex, + /obj/item/attachable/reflex/union, /obj/item/attachable/flashlight, ) random_muzzle_chance = 100 @@ -1345,14 +1352,14 @@ ) random_under_chance = 40 random_spawn_under = list( - /obj/item/attachable/verticalgrip, + /obj/item/attachable/verticalgrip/union, ) /obj/item/weapon/gun/rifle/type71/dual random_spawn_chance = 100 random_rail_chance = 70 random_spawn_rail = list( - /obj/item/attachable/reflex, + /obj/item/attachable/reflex/union, /obj/item/attachable/flashlight, ) random_muzzle_chance = 100 @@ -1361,8 +1368,8 @@ ) random_under_chance = 40 random_spawn_under = list( - /obj/item/attachable/lasersight, - /obj/item/attachable/verticalgrip, + /obj/item/attachable/lasersight/union, + /obj/item/attachable/verticalgrip/union, ) /obj/item/weapon/gun/rifle/type71/sapper @@ -1370,7 +1377,7 @@ random_spawn_chance = 100 random_rail_chance = 80 random_spawn_rail = list( - /obj/item/attachable/reflex, + /obj/item/attachable/reflex/union, /obj/item/attachable/flashlight, /obj/item/attachable/magnetic_harness, ) @@ -1391,9 +1398,12 @@ /obj/item/attachable/flashlight, // Rail /obj/item/attachable/magnetic_harness, /obj/item/attachable/scope, + /obj/item/attachable/scope/union, /obj/item/attachable/scope/mini, - /obj/item/attachable/reddot, + /obj/item/attachable/scope/mini/union, + /obj/item/attachable/reddot/union, /obj/item/attachable/reflex, + /obj/item/attachable/reflex/union, /obj/item/attachable/suppressor, // Muzzle /obj/item/attachable/bayonet, /obj/item/attachable/bayonet/upp, @@ -1412,10 +1422,10 @@ random_spawn_chance = 100 random_rail_chance = 100 random_spawn_rail = list( - /obj/item/attachable/reflex, + /obj/item/attachable/reflex/union, /obj/item/attachable/flashlight, /obj/item/attachable/magnetic_harness, - /obj/item/attachable/scope/mini, + /obj/item/attachable/scope/mini/union, ) random_muzzle_chance = 100 random_spawn_muzzle = list( @@ -1435,15 +1445,20 @@ /obj/item/attachable/flashlight, // Rail /obj/item/attachable/magnetic_harness, /obj/item/attachable/scope, + /obj/item/attachable/scope/union, /obj/item/attachable/scope/mini, + /obj/item/attachable/scope/mini/union, /obj/item/attachable/reddot, + /obj/item/attachable/reddot/union, /obj/item/attachable/reflex, + /obj/item/attachable/reflex/union, /obj/item/attachable/suppressor, // Muzzle /obj/item/attachable/bayonet, /obj/item/attachable/bayonet/upp, /obj/item/attachable/extended_barrel, /obj/item/attachable/heavy_barrel, /obj/item/attachable/verticalgrip, // Underbarrel + /obj/item/attachable/verticalgrip/union, /obj/item/attachable/burstfire_assembly, ) @@ -1466,7 +1481,7 @@ random_spawn_chance = 100 random_rail_chance = 70 random_spawn_rail = list( - /obj/item/attachable/reflex, + /obj/item/attachable/reflex/union, /obj/item/attachable/flashlight, ) random_muzzle_chance = 100 @@ -1475,7 +1490,7 @@ ) random_under_chance = 40 random_spawn_under = list( - /obj/item/attachable/verticalgrip, + /obj/item/attachable/verticalgrip/union, ) /obj/item/weapon/gun/rifle/type71/carbine/commando @@ -1490,6 +1505,7 @@ current_mag = /obj/item/ammo_magazine/rifle/type71/ap attachable_allowed = list( /obj/item/attachable/verticalgrip, + /obj/item/attachable/verticalgrip/union, ) random_spawn_chance = 0 random_spawn_rail = list() diff --git a/code/modules/projectiles/guns/shotguns.dm b/code/modules/projectiles/guns/shotguns.dm index 9ea6624dc6..b69c98772c 100644 --- a/code/modules/projectiles/guns/shotguns.dm +++ b/code/modules/projectiles/guns/shotguns.dm @@ -374,14 +374,18 @@ can cause issues with ammo types getting mixed up during the burst. current_mag = /obj/item/ammo_magazine/internal/shotgun/type23 attachable_allowed = list( /obj/item/attachable/reddot, // Rail + /obj/item/attachable/reddot/union, /obj/item/attachable/reflex, + /obj/item/attachable/reflex/union, /obj/item/attachable/flashlight, /obj/item/attachable/magnetic_harness, /obj/item/attachable/bayonet, // Muzzle /obj/item/attachable/heavy_barrel, /obj/item/attachable/bayonet/upp, /obj/item/attachable/verticalgrip, // Underbarrel + /obj/item/attachable/verticalgrip/union, /obj/item/attachable/flashlight/grip, + /obj/item/attachable/flashlight/grip/union, /obj/item/attachable/attached_gun/flamer, /obj/item/attachable/attached_gun/flamer/advanced, /obj/item/attachable/attached_gun/extinguisher, @@ -421,7 +425,7 @@ can cause issues with ammo types getting mixed up during the burst. ) random_under_chance = 40 random_spawn_under = list( - /obj/item/attachable/verticalgrip, + /obj/item/attachable/verticalgrip/union, ) /obj/item/weapon/gun/shotgun/type23/breacher/slug @@ -444,7 +448,7 @@ can cause issues with ammo types getting mixed up during the burst. random_under_chance = 100 random_spawn_under = list( /obj/item/attachable/flashlight/grip, - /obj/item/attachable/verticalgrip, + /obj/item/attachable/verticalgrip/union, ) /obj/item/weapon/gun/shotgun/type23/dragon @@ -470,10 +474,13 @@ can cause issues with ammo types getting mixed up during the burst. current_mag = /obj/item/ammo_magazine/internal/shotgun/type23/beanbag attachable_allowed = list( /obj/item/attachable/reddot, //Rail + /obj/item/attachable/reddot/union, /obj/item/attachable/reflex, + /obj/item/attachable/reflex/union, /obj/item/attachable/flashlight, /obj/item/attachable/magnetic_harness, /obj/item/attachable/verticalgrip, //Underbarrel + /obj/item/attachable/verticalgrip/union, /obj/item/attachable/stock/type23, //Stock ) flags_gun_features = GUN_CAN_POINTBLANK|GUN_AMMO_COUNTER|GUN_INTERNAL_MAG diff --git a/code/modules/projectiles/guns/specialist/sniper.dm b/code/modules/projectiles/guns/specialist/sniper.dm index e5728c5307..763ebfac4c 100644 --- a/code/modules/projectiles/guns/specialist/sniper.dm +++ b/code/modules/projectiles/guns/specialist/sniper.dm @@ -473,6 +473,7 @@ /obj/item/attachable/bayonet/upp, //Under, /obj/item/attachable/verticalgrip, + /obj/item/attachable/verticalgrip/union, /obj/item/attachable/bipod, //Integrated, /obj/item/attachable/type88_barrel, From 37b785d428cfc268a8503a7380ab9f31c75d4988 Mon Sep 17 00:00:00 2001 From: KoishiVibe Date: Sun, 2 Jun 2024 03:31:45 -0500 Subject: [PATCH 05/15] ...that should be all. --- code/modules/gear_presets/upp.dm | 382 +++++++++++++++---------------- 1 file changed, 191 insertions(+), 191 deletions(-) diff --git a/code/modules/gear_presets/upp.dm b/code/modules/gear_presets/upp.dm index 6406cf5301..b4c93a01eb 100644 --- a/code/modules/gear_presets/upp.dm +++ b/code/modules/gear_presets/upp.dm @@ -173,13 +173,13 @@ list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), - list("Angled Grip", 0, /obj/item/attachable/angledgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Angled Grip", 0, /obj/item/attachable/angledgrip/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Extended Barrel", 0, /obj/item/attachable/extended_barrel, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Laser Sight", 0, /obj/item/attachable/lasersight, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 0, /obj/item/attachable/reddot, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 0, /obj/item/attachable/reflex, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Laser Sight", 0, /obj/item/attachable/lasersight/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Red-Dot Sight", 0, /obj/item/attachable/reddot/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Reflex Sight", 0, /obj/item/attachable/reflex/union/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Suppressor", 0, /obj/item/attachable/suppressor, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 0, /obj/item/attachable/verticalgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Vertical Grip", 0, /obj/item/attachable/verticalgrip/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("MASK (CHOOSE 1)", 0, null, null, null), list("Gas Mask", 0, /obj/item/clothing/mask/gas, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), @@ -196,13 +196,13 @@ list("Type 71 AP Magazine (5.45x39mm)", 10, /obj/item/ammo_magazine/rifle/type71/ap , null, VENDOR_ITEM_REGULAR), list("ATTACHMENTS", 0, null, null, null), - list("Angled Grip", 10, /obj/item/attachable/angledgrip, null, VENDOR_ITEM_REGULAR), + list("Angled Grip", 10, /obj/item/attachable/angledgrip/union, null, VENDOR_ITEM_REGULAR), list("Extended Barrel", 10, /obj/item/attachable/extended_barrel, null, VENDOR_ITEM_REGULAR), - list("Laser Sight", 10, /obj/item/attachable/lasersight, null, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 10, /obj/item/attachable/reddot, null, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 10, /obj/item/attachable/reflex, null, VENDOR_ITEM_REGULAR), + list("Laser Sight", 10, /obj/item/attachable/lasersight/union, null, VENDOR_ITEM_REGULAR), + list("Red-Dot Sight", 10, /obj/item/attachable/reddot/union, null, VENDOR_ITEM_REGULAR), + list("Reflex Sight", 10, /obj/item/attachable/reflex/union/union, null, VENDOR_ITEM_REGULAR), list("Suppressor", 10, /obj/item/attachable/suppressor, null, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 10, /obj/item/attachable/verticalgrip, null, VENDOR_ITEM_REGULAR), + list("Vertical Grip", 10, /obj/item/attachable/verticalgrip/union, null, VENDOR_ITEM_REGULAR), list("EXPLOSIVES", 0, null, null, null), list("Smoke Grenade", 5, /obj/item/explosive/grenade/smokebomb, null, VENDOR_ITEM_REGULAR), @@ -306,13 +306,13 @@ list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), - list("Angled Grip", 0, /obj/item/attachable/angledgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Angled Grip", 0, /obj/item/attachable/angledgrip/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Extended Barrel", 0, /obj/item/attachable/extended_barrel, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Laser Sight", 0, /obj/item/attachable/lasersight, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 0, /obj/item/attachable/reddot, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 0, /obj/item/attachable/reflex, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Laser Sight", 0, /obj/item/attachable/lasersight/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Red-Dot Sight", 0, /obj/item/attachable/reddot/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Reflex Sight", 0, /obj/item/attachable/reflex/union/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Suppressor", 0, /obj/item/attachable/suppressor, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 0, /obj/item/attachable/verticalgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Vertical Grip", 0, /obj/item/attachable/verticalgrip/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("MASK (CHOOSE 1)", 0, null, null, null), list("Gas Mask", 0, /obj/item/clothing/mask/gas, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), @@ -366,13 +366,13 @@ list("Type 71 AP Magazine (5.45x39mm)", 10, /obj/item/ammo_magazine/rifle/type71/ap , null, VENDOR_ITEM_REGULAR), list("ATTACHMENTS", 0, null, null, null), - list("Angled Grip", 10, /obj/item/attachable/angledgrip, null, VENDOR_ITEM_REGULAR), + list("Angled Grip", 10, /obj/item/attachable/angledgrip/union, null, VENDOR_ITEM_REGULAR), list("Extended Barrel", 10, /obj/item/attachable/extended_barrel, null, VENDOR_ITEM_REGULAR), - list("Laser Sight", 10, /obj/item/attachable/lasersight, null, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 10, /obj/item/attachable/reddot, null, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 10, /obj/item/attachable/reflex, null, VENDOR_ITEM_REGULAR), + list("Laser Sight", 10, /obj/item/attachable/lasersight/union, null, VENDOR_ITEM_REGULAR), + list("Red-Dot Sight", 10, /obj/item/attachable/reddot/union/union, null, VENDOR_ITEM_REGULAR), + list("Reflex Sight", 10, /obj/item/attachable/reflex/union, null, VENDOR_ITEM_REGULAR), list("Suppressor", 10, /obj/item/attachable/suppressor, null, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 10, /obj/item/attachable/verticalgrip, null, VENDOR_ITEM_REGULAR), + list("Vertical Grip", 10, /obj/item/attachable/verticalgrip/union, null, VENDOR_ITEM_REGULAR), list("EXPLOSIVES", 0, null, null, null), list("Smoke Grenade", 5, /obj/item/explosive/grenade/smokebomb, null, VENDOR_ITEM_REGULAR), @@ -499,13 +499,13 @@ list("Type 71 AP Magazine (5.45x39mm)", 10, /obj/item/ammo_magazine/rifle/type71/ap , null, VENDOR_ITEM_REGULAR), list("ATTACHMENTS", 0, null, null, null), - list("Angled Grip", 10, /obj/item/attachable/angledgrip, null, VENDOR_ITEM_REGULAR), + list("Angled Grip", 10, /obj/item/attachable/angledgrip/union, null, VENDOR_ITEM_REGULAR), list("Extended Barrel", 10, /obj/item/attachable/extended_barrel, null, VENDOR_ITEM_REGULAR), - list("Laser Sight", 10, /obj/item/attachable/lasersight, null, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 10, /obj/item/attachable/reddot, null, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 10, /obj/item/attachable/reflex, null, VENDOR_ITEM_REGULAR), + list("Laser Sight", 10, /obj/item/attachable/lasersight/union, null, VENDOR_ITEM_REGULAR), + list("Red-Dot Sight", 10, /obj/item/attachable/reddot/union, null, VENDOR_ITEM_REGULAR), + list("Reflex Sight", 10, /obj/item/attachable/reflex/union, null, VENDOR_ITEM_REGULAR), list("Suppressor", 10, /obj/item/attachable/suppressor, null, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 10, /obj/item/attachable/verticalgrip, null, VENDOR_ITEM_REGULAR), + list("Vertical Grip", 10, /obj/item/attachable/verticalgrip/union/union, null, VENDOR_ITEM_REGULAR), list("EXPLOSIVES", 0, null, null, null), list("Plastic Explosive", 5, /obj/item/explosive/plastic, null, VENDOR_ITEM_REGULAR), @@ -604,13 +604,13 @@ list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), - list("Angled Grip", 0, /obj/item/attachable/angledgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Angled Grip", 0, /obj/item/attachable/angledgrip/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Extended Barrel", 0, /obj/item/attachable/extended_barrel, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Laser Sight", 0, /obj/item/attachable/lasersight, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 0, /obj/item/attachable/reddot, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 0, /obj/item/attachable/reflex, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Laser Sight", 0, /obj/item/attachable/lasersight/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Red-Dot Sight", 0, /obj/item/attachable/reddot/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Reflex Sight", 0, /obj/item/attachable/reflex/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Suppressor", 0, /obj/item/attachable/suppressor, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 0, /obj/item/attachable/verticalgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Vertical Grip", 0, /obj/item/attachable/verticalgrip/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("MASK (CHOOSE 1)", 0, null, null, null), list("Gas Mask", 0, /obj/item/clothing/mask/gas, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), @@ -626,13 +626,13 @@ list("QYJ-72 Box Magazine(7.62x54mmR)", 15, /obj/item/ammo_magazine/pkp , null, VENDOR_ITEM_RECOMMENDED), list("ATTACHMENTS (NONE FIT QYJ-72)", 0, null, null, null), - list("Angled Grip", 10, /obj/item/attachable/angledgrip, null, VENDOR_ITEM_REGULAR), + list("Angled Grip", 10, /obj/item/attachable/angledgrip/union, null, VENDOR_ITEM_REGULAR), list("Extended Barrel", 10, /obj/item/attachable/extended_barrel, null, VENDOR_ITEM_REGULAR), - list("Laser Sight", 10, /obj/item/attachable/lasersight, null, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 10, /obj/item/attachable/reddot, null, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 10, /obj/item/attachable/reflex, null, VENDOR_ITEM_REGULAR), + list("Laser Sight", 10, /obj/item/attachable/lasersight/union/union, null, VENDOR_ITEM_REGULAR), + list("Red-Dot Sight", 10, /obj/item/attachable/reddot/union, null, VENDOR_ITEM_REGULAR), + list("Reflex Sight", 10, /obj/item/attachable/reflex/union, null, VENDOR_ITEM_REGULAR), list("Suppressor", 10, /obj/item/attachable/suppressor, null, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 10, /obj/item/attachable/verticalgrip, null, VENDOR_ITEM_REGULAR), + list("Vertical Grip", 10, /obj/item/attachable/verticalgrip/union, null, VENDOR_ITEM_REGULAR), list("EXPLOSIVES", 0, null, null, null), list("Plastic Explosive", 5, /obj/item/explosive/plastic, null, VENDOR_ITEM_REGULAR), @@ -729,13 +729,13 @@ list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), - list("Angled Grip", 0, /obj/item/attachable/angledgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Angled Grip", 0, /obj/item/attachable/angledgrip/union/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Extended Barrel", 0, /obj/item/attachable/extended_barrel, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Laser Sight", 0, /obj/item/attachable/lasersight, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 0, /obj/item/attachable/reddot, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 0, /obj/item/attachable/reflex, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Laser Sight", 0, /obj/item/attachable/lasersight/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Red-Dot Sight", 0, /obj/item/attachable/reddot/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Reflex Sight", 0, /obj/item/attachable/reflex/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Suppressor", 0, /obj/item/attachable/suppressor, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 0, /obj/item/attachable/verticalgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Vertical Grip", 0, /obj/item/attachable/verticalgrip/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("MASK (CHOOSE 1)", 0, null, null, null), list("Gas Mask", 0, /obj/item/clothing/mask/gas, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), @@ -751,13 +751,13 @@ list("QYJ-72 Box Magazine (7.62x54mmR)", 15, /obj/item/ammo_magazine/pkp , null, VENDOR_ITEM_RECOMMENDED), list("ATTACHMENTS (NONE FIT QYJ-72)", 0, null, null, null), - list("Angled Grip", 10, /obj/item/attachable/angledgrip, null, VENDOR_ITEM_REGULAR), + list("Angled Grip", 10, /obj/item/attachable/angledgrip/union, null, VENDOR_ITEM_REGULAR), list("Extended Barrel", 10, /obj/item/attachable/extended_barrel, null, VENDOR_ITEM_REGULAR), - list("Laser Sight", 10, /obj/item/attachable/lasersight, null, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 10, /obj/item/attachable/reddot, null, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 10, /obj/item/attachable/reflex, null, VENDOR_ITEM_REGULAR), + list("Laser Sight", 10, /obj/item/attachable/lasersight/union, null, VENDOR_ITEM_REGULAR), + list("Red-Dot Sight", 10, /obj/item/attachable/reddot/union, null, VENDOR_ITEM_REGULAR), + list("Reflex Sight", 10, /obj/item/attachable/reflex/union, null, VENDOR_ITEM_REGULAR), list("Suppressor", 10, /obj/item/attachable/suppressor, null, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 10, /obj/item/attachable/verticalgrip, null, VENDOR_ITEM_REGULAR), + list("Vertical Grip", 10, /obj/item/attachable/verticalgrip/union, null, VENDOR_ITEM_REGULAR), list("EXPLOSIVES", 0, null, null, null), list("Plastic Explosive", 5, /obj/item/explosive/plastic, null, VENDOR_ITEM_REGULAR), @@ -868,13 +868,13 @@ list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), - list("Angled Grip", 0, /obj/item/attachable/angledgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Angled Grip", 0, /obj/item/attachable/angledgrip/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Extended Barrel", 0, /obj/item/attachable/extended_barrel, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Laser Sight", 0, /obj/item/attachable/lasersight, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 0, /obj/item/attachable/reddot, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 0, /obj/item/attachable/reflex, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Laser Sight", 0, /obj/item/attachable/lasersight/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Red-Dot Sight", 0, /obj/item/attachable/reddot/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Reflex Sight", 0, /obj/item/attachable/reflex/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Suppressor", 0, /obj/item/attachable/suppressor, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 0, /obj/item/attachable/verticalgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Vertical Grip", 0, /obj/item/attachable/verticalgrip/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("MASK (CHOOSE 1)", 0, null, null, null), list("Gas Mask", 0, /obj/item/clothing/mask/gas, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), @@ -919,13 +919,13 @@ list("Type 71 AP Magazine (5.45x39mm)", 10, /obj/item/ammo_magazine/rifle/type71/ap , null, VENDOR_ITEM_REGULAR), list("ATTACHMENTS", 0, null, null, null), - list("Angled Grip", 10, /obj/item/attachable/angledgrip, null, VENDOR_ITEM_REGULAR), + list("Angled Grip", 10, /obj/item/attachable/angledgrip/union, null, VENDOR_ITEM_REGULAR), list("Extended Barrel", 10, /obj/item/attachable/extended_barrel, null, VENDOR_ITEM_REGULAR), - list("Laser Sight", 10, /obj/item/attachable/lasersight, null, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 10, /obj/item/attachable/reddot, null, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 10, /obj/item/attachable/reflex, null, VENDOR_ITEM_REGULAR), + list("Laser Sight", 10, /obj/item/attachable/lasersight/union, null, VENDOR_ITEM_REGULAR), + list("Red-Dot Sight", 10, /obj/item/attachable/reddot/union, null, VENDOR_ITEM_REGULAR), + list("Reflex Sight", 10, /obj/item/attachable/reflex/union, null, VENDOR_ITEM_REGULAR), list("Suppressor", 10, /obj/item/attachable/suppressor, null, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 10, /obj/item/attachable/verticalgrip, null, VENDOR_ITEM_REGULAR), + list("Vertical Grip", 10, /obj/item/attachable/verticalgrip/union, null, VENDOR_ITEM_REGULAR), list("EXPLOSIVES", 0, null, null, null), list("Plastic Explosive", 5, /obj/item/explosive/plastic, null, VENDOR_ITEM_REGULAR), @@ -1020,13 +1020,13 @@ list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), - list("Angled Grip", 0, /obj/item/attachable/angledgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Angled Grip", 0, /obj/item/attachable/angledgrip/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Extended Barrel", 0, /obj/item/attachable/extended_barrel, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Laser Sight", 0, /obj/item/attachable/lasersight, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 0, /obj/item/attachable/reddot, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 0, /obj/item/attachable/reflex, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Laser Sight", 0, /obj/item/attachable/lasersight/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Red-Dot Sight", 0, /obj/item/attachable/reddot/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Reflex Sight", 0, /obj/item/attachable/reflex/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Suppressor", 0, /obj/item/attachable/suppressor, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 0, /obj/item/attachable/verticalgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Vertical Grip", 0, /obj/item/attachable/verticalgrip/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("MASK (CHOOSE 1)", 0, null, null, null), list("Gas Mask", 0, /obj/item/clothing/mask/gas/pmc/upp, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), @@ -1071,13 +1071,13 @@ list("Type 71 AP Magazine (5.45x39mm)", 10, /obj/item/ammo_magazine/rifle/type71/ap , null, VENDOR_ITEM_REGULAR), list("ATTACHMENTS", 0, null, null, null), - list("Angled Grip", 10, /obj/item/attachable/angledgrip, null, VENDOR_ITEM_REGULAR), + list("Angled Grip", 10, /obj/item/attachable/angledgrip/union, null, VENDOR_ITEM_REGULAR), list("Extended Barrel", 10, /obj/item/attachable/extended_barrel, null, VENDOR_ITEM_REGULAR), - list("Laser Sight", 10, /obj/item/attachable/lasersight, null, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 10, /obj/item/attachable/reddot, null, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 10, /obj/item/attachable/reflex, null, VENDOR_ITEM_REGULAR), + list("Laser Sight", 10, /obj/item/attachable/lasersight/union, null, VENDOR_ITEM_REGULAR), + list("Red-Dot Sight", 10, /obj/item/attachable/reddot/union, null, VENDOR_ITEM_REGULAR), + list("Reflex Sight", 10, /obj/item/attachable/reflex/union, null, VENDOR_ITEM_REGULAR), list("Suppressor", 10, /obj/item/attachable/suppressor, null, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 10, /obj/item/attachable/verticalgrip, null, VENDOR_ITEM_REGULAR), + list("Vertical Grip", 10, /obj/item/attachable/verticalgrip/union, null, VENDOR_ITEM_REGULAR), list("EXPLOSIVES", 0, null, null, null), list("Plastic Explosive", 5, /obj/item/explosive/plastic, null, VENDOR_ITEM_REGULAR), @@ -1183,13 +1183,13 @@ list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), - list("Angled Grip", 0, /obj/item/attachable/angledgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Angled Grip", 0, /obj/item/attachable/angledgrip/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Extended Barrel", 0, /obj/item/attachable/extended_barrel, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Laser Sight", 0, /obj/item/attachable/lasersight, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 0, /obj/item/attachable/reddot, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 0, /obj/item/attachable/reflex, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Laser Sight", 0, /obj/item/attachable/lasersight/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Red-Dot Sight", 0, /obj/item/attachable/reddot/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Reflex Sight", 0, /obj/item/attachable/reflex/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Suppressor", 0, /obj/item/attachable/suppressor, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 0, /obj/item/attachable/verticalgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Vertical Grip", 0, /obj/item/attachable/verticalgrip/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("MASK (CHOOSE 1)", 0, null, null, null), list("Gas Mask", 0, /obj/item/clothing/mask/gas/pmc/upp, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), @@ -1234,13 +1234,13 @@ list("Type 71 HEAP Magazine (5.45x39mm)", 10, /obj/item/ammo_magazine/rifle/type71/heap , null, VENDOR_ITEM_REGULAR), list("ATTACHMENTS", 0, null, null, null), - list("Angled Grip", 10, /obj/item/attachable/angledgrip, null, VENDOR_ITEM_REGULAR), + list("Angled Grip", 10, /obj/item/attachable/angledgrip/union, null, VENDOR_ITEM_REGULAR), list("Extended Barrel", 10, /obj/item/attachable/extended_barrel, null, VENDOR_ITEM_REGULAR), - list("Laser Sight", 10, /obj/item/attachable/lasersight, null, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 10, /obj/item/attachable/reddot, null, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 10, /obj/item/attachable/reflex, null, VENDOR_ITEM_REGULAR), + list("Laser Sight", 10, /obj/item/attachable/lasersight/union, null, VENDOR_ITEM_REGULAR), + list("Red-Dot Sight", 10, /obj/item/attachable/reddot/union, null, VENDOR_ITEM_REGULAR), + list("Reflex Sight", 10, /obj/item/attachable/reflex/union, null, VENDOR_ITEM_REGULAR), list("Suppressor", 10, /obj/item/attachable/suppressor, null, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 10, /obj/item/attachable/verticalgrip, null, VENDOR_ITEM_REGULAR), + list("Vertical Grip", 10, /obj/item/attachable/verticalgrip/union, null, VENDOR_ITEM_REGULAR), list("EXPLOSIVES", 0, null, null, null), list("Plastic Explosive", 5, /obj/item/explosive/plastic, null, VENDOR_ITEM_REGULAR), @@ -1343,13 +1343,13 @@ list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), - list("Angled Grip", 0, /obj/item/attachable/angledgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Angled Grip", 0, /obj/item/attachable/angledgrip/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Extended Barrel", 0, /obj/item/attachable/extended_barrel, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Laser Sight", 0, /obj/item/attachable/lasersight, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 0, /obj/item/attachable/reddot, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 0, /obj/item/attachable/reflex, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Laser Sight", 0, /obj/item/attachable/lasersight/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Red-Dot Sight", 0, /obj/item/attachable/reddot/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Reflex Sight", 0, /obj/item/attachable/reflex/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Suppressor", 0, /obj/item/attachable/suppressor, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 0, /obj/item/attachable/verticalgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Vertical Grip", 0, /obj/item/attachable/verticalgrip/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("MASK (CHOOSE 1)", 0, null, null, null), list("Gas Mask", 0, /obj/item/clothing/mask/gas/pmc/upp, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), @@ -1394,13 +1394,13 @@ list("Type 71 HEAP Magazine (5.45x39mm)", 10, /obj/item/ammo_magazine/rifle/type71/heap , null, VENDOR_ITEM_REGULAR), list("ATTACHMENTS", 0, null, null, null), - list("Angled Grip", 10, /obj/item/attachable/angledgrip, null, VENDOR_ITEM_REGULAR), + list("Angled Grip", 10, /obj/item/attachable/angledgrip/union, null, VENDOR_ITEM_REGULAR), list("Extended Barrel", 10, /obj/item/attachable/extended_barrel, null, VENDOR_ITEM_REGULAR), - list("Laser Sight", 10, /obj/item/attachable/lasersight, null, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 10, /obj/item/attachable/reddot, null, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 10, /obj/item/attachable/reflex, null, VENDOR_ITEM_REGULAR), + list("Laser Sight", 10, /obj/item/attachable/lasersight/union, null, VENDOR_ITEM_REGULAR), + list("Red-Dot Sight", 10, /obj/item/attachable/reddot/union, null, VENDOR_ITEM_REGULAR), + list("Reflex Sight", 10, /obj/item/attachable/reflex/union, null, VENDOR_ITEM_REGULAR), list("Suppressor", 10, /obj/item/attachable/suppressor, null, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 10, /obj/item/attachable/verticalgrip, null, VENDOR_ITEM_REGULAR), + list("Vertical Grip", 10, /obj/item/attachable/verticalgrip/union, null, VENDOR_ITEM_REGULAR), list("EXPLOSIVES", 0, null, null, null), list("Plastic Explosive", 5, /obj/item/explosive/plastic, null, VENDOR_ITEM_REGULAR), @@ -1504,13 +1504,13 @@ list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), - list("Angled Grip", 0, /obj/item/attachable/angledgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Angled Grip", 0, /obj/item/attachable/angledgrip/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Extended Barrel", 0, /obj/item/attachable/extended_barrel, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Laser Sight", 0, /obj/item/attachable/lasersight, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 0, /obj/item/attachable/reddot, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 0, /obj/item/attachable/reflex, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Laser Sight", 0, /obj/item/attachable/lasersight/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Red-Dot Sight", 0, /obj/item/attachable/reddot/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Reflex Sight", 0, /obj/item/attachable/reflex/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Suppressor", 0, /obj/item/attachable/suppressor, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 0, /obj/item/attachable/verticalgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Vertical Grip", 0, /obj/item/attachable/verticalgrip/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("MASK (CHOOSE 1)", 0, null, null, null), list("Gas Mask", 0, /obj/item/clothing/mask/gas/pmc/upp, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), @@ -1555,13 +1555,13 @@ list("Type 71 HEAP Magazine (5.45x39mm)", 10, /obj/item/ammo_magazine/rifle/type71/heap , null, VENDOR_ITEM_REGULAR), list("ATTACHMENTS", 0, null, null, null), - list("Angled Grip", 10, /obj/item/attachable/angledgrip, null, VENDOR_ITEM_REGULAR), + list("Angled Grip", 10, /obj/item/attachable/angledgrip/union, null, VENDOR_ITEM_REGULAR), list("Extended Barrel", 10, /obj/item/attachable/extended_barrel, null, VENDOR_ITEM_REGULAR), - list("Laser Sight", 10, /obj/item/attachable/lasersight, null, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 10, /obj/item/attachable/reddot, null, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 10, /obj/item/attachable/reflex, null, VENDOR_ITEM_REGULAR), + list("Laser Sight", 10, /obj/item/attachable/lasersight/union, null, VENDOR_ITEM_REGULAR), + list("Red-Dot Sight", 10, /obj/item/attachable/reddot/union, null, VENDOR_ITEM_REGULAR), + list("Reflex Sight", 10, /obj/item/attachable/reflex/union, null, VENDOR_ITEM_REGULAR), list("Suppressor", 10, /obj/item/attachable/suppressor, null, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 10, /obj/item/attachable/verticalgrip, null, VENDOR_ITEM_REGULAR), + list("Vertical Grip", 10, /obj/item/attachable/verticalgrip/union, null, VENDOR_ITEM_REGULAR), list("EXPLOSIVES", 0, null, null, null), list("Plastic Explosive", 5, /obj/item/explosive/plastic, null, VENDOR_ITEM_REGULAR), @@ -1665,13 +1665,13 @@ list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), - list("Angled Grip", 0, /obj/item/attachable/angledgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Angled Grip", 0, /obj/item/attachable/angledgrip/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Extended Barrel", 0, /obj/item/attachable/extended_barrel, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Laser Sight", 0, /obj/item/attachable/lasersight, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 0, /obj/item/attachable/reddot, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 0, /obj/item/attachable/reflex, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Laser Sight", 0, /obj/item/attachable/lasersight/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Red-Dot Sight", 0, /obj/item/attachable/reddot/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Reflex Sight", 0, /obj/item/attachable/reflex/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Suppressor", 0, /obj/item/attachable/suppressor, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 0, /obj/item/attachable/verticalgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Vertical Grip", 0, /obj/item/attachable/verticalgrip/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("MASK (CHOOSE 1)", 0, null, null, null), list("Gas Mask", 0, /obj/item/clothing/mask/gas/pmc/upp, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), @@ -1716,13 +1716,13 @@ list("Type 71 HEAP Magazine (5.45x39mm)", 10, /obj/item/ammo_magazine/rifle/type71/heap , null, VENDOR_ITEM_REGULAR), list("ATTACHMENTS", 0, null, null, null), - list("Angled Grip", 10, /obj/item/attachable/angledgrip, null, VENDOR_ITEM_REGULAR), + list("Angled Grip", 10, /obj/item/attachable/angledgrip/union, null, VENDOR_ITEM_REGULAR), list("Extended Barrel", 10, /obj/item/attachable/extended_barrel, null, VENDOR_ITEM_REGULAR), - list("Laser Sight", 10, /obj/item/attachable/lasersight, null, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 10, /obj/item/attachable/reddot, null, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 10, /obj/item/attachable/reflex, null, VENDOR_ITEM_REGULAR), + list("Laser Sight", 10, /obj/item/attachable/lasersight/union, null, VENDOR_ITEM_REGULAR), + list("Red-Dot Sight", 10, /obj/item/attachable/reddot/union, null, VENDOR_ITEM_REGULAR), + list("Reflex Sight", 10, /obj/item/attachable/reflex/union, null, VENDOR_ITEM_REGULAR), list("Suppressor", 10, /obj/item/attachable/suppressor, null, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 10, /obj/item/attachable/verticalgrip, null, VENDOR_ITEM_REGULAR), + list("Vertical Grip", 10, /obj/item/attachable/verticalgrip/union, null, VENDOR_ITEM_REGULAR), list("EXPLOSIVES", 0, null, null, null), list("Plastic Explosive", 5, /obj/item/explosive/plastic, null, VENDOR_ITEM_REGULAR), @@ -1826,13 +1826,13 @@ list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), - list("Angled Grip", 0, /obj/item/attachable/angledgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Angled Grip", 0, /obj/item/attachable/angledgrip/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Extended Barrel", 0, /obj/item/attachable/extended_barrel, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Laser Sight", 0, /obj/item/attachable/lasersight, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 0, /obj/item/attachable/reddot, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 0, /obj/item/attachable/reflex, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Laser Sight", 0, /obj/item/attachable/lasersight/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Red-Dot Sight", 0, /obj/item/attachable/reddot/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Reflex Sight", 0, /obj/item/attachable/reflex/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Suppressor", 0, /obj/item/attachable/suppressor, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 0, /obj/item/attachable/verticalgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Vertical Grip", 0, /obj/item/attachable/verticalgrip/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("MASK (CHOOSE 1)", 0, null, null, null), list("Gas Mask", 0, /obj/item/clothing/mask/gas/pmc/upp, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), @@ -1877,13 +1877,13 @@ list("Type 71 HEAP Magazine (5.45x39mm)", 10, /obj/item/ammo_magazine/rifle/type71/heap , null, VENDOR_ITEM_REGULAR), list("ATTACHMENTS", 0, null, null, null), - list("Angled Grip", 10, /obj/item/attachable/angledgrip, null, VENDOR_ITEM_REGULAR), + list("Angled Grip", 10, /obj/item/attachable/angledgrip/union, null, VENDOR_ITEM_REGULAR), list("Extended Barrel", 10, /obj/item/attachable/extended_barrel, null, VENDOR_ITEM_REGULAR), - list("Laser Sight", 10, /obj/item/attachable/lasersight, null, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 10, /obj/item/attachable/reddot, null, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 10, /obj/item/attachable/reflex, null, VENDOR_ITEM_REGULAR), + list("Laser Sight", 10, /obj/item/attachable/lasersight/union, null, VENDOR_ITEM_REGULAR), + list("Red-Dot Sight", 10, /obj/item/attachable/reddot/union, null, VENDOR_ITEM_REGULAR), + list("Reflex Sight", 10, /obj/item/attachable/reflex/union, null, VENDOR_ITEM_REGULAR), list("Suppressor", 10, /obj/item/attachable/suppressor, null, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 10, /obj/item/attachable/verticalgrip, null, VENDOR_ITEM_REGULAR), + list("Vertical Grip", 10, /obj/item/attachable/verticalgrip/union, null, VENDOR_ITEM_REGULAR), list("EXPLOSIVES", 0, null, null, null), list("Plastic Explosive", 5, /obj/item/explosive/plastic, null, VENDOR_ITEM_REGULAR), @@ -1987,13 +1987,13 @@ list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), - list("Angled Grip", 0, /obj/item/attachable/angledgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Angled Grip", 0, /obj/item/attachable/angledgrip/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Extended Barrel", 0, /obj/item/attachable/extended_barrel, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Laser Sight", 0, /obj/item/attachable/lasersight, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 0, /obj/item/attachable/reddot, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 0, /obj/item/attachable/reflex, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Laser Sight", 0, /obj/item/attachable/lasersight/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Red-Dot Sight", 0, /obj/item/attachable/reddot/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Reflex Sight", 0, /obj/item/attachable/reflex/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Suppressor", 0, /obj/item/attachable/suppressor, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 0, /obj/item/attachable/verticalgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Vertical Grip", 0, /obj/item/attachable/verticalgrip/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("MASK (CHOOSE 1)", 0, null, null, null), list("Gas Mask", 0, /obj/item/clothing/mask/gas/pmc/upp, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), @@ -2038,13 +2038,13 @@ list("Type 71 HEAP Magazine (5.45x39mm)", 10, /obj/item/ammo_magazine/rifle/type71/heap , null, VENDOR_ITEM_REGULAR), list("ATTACHMENTS", 0, null, null, null), - list("Angled Grip", 10, /obj/item/attachable/angledgrip, null, VENDOR_ITEM_REGULAR), + list("Angled Grip", 10, /obj/item/attachable/angledgrip/union, null, VENDOR_ITEM_REGULAR), list("Extended Barrel", 10, /obj/item/attachable/extended_barrel, null, VENDOR_ITEM_REGULAR), - list("Laser Sight", 10, /obj/item/attachable/lasersight, null, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 10, /obj/item/attachable/reddot, null, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 10, /obj/item/attachable/reflex, null, VENDOR_ITEM_REGULAR), + list("Laser Sight", 10, /obj/item/attachable/lasersight/union, null, VENDOR_ITEM_REGULAR), + list("Red-Dot Sight", 10, /obj/item/attachable/reddot/union, null, VENDOR_ITEM_REGULAR), + list("Reflex Sight", 10, /obj/item/attachable/reflex/union, null, VENDOR_ITEM_REGULAR), list("Suppressor", 10, /obj/item/attachable/suppressor, null, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 10, /obj/item/attachable/verticalgrip, null, VENDOR_ITEM_REGULAR), + list("Vertical Grip", 10, /obj/item/attachable/verticalgrip/union, null, VENDOR_ITEM_REGULAR), list("EXPLOSIVES", 0, null, null, null), list("Plastic Explosive", 5, /obj/item/explosive/plastic, null, VENDOR_ITEM_REGULAR), @@ -2148,13 +2148,13 @@ list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), - list("Angled Grip", 0, /obj/item/attachable/angledgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Angled Grip", 0, /obj/item/attachable/angledgrip/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Extended Barrel", 0, /obj/item/attachable/extended_barrel, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Laser Sight", 0, /obj/item/attachable/lasersight, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 0, /obj/item/attachable/reddot, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 0, /obj/item/attachable/reflex, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Laser Sight", 0, /obj/item/attachable/lasersight/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Red-Dot Sight", 0, /obj/item/attachable/reddot/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Reflex Sight", 0, /obj/item/attachable/reflex/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Suppressor", 0, /obj/item/attachable/suppressor, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 0, /obj/item/attachable/verticalgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Vertical Grip", 0, /obj/item/attachable/verticalgrip/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("MASK (CHOOSE 1)", 0, null, null, null), list("Gas Mask", 0, /obj/item/clothing/mask/gas/pmc/upp, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), @@ -2199,13 +2199,13 @@ list("Type 71 HEAP Magazine (5.45x39mm)", 10, /obj/item/ammo_magazine/rifle/type71/heap , null, VENDOR_ITEM_REGULAR), list("ATTACHMENTS", 0, null, null, null), - list("Angled Grip", 10, /obj/item/attachable/angledgrip, null, VENDOR_ITEM_REGULAR), + list("Angled Grip", 10, /obj/item/attachable/angledgrip/union, null, VENDOR_ITEM_REGULAR), list("Extended Barrel", 10, /obj/item/attachable/extended_barrel, null, VENDOR_ITEM_REGULAR), - list("Laser Sight", 10, /obj/item/attachable/lasersight, null, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 10, /obj/item/attachable/reddot, null, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 10, /obj/item/attachable/reflex, null, VENDOR_ITEM_REGULAR), + list("Laser Sight", 10, /obj/item/attachable/lasersight/union, null, VENDOR_ITEM_REGULAR), + list("Red-Dot Sight", 10, /obj/item/attachable/reddot/union, null, VENDOR_ITEM_REGULAR), + list("Reflex Sight", 10, /obj/item/attachable/reflex/union, null, VENDOR_ITEM_REGULAR), list("Suppressor", 10, /obj/item/attachable/suppressor, null, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 10, /obj/item/attachable/verticalgrip, null, VENDOR_ITEM_REGULAR), + list("Vertical Grip", 10, /obj/item/attachable/verticalgrip/union, null, VENDOR_ITEM_REGULAR), list("EXPLOSIVES", 0, null, null, null), list("Plastic Explosive", 5, /obj/item/explosive/plastic, null, VENDOR_ITEM_REGULAR), @@ -2309,13 +2309,13 @@ list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), - list("Angled Grip", 0, /obj/item/attachable/angledgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Angled Grip", 0, /obj/item/attachable/angledgrip/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Extended Barrel", 0, /obj/item/attachable/extended_barrel, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Laser Sight", 0, /obj/item/attachable/lasersight, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 0, /obj/item/attachable/reddot, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 0, /obj/item/attachable/reflex, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Laser Sight", 0, /obj/item/attachable/lasersight/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Red-Dot Sight", 0, /obj/item/attachable/reddot/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Reflex Sight", 0, /obj/item/attachable/reflex/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Suppressor", 0, /obj/item/attachable/suppressor, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 0, /obj/item/attachable/verticalgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Vertical Grip", 0, /obj/item/attachable/verticalgrip/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("MASK (CHOOSE 1)", 0, null, null, null), list("Gas Mask", 0, /obj/item/clothing/mask/gas/pmc/upp, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), @@ -2360,13 +2360,13 @@ list("Type 71 HEAP Magazine (5.45x39mm)", 10, /obj/item/ammo_magazine/rifle/type71/heap , null, VENDOR_ITEM_REGULAR), list("ATTACHMENTS", 0, null, null, null), - list("Angled Grip", 10, /obj/item/attachable/angledgrip, null, VENDOR_ITEM_REGULAR), + list("Angled Grip", 10, /obj/item/attachable/angledgrip/union, null, VENDOR_ITEM_REGULAR), list("Extended Barrel", 10, /obj/item/attachable/extended_barrel, null, VENDOR_ITEM_REGULAR), - list("Laser Sight", 10, /obj/item/attachable/lasersight, null, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 10, /obj/item/attachable/reddot, null, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 10, /obj/item/attachable/reflex, null, VENDOR_ITEM_REGULAR), + list("Laser Sight", 10, /obj/item/attachable/lasersight/union, null, VENDOR_ITEM_REGULAR), + list("Red-Dot Sight", 10, /obj/item/attachable/reddot/union, null, VENDOR_ITEM_REGULAR), + list("Reflex Sight", 10, /obj/item/attachable/reflex/union, null, VENDOR_ITEM_REGULAR), list("Suppressor", 10, /obj/item/attachable/suppressor, null, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 10, /obj/item/attachable/verticalgrip, null, VENDOR_ITEM_REGULAR), + list("Vertical Grip", 10, /obj/item/attachable/verticalgrip/union, null, VENDOR_ITEM_REGULAR), list("EXPLOSIVES", 0, null, null, null), list("Plastic Explosive", 5, /obj/item/explosive/plastic, null, VENDOR_ITEM_REGULAR), @@ -2470,13 +2470,13 @@ list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), - list("Angled Grip", 0, /obj/item/attachable/angledgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Angled Grip", 0, /obj/item/attachable/angledgrip/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Extended Barrel", 0, /obj/item/attachable/extended_barrel, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Laser Sight", 0, /obj/item/attachable/lasersight, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 0, /obj/item/attachable/reddot, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 0, /obj/item/attachable/reflex, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Laser Sight", 0, /obj/item/attachable/lasersight/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Red-Dot Sight", 0, /obj/item/attachable/reddot/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Reflex Sight", 0, /obj/item/attachable/reflex/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Suppressor", 0, /obj/item/attachable/suppressor, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 0, /obj/item/attachable/verticalgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Vertical Grip", 0, /obj/item/attachable/verticalgrip/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("MASK (CHOOSE 1)", 0, null, null, null), list("Gas Mask", 0, /obj/item/clothing/mask/gas/pmc/upp, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), @@ -2521,13 +2521,13 @@ list("Type 71 HEAP Magazine (5.45x39mm)", 10, /obj/item/ammo_magazine/rifle/type71/heap , null, VENDOR_ITEM_REGULAR), list("ATTACHMENTS", 0, null, null, null), - list("Angled Grip", 10, /obj/item/attachable/angledgrip, null, VENDOR_ITEM_REGULAR), + list("Angled Grip", 10, /obj/item/attachable/angledgrip/union, null, VENDOR_ITEM_REGULAR), list("Extended Barrel", 10, /obj/item/attachable/extended_barrel, null, VENDOR_ITEM_REGULAR), - list("Laser Sight", 10, /obj/item/attachable/lasersight, null, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 10, /obj/item/attachable/reddot, null, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 10, /obj/item/attachable/reflex, null, VENDOR_ITEM_REGULAR), + list("Laser Sight", 10, /obj/item/attachable/lasersight/union, null, VENDOR_ITEM_REGULAR), + list("Red-Dot Sight", 10, /obj/item/attachable/reddot/union, null, VENDOR_ITEM_REGULAR), + list("Reflex Sight", 10, /obj/item/attachable/reflex/union, null, VENDOR_ITEM_REGULAR), list("Suppressor", 10, /obj/item/attachable/suppressor, null, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 10, /obj/item/attachable/verticalgrip, null, VENDOR_ITEM_REGULAR), + list("Vertical Grip", 10, /obj/item/attachable/verticalgrip/union, null, VENDOR_ITEM_REGULAR), list("EXPLOSIVES", 0, null, null, null), list("Plastic Explosive", 5, /obj/item/explosive/plastic, null, VENDOR_ITEM_REGULAR), @@ -2877,7 +2877,7 @@ list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), - list("Laser Sight", 0, /obj/item/attachable/lasersight, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Laser Sight", 0, /obj/item/attachable/lasersight/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("MASK (CHOOSE 1)", 0, null, null, null), list("Tactical Bandana", 0, /obj/item/clothing/mask/rebreather/scarf/tacticalmask/green, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR) @@ -2981,13 +2981,13 @@ list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), - list("Angled Grip", 0, /obj/item/attachable/angledgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Angled Grip", 0, /obj/item/attachable/angledgrip/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Extended Barrel", 0, /obj/item/attachable/extended_barrel, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Laser Sight", 0, /obj/item/attachable/lasersight, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 0, /obj/item/attachable/reddot, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 0, /obj/item/attachable/reflex, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Laser Sight", 0, /obj/item/attachable/lasersight/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Red-Dot Sight", 0, /obj/item/attachable/reddot/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Reflex Sight", 0, /obj/item/attachable/reflex/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Suppressor", 0, /obj/item/attachable/suppressor, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 0, /obj/item/attachable/verticalgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Vertical Grip", 0, /obj/item/attachable/verticalgrip/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("MASK (CHOOSE 1)", 0, null, null, null), list("Gas Mask", 0, /obj/item/clothing/mask/gas, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), @@ -3004,13 +3004,13 @@ list("Type 71 HEAP Magazine (5.45x39mm)", 10, /obj/item/ammo_magazine/rifle/type71/heap , null, VENDOR_ITEM_REGULAR), list("ATTACHMENTS", 0, null, null, null), - list("Angled Grip", 10, /obj/item/attachable/angledgrip, null, VENDOR_ITEM_REGULAR), + list("Angled Grip", 10, /obj/item/attachable/angledgrip/union, null, VENDOR_ITEM_REGULAR), list("Extended Barrel", 10, /obj/item/attachable/extended_barrel, null, VENDOR_ITEM_REGULAR), - list("Laser Sight", 10, /obj/item/attachable/lasersight, null, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 10, /obj/item/attachable/reddot, null, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 10, /obj/item/attachable/reflex, null, VENDOR_ITEM_REGULAR), + list("Laser Sight", 10, /obj/item/attachable/lasersight/union, null, VENDOR_ITEM_REGULAR), + list("Red-Dot Sight", 10, /obj/item/attachable/reddot/union, null, VENDOR_ITEM_REGULAR), + list("Reflex Sight", 10, /obj/item/attachable/reflex/union, null, VENDOR_ITEM_REGULAR), list("Suppressor", 10, /obj/item/attachable/suppressor, null, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 10, /obj/item/attachable/verticalgrip, null, VENDOR_ITEM_REGULAR), + list("Vertical Grip", 10, /obj/item/attachable/verticalgrip/union, null, VENDOR_ITEM_REGULAR), list("EXPLOSIVES", 0, null, null, null), list("Smoke Grenade", 5, /obj/item/explosive/grenade/smokebomb, null, VENDOR_ITEM_REGULAR), @@ -3114,13 +3114,13 @@ list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), - list("Angled Grip", 0, /obj/item/attachable/angledgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Angled Grip", 0, /obj/item/attachable/angledgrip/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Extended Barrel", 0, /obj/item/attachable/extended_barrel, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Laser Sight", 0, /obj/item/attachable/lasersight, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 0, /obj/item/attachable/reddot, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 0, /obj/item/attachable/reflex, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Laser Sight", 0, /obj/item/attachable/lasersight/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Red-Dot Sight", 0, /obj/item/attachable/reddot/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Reflex Sight", 0, /obj/item/attachable/reflex/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Suppressor", 0, /obj/item/attachable/suppressor, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 0, /obj/item/attachable/verticalgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Vertical Grip", 0, /obj/item/attachable/verticalgrip/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("MASK (CHOOSE 1)", 0, null, null, null), list("Gas Mask", 0, /obj/item/clothing/mask/gas, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), @@ -3174,13 +3174,13 @@ list("Type 71 HEAP Magazine (5.45x39mm)", 10, /obj/item/ammo_magazine/rifle/type71/heap , null, VENDOR_ITEM_REGULAR), list("ATTACHMENTS", 0, null, null, null), - list("Angled Grip", 10, /obj/item/attachable/angledgrip, null, VENDOR_ITEM_REGULAR), + list("Angled Grip", 10, /obj/item/attachable/angledgrip/union, null, VENDOR_ITEM_REGULAR), list("Extended Barrel", 10, /obj/item/attachable/extended_barrel, null, VENDOR_ITEM_REGULAR), - list("Laser Sight", 10, /obj/item/attachable/lasersight, null, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 10, /obj/item/attachable/reddot, null, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 10, /obj/item/attachable/reflex, null, VENDOR_ITEM_REGULAR), + list("Laser Sight", 10, /obj/item/attachable/lasersight/union, null, VENDOR_ITEM_REGULAR), + list("Red-Dot Sight", 10, /obj/item/attachable/reddot/union, null, VENDOR_ITEM_REGULAR), + list("Reflex Sight", 10, /obj/item/attachable/reflex/union, null, VENDOR_ITEM_REGULAR), list("Suppressor", 10, /obj/item/attachable/suppressor, null, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 10, /obj/item/attachable/verticalgrip, null, VENDOR_ITEM_REGULAR), + list("Vertical Grip", 10, /obj/item/attachable/verticalgrip/union, null, VENDOR_ITEM_REGULAR), list("EXPLOSIVES", 0, null, null, null), list("Smoke Grenade", 5, /obj/item/explosive/grenade/smokebomb, null, VENDOR_ITEM_REGULAR), @@ -3276,13 +3276,13 @@ list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), - list("Angled Grip", 0, /obj/item/attachable/angledgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Angled Grip", 0, /obj/item/attachable/angledgrip/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Extended Barrel", 0, /obj/item/attachable/extended_barrel, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Laser Sight", 0, /obj/item/attachable/lasersight, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 0, /obj/item/attachable/reddot, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 0, /obj/item/attachable/reflex, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Laser Sight", 0, /obj/item/attachable/lasersight/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Red-Dot Sight", 0, /obj/item/attachable/reddot/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Reflex Sight", 0, /obj/item/attachable/reflex/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Suppressor", 0, /obj/item/attachable/suppressor, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 0, /obj/item/attachable/verticalgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Vertical Grip", 0, /obj/item/attachable/verticalgrip/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("MASK (CHOOSE 1)", 0, null, null, null), list("Gas Mask", 0, /obj/item/clothing/mask/gas, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), @@ -3327,13 +3327,13 @@ list("Type 71 HEAP Magazine (5.45x39mm)", 10, /obj/item/ammo_magazine/rifle/type71/heap , null, VENDOR_ITEM_REGULAR), list("ATTACHMENTS", 0, null, null, null), - list("Angled Grip", 10, /obj/item/attachable/angledgrip, null, VENDOR_ITEM_REGULAR), + list("Angled Grip", 10, /obj/item/attachable/angledgrip/union, null, VENDOR_ITEM_REGULAR), list("Extended Barrel", 10, /obj/item/attachable/extended_barrel, null, VENDOR_ITEM_REGULAR), - list("Laser Sight", 10, /obj/item/attachable/lasersight, null, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 10, /obj/item/attachable/reddot, null, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 10, /obj/item/attachable/reflex, null, VENDOR_ITEM_REGULAR), + list("Laser Sight", 10, /obj/item/attachable/lasersight/union, null, VENDOR_ITEM_REGULAR), + list("Red-Dot Sight", 10, /obj/item/attachable/reddot/union, null, VENDOR_ITEM_REGULAR), + list("Reflex Sight", 10, /obj/item/attachable/reflex/union, null, VENDOR_ITEM_REGULAR), list("Suppressor", 10, /obj/item/attachable/suppressor, null, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 10, /obj/item/attachable/verticalgrip, null, VENDOR_ITEM_REGULAR), + list("Vertical Grip", 10, /obj/item/attachable/verticalgrip/union, null, VENDOR_ITEM_REGULAR), list("EXPLOSIVES", 0, null, null, null), list("Plastic Explosive", 5, /obj/item/explosive/plastic, null, VENDOR_ITEM_REGULAR), @@ -3530,19 +3530,19 @@ list("Heat Absorbent Coif", 0, /obj/item/clothing/mask/rebreather/scarf, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), list("ATTACHMENTS", 0, null, null, null), - list("Angled Grip", 10, /obj/item/attachable/angledgrip, null, VENDOR_ITEM_REGULAR), + list("Angled Grip", 10, /obj/item/attachable/angledgrip/union, null, VENDOR_ITEM_REGULAR), list("Extended Barrel", 10, /obj/item/attachable/extended_barrel, null, VENDOR_ITEM_REGULAR), list("Gyroscopic Stabilizer", 10, /obj/item/attachable/gyro, null, VENDOR_ITEM_REGULAR), - list("Laser Sight", 10, /obj/item/attachable/lasersight, null, VENDOR_ITEM_REGULAR), + list("Laser Sight", 10, /obj/item/attachable/lasersight/union, null, VENDOR_ITEM_REGULAR), list("Masterkey Shotgun", 10, /obj/item/attachable/attached_gun/shotgun, null, VENDOR_ITEM_REGULAR), list("M37 Wooden Stock", 10, /obj/item/attachable/stock/shotgun, null, VENDOR_ITEM_REGULAR), list("M39 Stock", 10, /obj/item/attachable/stock/smg, null, VENDOR_ITEM_REGULAR), list("M41A Solid Stock", 10, /obj/item/attachable/stock/rifle, null, VENDOR_ITEM_REGULAR), list("Recoil Compensator", 10, /obj/item/attachable/compensator, null, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 10, /obj/item/attachable/reddot, null, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 10, /obj/item/attachable/reflex, null, VENDOR_ITEM_REGULAR), + list("Red-Dot Sight", 10, /obj/item/attachable/reddot/union, null, VENDOR_ITEM_REGULAR), + list("Reflex Sight", 10, /obj/item/attachable/reflex/union, null, VENDOR_ITEM_REGULAR), list("Suppressor", 10, /obj/item/attachable/suppressor, null, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 10, /obj/item/attachable/verticalgrip, null, VENDOR_ITEM_REGULAR), + list("Vertical Grip", 10, /obj/item/attachable/verticalgrip/union, null, VENDOR_ITEM_REGULAR), list("UTILITIES", 0, null, null, null), list("Fire Extinguisher (Portable)", 5, /obj/item/tool/extinguisher/mini, null, VENDOR_ITEM_REGULAR), From 1013d96ccd85c2644b23473e06fdbd1b38c75a72 Mon Sep 17 00:00:00 2001 From: KoishiVibe Date: Sun, 2 Jun 2024 11:16:06 -0500 Subject: [PATCH 06/15] hopefully final change --- code/modules/projectiles/gun_attachables.dm | 46 ++++++++++----------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/code/modules/projectiles/gun_attachables.dm b/code/modules/projectiles/gun_attachables.dm index cfc37309c8..4085851e3e 100644 --- a/code/modules/projectiles/gun_attachables.dm +++ b/code/modules/projectiles/gun_attachables.dm @@ -452,7 +452,7 @@ Defined in conflicts.dm of the #defines folder. /obj/item/attachable/f90_dmr_barrel name = "f90 barrel" - desc = "This isn't supposed to be seperated from the gun, how'd this happen?" + desc = "This isn't supposed to be separated from the gun, how'd this happen?" icon_state = "aug_dmr_barrel_a" attach_icon = "aug_dmr_barrel_a" slot = "muzzle" @@ -463,7 +463,7 @@ Defined in conflicts.dm of the #defines folder. /obj/item/attachable/f90_shotgun_barrel name = "f90 barrel" - desc = "This isn't supposed to be seperated from the gun, how'd this happen?" + desc = "This isn't supposed to be separated from the gun, how'd this happen?" icon_state = "aug_mkey_barrel_a" attach_icon = "aug_mkey_barrel_a" slot = "muzzle" @@ -474,7 +474,7 @@ Defined in conflicts.dm of the #defines folder. /obj/item/attachable/l56a2_smartgun name = "l56a2 barrel" - desc = "This isn't supposed to be seperated from the gun, how'd this happen?" + desc = "This isn't supposed to be separated from the gun, how'd this happen?" icon_state = "magsg_barrel_a" attach_icon = "magsg_barrel_a" slot = "muzzle" @@ -627,7 +627,7 @@ Defined in conflicts.dm of the #defines folder. /obj/item/attachable/reddot/union name = "EKP-9-M Red Dot Sight" - desc = "Cutting edge UPP sight with automated reticle correction for a fixed zero point. Increases accuracy significantly. \nStatistically identical to the S5 Dot Sight." + desc = "Cutting edge UPP sight with automated reticle correction for a fixed zero point. Increases accuracy significantly." /obj/item/attachable/reflex name = "S6 reflex sight" @@ -647,7 +647,7 @@ Defined in conflicts.dm of the #defines folder. /obj/item/attachable/reflex/union name = "PK-12 Reflex Sight" - desc = "Reflector type gunsight compatible with most standard issue UPP firearms. Durable but the power supply is notoriously unreliable. Reduces scatter significantly and boosts accuracy slightly. \nStatistically identical to the S6 Reflex Sight." + desc = "Reflector type gunsight compatible with most standard issue UPP firearms. Durable but the power supply is notoriously unreliable. Reduces scatter significantly and boosts accuracy slightly." /obj/item/attachable/flashlight name = "rail flashlight" @@ -999,7 +999,7 @@ Defined in conflicts.dm of the #defines folder. /obj/item/attachable/scope/union name = "PO-M 4x Optic" - desc = "Old fashioned 4x scope. Sturdy, but a little unergonomic. UPP tradition. Reduces RoF and increases wield time. Major accuracy bonus when scoped. \nStatistically identical to the S8 Scope." + desc = "Old fashioned 4x scope. Sturdy, but a little unergonomic. UPP tradition. Reduces RoF and increases wield time. Major accuracy bonus when scoped." /obj/item/attachable/scope/variable_zoom name = "S10 variable zoom telescopic scope" @@ -1108,7 +1108,7 @@ Defined in conflicts.dm of the #defines folder. /obj/item/attachable/scope/mini/union name = "1P93 2x Optic" - desc = "Mild update of a 2159 UPP design. Holds zero in all conditions, antiglint grid prevents glare, but the reticle is unfortunately cluttered and busy. Reduces RoF and increases wield time, boosts accuracy while scoped. \nStatistically identical to the S4 Scope." + desc = "Mild update of a 2159 UPP design. Holds zero in all conditions, antiglint grid prevents glare, but the reticle is unfortunately cluttered and busy. Reduces RoF and increases wield time, boosts accuracy while scoped." /obj/item/attachable/scope/mini/flaregun wield_delay_mod = 0 @@ -1135,7 +1135,7 @@ Defined in conflicts.dm of the #defines folder. /obj/item/attachable/scope/mini/nsg23 name = "W-Y S4 2x advanced telescopic mini-scope" - desc = "An ARMAT S4 telescoping eye piece, custom-tuned by W-Y scientists to be as ergonomic as possible." + desc = "An ARMAT S4 telescoping eye piece, revised by W-Y scientists to be much more ergonomic." icon_state = "miniscope_nsg23" attach_icon = "miniscope_nsg23_a" zoom_offset = 7 @@ -1800,7 +1800,7 @@ Defined in conflicts.dm of the #defines folder. /obj/item/attachable/stock/xm88 name = "\improper XM88 padded stock" - desc = "A specially made compound polymer stock reinforced with aluminum rods and thick rubber padding to shield the user from recoil. Fitted specifically for the XM88 Heavy Rifle." + desc = "A polymer framed alloy reinforced stock for the XM88 antimateriel rifle. Helps manage recoil." icon_state = "boomslang-stock" wield_delay_mod = WIELD_DELAY_NORMAL hud_offset_mod = 6 @@ -1956,8 +1956,8 @@ Defined in conflicts.dm of the #defines folder. aim_speed_mod = CONFIG_GET(number/slowdown_med) /obj/item/attachable/stock/rifle/collapsible - name = "\improper M41A folding stock" - desc = "The standard back end of any gun starting with \"M41\". Compatible with the M41A series, this stock reduces recoil and improves accuracy, but at a reduction to handling and agility. Also enhances the thwacking of things with the stock-end of the rifle." + name = "\improper M41A extendable stock" + desc = "The M41A's standard polymer extendable stock. When extended, it improves scatter, accuracy, and recoil, but slightly hinders agility." slot = "stock" melee_mod = 5 size_mod = 1 @@ -2199,7 +2199,7 @@ Defined in conflicts.dm of the #defines folder. /obj/item/attachable/m4ra_barrel name = "M4RA barrel" - desc = "This isn't supposed to be seperated from the gun, how'd this happen?" + desc = "This isn't supposed to be separated from the gun, how'd this happen?" icon_state = "m4ra_barrel" attach_icon = "m4ra_barrel" slot = "special" @@ -2225,7 +2225,7 @@ Defined in conflicts.dm of the #defines folder. /obj/item/attachable/m4ra_barrel_custom name = "custom M4RA barrel" - desc = "This isn't supposed to be seperated from the gun, how'd this happen?" + desc = "This isn't supposed to be separated from the gun, how'd this happen?" icon_state = "m4ra_custom_barrel" attach_icon = "m4ra_custom_barrel" slot = "special" @@ -2256,7 +2256,7 @@ Defined in conflicts.dm of the #defines folder. /obj/item/attachable/upp_rpg_breech name = "HJRA-12 Breech" - desc = "This isn't supposed to be seperated from the gun, how'd this happen?" + desc = "This isn't supposed to be separated from the gun, how'd this happen?" icon = 'icons/obj/items/weapons/guns/attachments/stock.dmi' icon_state = "hjra_breech" attach_icon = "hjra_breech" @@ -2268,7 +2268,7 @@ Defined in conflicts.dm of the #defines folder. /obj/item/attachable/pkpbarrel name = "QYJ-72 Barrel" - desc = "This isn't supposed to be seperated from the gun, how'd this happen?" + desc = "This isn't supposed to be separated from the gun, how'd this happen?" icon = 'icons/obj/items/weapons/guns/attachments/barrel.dmi' icon_state = "uppmg_barrel" attach_icon = "uppmg_barrel" @@ -2280,7 +2280,7 @@ Defined in conflicts.dm of the #defines folder. /obj/item/attachable/stock/pkpstock name = "QYJ-72 Stock" - desc = "This isn't supposed to be seperated from the gun, how'd this happen?" + desc = "This isn't supposed to be separated from the gun, how'd this happen?" icon = 'icons/obj/items/weapons/guns/attachments/stock.dmi' icon_state = "uppmg_stock" attach_icon = "uppmg_stock" @@ -2292,7 +2292,7 @@ Defined in conflicts.dm of the #defines folder. /obj/item/attachable/type88_barrel name = "Type-88 Barrel" - desc = "This isn't supposed to be seperated from the gun, how'd this happen?" + desc = "This isn't supposed to be separated from the gun, how'd this happen?" icon = 'icons/obj/items/weapons/guns/attachments/barrel.dmi' icon_state = "type88_barrel" attach_icon = "type88_barrel" @@ -2304,7 +2304,7 @@ Defined in conflicts.dm of the #defines folder. /obj/item/attachable/type73suppressor name = "Type 73 Integrated Suppressor" - desc = "This isn't supposed to be seperated from the gun, how'd this happen?" + desc = "This isn't supposed to be separated from the gun, how'd this happen?" icon = 'icons/obj/items/weapons/guns/attachments/barrel.dmi' icon_state = "type73_suppressor" attach_icon = "type73_suppressor" @@ -2316,7 +2316,7 @@ Defined in conflicts.dm of the #defines folder. /obj/item/attachable/stock/type71 name = "Type 71 Stock" - desc = "This isn't supposed to be seperated from the gun, how'd this happen?" + desc = "This isn't supposed to be separated from the gun, how'd this happen?" icon = 'icons/obj/items/weapons/guns/attachments/stock.dmi' icon_state = "type71_stock" attach_icon = "type71_stock" @@ -2827,8 +2827,8 @@ Defined in conflicts.dm of the #defines folder. //For the Mk1 /obj/item/attachable/attached_gun/grenade/mk1 - name = "\improper MK1 underslung grenade launcher" - desc = "An older version of the classic underslung grenade launcher. Can store five grenades, and fire them farther, but fires them slower." + name = "\improper PN 30mm underslung grenade launcher" + desc = "Standard pump action underslung grenade launcher. Fits the M41A, four round tube, chambers one." icon_state = "grenade-mk1" attach_icon = "grenade-mk1_a" current_rounds = 0 @@ -3013,7 +3013,7 @@ Defined in conflicts.dm of the #defines folder. name = "\improper U7 underbarrel shotgun" icon_state = "masterkey" attach_icon = "masterkey_a" - desc = "An ARMAT U7 tactical shotgun. Attaches to the underbarrel of most weapons. Only capable of loading up to five buckshot shells. Specialized for breaching into buildings." + desc = "An ARMAT U7 tactical shotgun. Attaches to the underbarrel of most weapons. Only capable of loading up to five buckshot shells. Specialized for breaching into buildings, shorter barrel reduces actual damage." w_class = SIZE_MEDIUM max_rounds = 5 current_rounds = 5 @@ -3060,7 +3060,7 @@ Defined in conflicts.dm of the #defines folder. name = "HME-12 underbarrel extinguisher" icon_state = "extinguisher" attach_icon = "extinguisher_a" - desc = "A Taiho-Technologies HME-12 underbarrel extinguisher. Attaches to the underbarrel of most weapons. Point at flame before applying pressure." + desc = "A Taiho-Technologies HME-12 underbarrel extinguisher, a miniaturization of a complex used by firefighters. Attaches to the underbarrel of most weapons, point at fire to remove fire." w_class = SIZE_MEDIUM slot = "under" flags_attach_features = ATTACH_REMOVABLE|ATTACH_ACTIVATION|ATTACH_WEAPON|ATTACH_MELEE From 0251df067f5f61d1d3aaadc8ce7af341a7148508 Mon Sep 17 00:00:00 2001 From: Steeclad Cat Date: Mon, 3 Jun 2024 15:59:51 -0500 Subject: [PATCH 07/15] bugfix --- code/modules/gear_presets/upp.dm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/code/modules/gear_presets/upp.dm b/code/modules/gear_presets/upp.dm index b4c93a01eb..46396c020f 100644 --- a/code/modules/gear_presets/upp.dm +++ b/code/modules/gear_presets/upp.dm @@ -177,7 +177,7 @@ list("Extended Barrel", 0, /obj/item/attachable/extended_barrel, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Laser Sight", 0, /obj/item/attachable/lasersight/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Red-Dot Sight", 0, /obj/item/attachable/reddot/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 0, /obj/item/attachable/reflex/union/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Reflex Sight", 0, /obj/item/attachable/reflex/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Suppressor", 0, /obj/item/attachable/suppressor, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Vertical Grip", 0, /obj/item/attachable/verticalgrip/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), @@ -200,7 +200,7 @@ list("Extended Barrel", 10, /obj/item/attachable/extended_barrel, null, VENDOR_ITEM_REGULAR), list("Laser Sight", 10, /obj/item/attachable/lasersight/union, null, VENDOR_ITEM_REGULAR), list("Red-Dot Sight", 10, /obj/item/attachable/reddot/union, null, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 10, /obj/item/attachable/reflex/union/union, null, VENDOR_ITEM_REGULAR), + list("Reflex Sight", 10, /obj/item/attachable/reflex/union, null, VENDOR_ITEM_REGULAR), list("Suppressor", 10, /obj/item/attachable/suppressor, null, VENDOR_ITEM_REGULAR), list("Vertical Grip", 10, /obj/item/attachable/verticalgrip/union, null, VENDOR_ITEM_REGULAR), @@ -310,7 +310,7 @@ list("Extended Barrel", 0, /obj/item/attachable/extended_barrel, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Laser Sight", 0, /obj/item/attachable/lasersight/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Red-Dot Sight", 0, /obj/item/attachable/reddot/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 0, /obj/item/attachable/reflex/union/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Reflex Sight", 0, /obj/item/attachable/reflex/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Suppressor", 0, /obj/item/attachable/suppressor, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Vertical Grip", 0, /obj/item/attachable/verticalgrip/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), @@ -369,7 +369,7 @@ list("Angled Grip", 10, /obj/item/attachable/angledgrip/union, null, VENDOR_ITEM_REGULAR), list("Extended Barrel", 10, /obj/item/attachable/extended_barrel, null, VENDOR_ITEM_REGULAR), list("Laser Sight", 10, /obj/item/attachable/lasersight/union, null, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 10, /obj/item/attachable/reddot/union/union, null, VENDOR_ITEM_REGULAR), + list("Red-Dot Sight", 10, /obj/item/attachable/reddot/union, null, VENDOR_ITEM_REGULAR), list("Reflex Sight", 10, /obj/item/attachable/reflex/union, null, VENDOR_ITEM_REGULAR), list("Suppressor", 10, /obj/item/attachable/suppressor, null, VENDOR_ITEM_REGULAR), list("Vertical Grip", 10, /obj/item/attachable/verticalgrip/union, null, VENDOR_ITEM_REGULAR), @@ -505,7 +505,7 @@ list("Red-Dot Sight", 10, /obj/item/attachable/reddot/union, null, VENDOR_ITEM_REGULAR), list("Reflex Sight", 10, /obj/item/attachable/reflex/union, null, VENDOR_ITEM_REGULAR), list("Suppressor", 10, /obj/item/attachable/suppressor, null, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 10, /obj/item/attachable/verticalgrip/union/union, null, VENDOR_ITEM_REGULAR), + list("Vertical Grip", 10, /obj/item/attachable/verticalgrip/union, null, VENDOR_ITEM_REGULAR), list("EXPLOSIVES", 0, null, null, null), list("Plastic Explosive", 5, /obj/item/explosive/plastic, null, VENDOR_ITEM_REGULAR), @@ -628,7 +628,7 @@ list("ATTACHMENTS (NONE FIT QYJ-72)", 0, null, null, null), list("Angled Grip", 10, /obj/item/attachable/angledgrip/union, null, VENDOR_ITEM_REGULAR), list("Extended Barrel", 10, /obj/item/attachable/extended_barrel, null, VENDOR_ITEM_REGULAR), - list("Laser Sight", 10, /obj/item/attachable/lasersight/union/union, null, VENDOR_ITEM_REGULAR), + list("Laser Sight", 10, /obj/item/attachable/lasersight/union, null, VENDOR_ITEM_REGULAR), list("Red-Dot Sight", 10, /obj/item/attachable/reddot/union, null, VENDOR_ITEM_REGULAR), list("Reflex Sight", 10, /obj/item/attachable/reflex/union, null, VENDOR_ITEM_REGULAR), list("Suppressor", 10, /obj/item/attachable/suppressor, null, VENDOR_ITEM_REGULAR), @@ -729,7 +729,7 @@ list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), - list("Angled Grip", 0, /obj/item/attachable/angledgrip/union/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Angled Grip", 0, /obj/item/attachable/angledgrip/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Extended Barrel", 0, /obj/item/attachable/extended_barrel, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Laser Sight", 0, /obj/item/attachable/lasersight/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Red-Dot Sight", 0, /obj/item/attachable/reddot/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), From 792a14d025ce9ae241b624551142f78dfcc95dc8 Mon Sep 17 00:00:00 2001 From: KoishiVibe <111302138+KoishiVibe@users.noreply.github.com> Date: Fri, 7 Jun 2024 16:07:43 -0500 Subject: [PATCH 08/15] unfucks that specifically sprites soon? maybe. --- code/modules/projectiles/gun_attachables.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/projectiles/gun_attachables.dm b/code/modules/projectiles/gun_attachables.dm index 4085851e3e..98aaf6131c 100644 --- a/code/modules/projectiles/gun_attachables.dm +++ b/code/modules/projectiles/gun_attachables.dm @@ -812,7 +812,7 @@ Defined in conflicts.dm of the #defines folder. return /obj/item/attachable/flashlight/grip/union - name = "RK-9 Flashlight Grip" + name = "RK-5A Flashlight Grip" desc = "Folding grip with an integrated flashlight. Reduces recoil and scatter marginally, boosts accuracy slightly. \nStatistically udentical to the underbarrel flashlight grip." /obj/item/attachable/flashlight/laser_light_combo //Unique attachment for the VP78 based on the fact it has a Laser-Light Module in AVP2010 @@ -3216,7 +3216,7 @@ Defined in conflicts.dm of the #defines folder. pixel_shift_x = 20 /obj/item/attachable/angledgrip/union - name = "RK-9 Vertical Grip" + name = "RK-9 Angled Grip" desc = "Ergonomic grip decreases time for shouldering the weapon. Increases weapon size, accelerates wield speed." /obj/item/attachable/gyro From 70c04a8dcaad220b907e6617a15657aecf18d051 Mon Sep 17 00:00:00 2001 From: Steeclad Cat Date: Thu, 13 Jun 2024 15:27:51 -0500 Subject: [PATCH 09/15] I don't know if this worked or not. --- .../items/weapons/guns/attachments/under.dmi | Bin 14556 -> 14982 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/obj/items/weapons/guns/attachments/under.dmi b/icons/obj/items/weapons/guns/attachments/under.dmi index a3691b8cc5279c7983df34f3720dfac2382202f0..b11e613d3fb5ff90049d1fa076823a08c6619183 100644 GIT binary patch literal 14982 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 Wq;N>{75sfEpdhOxQwlW>{=Wd4mgk%R literal 14556 zcmbWeby!qyyZ625hC#YPK#-P}8d6ZYkp@MiyHh|wkPws*6p)ez=>{q3?gq)BVTb{S zXYsrDe)hBXyZ^Y4_c$D9T*q?F73X!v=X=fv4K+mqTxwhZ00^Ed$!h@siuC;p8xy=T z7@u1R0H`XyItK3YR&K9cZJgb0oE!nbJ3Tj9)oqRs5pnO8MV0n({U^HaXXJYH>2I{OinKJ*gg!ChSJ|R-FE!hHwn&behE5b~QlL_s7wUT! z$0fWE3kOg*eg=pvMKvdgTQU7S)83Ei)Rfa+mp0AC`QDi``TLzmA$tHsaoYP^OuA;=pbE_7O>u)n?w=5L1t`tJ92+l`_^Vfr+(13T$Y8@wYO|39zj|OeO zmf3;Ug^k(j>@>W;_zG@0D6wirxi~yQF~@H31bQx)&<|;(KC-iSg9L2 zlh`YAm6d*kquC=FJb_WolEvu!0-xu2DZyUNXa_pUPu$(4ui)#iL%zJF36uJe zsnDjnR{4A-B;xMc_*q!M;-Xvk$+iENG7%l|c^M#;YfBdpaT$xQ_D^oQT99 z@1(_RWyS79Q_U}Ho?l@F^`Cfj|C;1SV)%+q_cA_6B+`Z0s;Q*BWIAW!mzA(dR|&z43;_vePnk%>p`z<_ep zGt);|i#39anA0kDI;7fs@)2pW-l;N}zZ{^g&~CSM3(S=M`T_5y;hxZ*`hfwTj1GKW zsSLNF^z1PhoG}c-+Mswq2ENxXY}vp0v8g*1X!;@WOW*A2+_0B$S>;taFF!w>ZPZS! zIIfs6g={3hD1mgF&r1DC`h!~z-Rp7~$Bn4g`-BM#W$a^BI?PN?FifrT^j1QRi3SGo`a&UDJ&Y-v*zm}xP4V8`LE^BD}c3g#_gw3Qyyun`Xughdf@Nzn15XAoYRQP7#jlib0RmFv{Q_^3j z!`Z*DYntl}CP%BpjU7>h1qHz)6>;VV`1tq?B+Ej|F;^GqL%6xQf#94R7NBh_BdGKz zBE3NU5gH(MU1e}GXWggPYq&hk@{u7(ug~}TeBVz!a-+^2@_Mns!}DE2`WfXxBQ%{z zhDoo}s3yxxB;znSA>ns-3{3?1KrW*i{Qe|vIW4UR_g6lDCLOIcIzZTrkIfu@S9{-O z-|gpAcK-?oKY~{j=BfmHcimR83_=YG5w6&E`LGl||66#dWtn1Npw#$V!Q!dczrC#c zw&<>Ri+q;9JDiS zZkNOju|-i)Q923=3JKMo^AQaCX1fpxZBN{}GnGKYwC}xMid~iM5n zanTJ7@pe}(tJCh)AIdVoq3_`0WvUL#tHN1xRFz*Xypl~gH4o#Z`&(zz5Vbd3Sz!ay zdp-O;CYplRw}~rm2+g>$T4ST1Tc+Z&qZD}JP98}6*eFD+7MQQSvF{)P&i9tGZ5!rT ze3i?8{d&MXU7B^5DYGr&oY|qSkYPR^=IRzn96f z^8~=@zZ#z^@kU$}%v5=B9uN^+c)z62z^wGN%X(3mlqp^!TEXjI?zkv6`9mSvpf(8> z|BH-^LjQLhv#xTy9STzT_z4hPS`JuN1LAg9vvZYxap3B-nohMw8{;@gve4l}H zv`lP!|3tscB)UBm>(xdSnbM>!3gG7L395>JO09n1B%P&`Th*^z1^JXRvqf>Ol8=~7^xk6Or<)NK7+bp1QC&bBjrZf>pt zA4*6OlKm`Z%_u}RBD0b_lTy*L(e|o(S_-{BDN}=KyRSX66~6(w*Hl>kTsG{R05}Yw zElVz<)4)I96||4~`udT#f_wTMYa-64&@1uH9k_2?V2^1KS!sZm0gtQk$*$uPnK?~h zZf-8mdxrd-xDfK+=j7%2P?@&$#wkn{GY#ei`CV5@v_v_)>pJ z9k0SzT`7Pt^K&DrC}?+-Lbjhfn&>5cu?>6X6VsHHl`#xS{IsfpB3`}K=30HUVCB^w z(1sW6-m`4AW2>tRlh4sOwG`~y&(Vbhkf{xgp#8nYj0B$su9$@HfXR}lQLZR1*QQjP zWaGt8axQ~5!2A{gcXW!bEn^$YOnZnUUuc2?PFT%Ik8ZG)=JqtP`EA2or@DxV!-Jcm zw>67;>J8;fE#H;oCMO-9m^AllDke9&!a4Y~0^h3+7=nlCv=yt~sLQJe1CPA?yoAI0 z6niI1*~C1n-N{IlgG5f0H^ypJ> z*J8ZmAf7`s_YEZdhp+lnCReGDHQog=+yz|<{hvJLBh%-NX=Q|R*vIL^Cd7sxc{n`$ zaF~X$se^|aTE8!meuKz%PHoumg+W|ve~@J1Fhwb#C}C@I;Y!O!T519hWJ#k@;~_r` zNQ1*5T|WSpFm`ebMke_RcHqC?dbKcVE+*izCSS{wwDQ`SQ*Sf< z_ZMnvo6FahR0nF$;DWwQ%VUkYlqMRDbBm^Sr`f$xlC>6aSI=;)As z{rdH?N3Ym`X^yqJ%CKbdS7>PH)p2}0BxUdo5NucyZdhWPk(gMiQHrRjsIZO@47yr* ze+oavGwl{(l`W0LuW?$AC6c<77P20qjUc*<=52}GpRZ+ZfRoojLx_+r(j$6NoN%l& z0t||fG`z58k&m44Nn4>hi2uc+7i$^AxHViAl zm|snmH-(uW=eAyum|=cwfuh84$G0gV^Z|!Bqz3K;C)odm+zwk!$)b7>?)@Wq?769) zePHir;In6#G*bSeRfgQ;JjQ>*uw~{E+-QNLHUSQE?&mAzpS%TK_K4Fs87`SNd z2UOJ66)h~70CP*rAJ=xg2~q)wm6?iHkx@|zIp4c1Wps7Pzyl8elD=os($c|;ZlLeE z@h;T6&K!WFjnsY1AYWs|rf?O~)%}wyIllvacB)E(R}a<@1?9P zDn4fD_}1&!ulWFWPENU(FR7M|AccW?LlSxPv{>u!ar1{q^Hi+?=ktNb>5^`^ScoBdw>S!us%Y8f59@!qL-qeS*wu#0;=JNjo4&M&4jI+|Jo&8Kfs4*ZYg z8ka-Qj)~C9J>RL+A~_B25AS*Hf=cmR#c=7hoe`9a|AByDHek@$Hcdlo#QEK@&Y8)m z*;i<)_~onVTZ{vAGbJT#aDxFmin@TZHky}DPiKm^kddJoWb+zE7zDwcwh&rw_#SB}?v*8hBBzNiiI-yBF4p@G4OkIkX@+hnjK#AEF|Y(!7F z+m_lJL28Q%0|+T8dbME;mB1S%&$od?O$zuxc=tI5kX}~WgGDoSWq%v4`n6fs{hfe- zz)SbTrENNTM+$#HBj}2s+G!!!@xl?1o~;*vaG-0mLEFh$V&5a(ANQ5rZ6A5Rz3_w3 zEetw-f78ic%=(k3%YIfoTDjdDPT?&LMQI&ZDN)t{7qH$J0WNtph@(t9*>wd zL&k?&T6~>pr8t)`7QdVPzCkMZ-kFHu7Ei-;jj^Q=+u0%xavHf>i|HvTk;>K81_{Y* z&#}*Jr>h*H-0!n00*J|$@bpV@FU-`65uaueI!q01C>IMmS`%h13#+GL_)w#J)Alz2 zgl}93r6!W+Jl^xv-k<}7LD;flHtZeXQS}yjg-gi5T?xZAE3`oeA{a@vKzj}+Vu(#P z^~H%GVyJ=P(!@LioUvt@zJaz(L`d`DgLa~(Ps>6nr?I|W$+8sodzS9&!$})H0qdcr zr%#>`6BC^$a@_zcX-+LN($c^(szeY{0!#=V>iP(pIRKW|4+G7)q$H16-NnA;u!Z|- znMLv(b(a|FKCQGC&~_65GP^8M0CX&j<8{mT3>Oy5M?Ft3Z;cL58Qc#-osTHwvk`=4^PS^2%l;Z*W00ffN)(sKjl)Q?GLJRxWle#!?IRa`7}<4J`or4$`&m)?Yg@|8(^YO~``i zG#rCb=^~kV>iW0UAO!? z78aJHQ+F}C3EOJ$5>x0fxmQ#)Xo=86rQX2KGwu0(8dCmC`wz#+>x~a1G$M|#CH>C- z=BK5leM(GZwgFJvjuY9e@TBW^`(x~Is@U|lFAW1qS!cc*WKGjgKd@IX9aWU!f{HXy;4o|*;MV2RHv?qaIg zOb07YQ8}YJd`xQEE*nM+2NNfG?`y9*;v|;7|NSgpo8fOi;4EbiyB|p;3yB)d3SN zc%VE8V)LT>;Ly2Y$6vJ&6b+dF01SZ@Zu0`O3SrU1w3|b!k!F}=P!{MdF!BVq0eZaQd`+$C~eMv z`{(6gZt2y(!wPvPeCtSq531I}T8`Q`iJ)3mgZ|-G!>QfF^JndjRT-GUL9@sZaD;a7 z>ZK&F-PiTRTf7s1baIE=Mm|P~gK%22Ap_IrWRV{=2rOXRmA&h{u~O>0=<(uH^g_qg zPA>{E+NeR##`(De^!m>*y(;T`+jFG9NiVNgolAjcTCT;U0EC2O+@f}Je8Z57Jij{U0rgb$G7(#+l%&(HTbKb+J7Gv2 zN#Ma0!nQTm>h*%n@%~H&&3-;ZTJe{^s;TD@uQ34>ltuA?r8wx)?}NB#1v9pSX*Sl4 z=gAjX6l4J$i1X-Xsnpa|Fh#(pT01-L>wAGu#g7hhuaG_KMx&`gGwc>3jgNTr&L#^( zdEjHo8j7{G!oG^V5~O=JD{OYdM>8|5L)t>+;7XR&`P z4%O`!d2`{e{a1+Wf&zsc<9}9Kw5S>b(NrUnpl@jjGrTXuTzw&7b_E|?j8tT?kI4v8 z*t>VQ+yz)%YF_clD5qS-@^$*Apfm`J4ri4C2qO8N3ZCTA+- z3as+J>twNb%sdz)#+A105l#=om4A}-JQBhVd_c>Ri!!3GzKJZ$3I)OEeF^B<`44ft zr2fA(qC^b{cans;Rcitom!|UXZ;bmxa9y>A_t|%H`_PUOf zi$rt_QK{UH5!Tw;RU5`38@JuX6tLPTs8T=5j@;#f@W{{eP}4;Qqz%EslH(SaOY=om zMv5jDDD*yiE-q;0tKn3^Lf#LV{fxGRjOFB2@PW*V(jmw6M&)LQw?5Q?vXdD?)r73{ z6NI?9ztU<9xKbp1_`jy5joOk_y?gg=d$yA8{BSvLqd!>yVCUv0lf=(gRkwaL?hzIq zZgEj6`%-QT1iw1Qobljz;5dh&U}4V(T<(oqN}SBBt3|kuk8PuM$6s;n3b6ptS-K_yFHzqnSK`sK(JA*-9w0M-a- zz`&cz{<7NrXLys;14G}3fBZn8me&AYha5WZ!^3eZwh4U@1cbOUch%Mx^k4QzD6ZV` zAms<40;Rq2RU2EyfxT~scc-VO)}~5~ZoI+zywtcpq$}u#S=eFe<6bdW#Ohotk_;qM zzl_vuYzi)D+|uf2soOL)12nbm&7^)Jc00B}I>f0T=;DQO02Rp8AW9EMFm;30<2=q=(6uI^N82DMQ2 zv$Mne@cP-0Uk#b*)hOdmmy=&@^R8WGQ7+hYJ@;7+wbR}3{yQDV%*z|cZPK8V1ie{V zF~?_+qJ94Sxj~J6>e}x8s8;5kS_gy5A6i;!ynOk=y1Et3eE-d_Yt-YRaDpEJmw$_$ zDh$$xpk4>GDvuKHq5JGFg(LW?Vc_N)0hLE~Bc}CQaq-`oJmn62T;us~z%|WB4eqKO zpIuOxO^8@o>x#Z|0LxhRSbE8*dzNk5lu}~Ss5i#9xyxAq$5NU=MK8|(0kqY9lKTW= zaH*>vl=5rT3U{9tmR9GdyIxhpYDJU$q3rg=T_4f1!8 zxG~P2=jY^J?x1*dktKOX_saqJJ#>zOB(cocJ|VU7M{Y09pt_4OE>(>JO~ zX2lEeFVcO?HI|cx65`)b;^CQ*I(2$K9i~NCS>Lm=vaX&EL-kd>yxT)C>_MJK?^L90 zvLf=@-sMU*V2$B3#Ge){3j33J}UFgK+NR+VQ6z$O0?Jk4p7@GVl$Ac?M1ry;+jC- zU2@<`|ISXL)}&5W3wsn6-$+b{&h($&{(o|{e-FX6Hd7CP5Id!y00$Up)aNyBbU_OW zxG?GEX=L#Vkd3^!5e8^zXpWCMh|mBv259VvRKV+!pj~4~rjLiEb=hMON3-|#5z89O z-e=2~WFV*l7)3=XL8S$okkAv+?<<+yi9h74|twO|vf4c@%M({AN{7 z;;S}nmSSVG&Z32j@Qm;Qr*2a)kw2Ol@r@?#?t(yOZZ1aAbSVaaPcK2qsb4Hzs2829 zoK#muTZVei=|RMh4RU((0pBMUm9zNcF*KJ;Gd(uR8c~j!h9%Dm^%{X-E);_!et@w_ zK6Xu>Sdco#NdIsO22T)t_DC)LPuVoc(G`kp_){;Bo5kp$f!iZYwMpxfnkyk8s9y@| zso>9;dGz(yT|I=TVX#rlip(G#x)*0fgf(}^dEZ+N&TY(|?@FYl57GvPW{r(lqavsT{m86!VI{`!9T#%$a-L%P37#~m}`?1_Q}%bpp@5N zQ1f{x!KG3IZ*Xp*Pu+46vTpVkIynV>*p1bsVYlkm=H`ot5l%`i?bu1V0kfVtLtaEc0UzKKtG6oi#_mg`b zuPNZuib7J|wq79LF&S(pn`%ShH)n5Yp*~~# zM`+vfZ(F})WDK8^k*y*}ocB06){Izm%&6c`jrC_Je#g13b>cjSDZIZpxvUQKqt6`M z*xW2!@?R%7?<J{6QUwy+-!&_kn9D|*gG0^)5o*=>XKZ-+( zD&`Fnxx26;XJB}TcHJ6!Wr+8iKJqu5p>!o%(hn?oBpgwm-3MetL&I|4eM6var9HI5 zwF?(ii!S9}aR6b-*cC~1f4n!T$cgD=yNmRR!M8tuls(Y%$|Dq@+K?c76dQDg*@|~DKYpky z%y%F5fejv;cHDI$jM#=H#I(2n6OGD6$zrmpRN8>0Zv%_5oyqytaN{tAlrHT@iEaJJa_;A zAfEw2>SCo8*HhQ;T1ITEXX=o2616J|+xGm@T-L+->sqSJTqO=64y`>X zZz~KgU3kv+@UMs)Sp$(E ziE>^6(1LMD9svL$gA{&fJLAhDr&sOtn1Eb(HyXe(oZR7^CHqTnxkdGExZ!p^91XmW zyQ2aRo=}ZAzrFIn1O$Y#0f1pwISXpS@v=z05OHhCAbs=KY_$z}2nId!fp6l;L@1%{ z!S!xi51E-m!J0*`%3-O#(xBRTRrU=ZCFES16eP$7xwIfgL@6a>?>sL$^KI7W%$c;E zO&QI;r+OLmmk-3g4e?%J0BvVGurzP-q4#3yXCAxC|KSBsU!|eYApl ze?bM{E26ZIXX8==&*6&%Q1#t;Pi4%rxN^UN#iP?4BupTWe=t&${RUwqkL6W)fAv#i z3+I~wr8ikwk`^sfsK77x(0Ae)e)C5zTNj%J)?->PHOz?&4Cevw*4q$_6%hE`irw7P zdk`AUud?Y}2ys{hZHV^ixSfe2nS7PoOr%H}U3jM^l3Z8R`)zK`? zU8NeWGV5Gu9Uze1=Z6Xhp?*t{zk(@0ov+l2;?d|PGDE3dr!Fw=vFUPJ>q!F!_QF%{ z?hK>gwr_W~!En`Yf;I_@=QEfLj5jg_rDWIui0=OMs#F@aI2@t;W|&wpdnnyhO5=T}g|oIH9>mNRm4Bzi+a{VaN7=?Xu7#Ge{- zl{<5+r9{VRYwQIHKb83%L+pGnXV>ULak>vaV2LQmqNlYk@ykLD_HMVZKgdgj%WR9rJSl(6qbE)`rgAGDHjjRKSib&Jop+GMlLA9DEvHnpv5=_r6R(Y5BuaFBiuVS91v zaCv765(oxi&rIz6+|8nTfDqgl?+IQ z9em3=5a2)+{mu)&KUcQ0Ad)|J3LFaA${OEUF!?+mo59o3wM*T2^n?;$Nl6I+K;W8L zT&yzTF=M2Y^FsBxg(j%UoI~$^<0aVNy$d>sSnafFJo@B+jR)1r&4YIQuwS~{V)eb_ z9HMeAZ5rV5&shq5Ds}hW)2@rK-4uE|5MgqC{0R*cC=a&)BNtjQ=p4$XH50Tnh6P&IthEUzdYnPblfix_e!jpY;?SC&w^k@7QYR_n*FHV7$l}GUsF5d&f?R zkEu?+{^?!C?I-vi*V*I2yrjx(T|& zT4bh=cLGP9;BXy81*J_)5I7ny$*`IadZe^gM}LTIb9(f#{R&SA#D{+)01e|Dn4r5PlBe9Tq~>~< z6QdN~RgH==bGs!(T|%>Xe`q~ESzSBTw$$k{W)|;n8JZb$9&Isvskj9}Sx(bYdl(K8 zGxIBIAQMDWij9 z>bq~@sG6yp(%*7bFe93+X&w1;``GL7ys;)@|6mb0q!cij+!4{L0MC7qzb?Cf0qZ;e zy=XdlTtuG9o3)?6f04VNyq=&BMo6V}-HOmyWX1n8N_bka(_<&c(x7qZ-gHirCN5U&^h@>gB1xNP(;~y9vZg$~s z%i_fTtNQSI&)nJL%q{f9G5Yx)=vBazEh_n5&1Z)aJlawrhPGq(4gpJpQWA0YQyBxR7z6PFfeUc1Jj%l7@W@3cAy9t= z+}wlU!3*b&qeTPGcFAx6aAqH#v_`dWdkd*0(L50|jcK*NF&IJAfa?)2>Pad!9W*%X zc7DwcLhBM=KTcd++$JR8Jnz&rgTLOT?7w2%j4Sb(j})Zi?7U9$;BrVU1kTtn;^^L8 zM^yrQL3g|FVquJ*Wn5g|R#s)UtWg5`w9i!u3(8Hx^ceByN?Dj9Z}!X+teNr$!DINJX0>4~Mn z0Yp7-NV{Wcqh8(Fbj^H{%R;Dg@(T#eLW7pkD7npUcl86A3`{C#?L|r^ZI8=>Zt>J5 zj?tl9JUpHS7(c-dQTj5aH*X%H1vANo&kSyXY9x6aC+HuhEcD&|RvmkJgm`)mnOQe_ z32RNZj}qPJw8q|)gNli6Wk%X?opi;1?AOv|NK-T@*OY+NuNKHPB{I72QUiSxP;Auv z0)Erv^U=;{mJqa`Id16y|r zW-v2!P}Y^<;)$uLz2Q9szyDYq-%oVO;5+XQqW5KMcId;>Fa~K9rO4$qU)qj!Op6mI zh90&%QAV4~KPG0_?$r29f#BCV@N#wc2?Zre`2Q_E%?mnmb-UWFF5=E5Y8V6{qEm{i>Z?|5#x^CiLt=JWU;5 z&@#3=-UYe8De);DYk}>Cj*Vk@Z2S)~bFuwPrW}Nh*#~$5#!Re(vc^wocdyh(J@by( zzbA<(C-V_63e-`y!$!De9DPdNE9*sCvmHb7T?++8RP!5=5Uqg1vK)jvq!SD0cC)cj zrBEIIMJoffobJg5+KcMAPms0$V&4BzPnu$xgPbzyo21!TVr0N52%}YY6AQku*lh}M zfv@6h8(E1}P|^k|=4_toVF5dE2tkDH{y+ZYKVY}1hO@Qgy+er)CV#q1GyR$m+*}F7 zH)nVw%JyO{!>>0|9jJ#yDCsI*I?E)6B~#hMRciU!XeNQ3MS!44+LZ-34n1wVPGmp^ z=Ly=;JRJr{DF*v%Y~h7+WUL%28Zp)Eyja;PHOLR7(dWDERn%-aG_1LXN> zPf{=lONCc?o1n|Qvk<M;8eH7t^1t z+S$P`$6Q`w3!{p=YtE9ctc!sUbEIwzOp&{Y_Isjc~+HToK17%JI9QrUq(3A)$JsAvKU$ z^MC*ph>VTJ1X2b|?-D`q?l(sLaUTi^uFj=_@{#{9qG(xJY5lgNO$!q36O>tMiTW2f zvnQvsIRA3;^7$R>;kIQkw5cS2OUs83!ij>j_Ov285)vM$r0~59S_B(rOblD}QR@8k zv-&*Q$#|S|OJPo6@X!IZmZ^iXk8tH@ex|KCrI^iu2r34z#^j7Gd+Nml1#hrd%C4E9 zZEntRp}`}XAucNF_ZLq6^2@lO&b-02Pv5?5@EKoEw^~m8)b#9s%*_q|8R+b+4z%@F zCLevt8Yr3eyjMD5l4P_CBv3)Y4)5cH`7+(CK^Wqo;jSfPF)+p~fWmw3%>50&$<~E{ zE0#rPDNK!1Z9DogD7UP&E}|X{?dle8Z4JI6e)8n4eOMP1i{xv|&} zAKF1eY3v)bjKK(mo#DSD<%W7i5(m;cDjxlB%pa{D)yABXp|MjzIAE>VHV3&4xtQt6vgMSk?){ z1cglx-3`D@%KT6fJSZG?a*$b0^e@%W83O2ZPz)FrGwTb8X(TQc_w-TT@|*Nr9rgzx z%%dq+d*}=8&N!|W_fa)Y{-PK{<5 znYWDGiRlj&_b2H8)!_TW>9=R;L$Fmk=F*J#~I?jUD8B|;Sn79)H;j3 zJ4n)6tU-bCKJ*l+|Dy_sVc#dw^MkYR; zV^Fn#5SpeY9v-X((*^ziRuG4x>Y zM*?G#9N5PKq`^Eti;Ly&JKmsgA(U?Rm#Kqq28R1AH*_r$?}>R|c~lsLNCUuqJ*9rD z+BS#=_8qfT2Yrc zfj8E})}XA#;G3Aw@*z-~@qg}D<*(4*5AkPZ9r`0RHlfj_bSF4 z;WWCZ>r_bqCVW4t$lHmZ1wuc9ph5$KZ$P2**!j12 z`dtgHToCavQJ2pDY@x`5@9G*KIRxBEj$X)>nl_S$Vi9%sk#WWsPND)}_o~79Worc| zsWytg90=HNLi@R;OE;_?g*#q15CV0sx%5nua(m$mr(xv(G)ZjlgG~~9lRE$qK}hH7 zZI3|ruY~c@r-DtqO3kKWkc)cKU^)*QHudM0`xkdEtL%c04ZTe2HMK+KgiXwO(82EK zq||Fm={STU{Vi*FQs=0YwCv40{rvXG>at;d2VR~7S3hMDoAYPLXHnHmVcyX#cwFUw z>;r5q-*0- Date: Thu, 13 Jun 2024 15:44:13 -0500 Subject: [PATCH 10/15] weapon actual sprites for laser noew --- code/modules/projectiles/gun_attachables.dm | 3 +++ .../items/weapons/guns/attachments/under.dmi | Bin 14982 -> 15088 bytes 2 files changed, 3 insertions(+) diff --git a/code/modules/projectiles/gun_attachables.dm b/code/modules/projectiles/gun_attachables.dm index a67077f2b4..5fa3d43ccb 100644 --- a/code/modules/projectiles/gun_attachables.dm +++ b/code/modules/projectiles/gun_attachables.dm @@ -3269,6 +3269,9 @@ Defined in conflicts.dm of the #defines folder. /obj/item/attachable/lasersight/union name = "Zvezda Laser Module" desc = "Visible band 512nm green laser, compatible with NVG and IR. Bears striking resemblance to an old Weyland Yutani offering... Decreases scatter, especially onehanded, slightly boosts accuracy. " + icon = 'icons/obj/items/weapons/guns/attachments/under.dmi' + icon_state = "lasersight_union" + attach_icon = "lasersight_union_a" /obj/item/attachable/bipod name = "bipod" diff --git a/icons/obj/items/weapons/guns/attachments/under.dmi b/icons/obj/items/weapons/guns/attachments/under.dmi index b11e613d3fb5ff90049d1fa076823a08c6619183..3458bc07866ba6b752d65a1ff42c2a6e99b71193 100644 GIT binary patch literal 15088 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 literal 14982 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 Wq;N>{75sfEpdhOxQwlW>{=Wd4mgk%R From a7e21ca1083ba42cc50fbf1a3c6ca621b75c3016 Mon Sep 17 00:00:00 2001 From: Steeclad Cat Date: Thu, 13 Jun 2024 15:58:45 -0500 Subject: [PATCH 11/15] offset tweak --- code/modules/projectiles/gun_attachables.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/projectiles/gun_attachables.dm b/code/modules/projectiles/gun_attachables.dm index 5fa3d43ccb..e787fc8726 100644 --- a/code/modules/projectiles/gun_attachables.dm +++ b/code/modules/projectiles/gun_attachables.dm @@ -3272,6 +3272,8 @@ Defined in conflicts.dm of the #defines folder. icon = 'icons/obj/items/weapons/guns/attachments/under.dmi' icon_state = "lasersight_union" attach_icon = "lasersight_union_a" + pixel_shift_x = 20 + pixel_shift_y = 18 /obj/item/attachable/bipod name = "bipod" From 09556a883c00f314b0bc64f9dff2c48b4c8d111c Mon Sep 17 00:00:00 2001 From: Steeclad Cat Date: Thu, 13 Jun 2024 16:06:39 -0500 Subject: [PATCH 12/15] fix --- code/modules/projectiles/gun_attachables.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/projectiles/gun_attachables.dm b/code/modules/projectiles/gun_attachables.dm index e787fc8726..43dc8282c6 100644 --- a/code/modules/projectiles/gun_attachables.dm +++ b/code/modules/projectiles/gun_attachables.dm @@ -3272,7 +3272,7 @@ Defined in conflicts.dm of the #defines folder. icon = 'icons/obj/items/weapons/guns/attachments/under.dmi' icon_state = "lasersight_union" attach_icon = "lasersight_union_a" - pixel_shift_x = 20 + pixel_shift_x = 15 pixel_shift_y = 18 /obj/item/attachable/bipod From d0cd61d918297e4d4ac63b0a64d6632fd60a6a00 Mon Sep 17 00:00:00 2001 From: KoishiVibe Date: Wed, 31 Jul 2024 01:19:37 -0500 Subject: [PATCH 13/15] converts subtype to /upp instead of /union --- code/modules/gear_presets/upp.dm | 382 +++++++++--------- code/modules/projectiles/gun_attachables.dm | 16 +- code/modules/projectiles/guns/rifles.dm | 54 +-- code/modules/projectiles/guns/shotguns.dm | 18 +- .../projectiles/guns/specialist/sniper.dm | 2 +- 5 files changed, 236 insertions(+), 236 deletions(-) diff --git a/code/modules/gear_presets/upp.dm b/code/modules/gear_presets/upp.dm index 46396c020f..5488403e72 100644 --- a/code/modules/gear_presets/upp.dm +++ b/code/modules/gear_presets/upp.dm @@ -173,13 +173,13 @@ list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), - list("Angled Grip", 0, /obj/item/attachable/angledgrip/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Angled Grip", 0, /obj/item/attachable/angledgrip/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Extended Barrel", 0, /obj/item/attachable/extended_barrel, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Laser Sight", 0, /obj/item/attachable/lasersight/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 0, /obj/item/attachable/reddot/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 0, /obj/item/attachable/reflex/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Laser Sight", 0, /obj/item/attachable/lasersight/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Red-Dot Sight", 0, /obj/item/attachable/reddot/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Reflex Sight", 0, /obj/item/attachable/reflex/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Suppressor", 0, /obj/item/attachable/suppressor, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 0, /obj/item/attachable/verticalgrip/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Vertical Grip", 0, /obj/item/attachable/verticalgrip/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("MASK (CHOOSE 1)", 0, null, null, null), list("Gas Mask", 0, /obj/item/clothing/mask/gas, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), @@ -196,13 +196,13 @@ list("Type 71 AP Magazine (5.45x39mm)", 10, /obj/item/ammo_magazine/rifle/type71/ap , null, VENDOR_ITEM_REGULAR), list("ATTACHMENTS", 0, null, null, null), - list("Angled Grip", 10, /obj/item/attachable/angledgrip/union, null, VENDOR_ITEM_REGULAR), + list("Angled Grip", 10, /obj/item/attachable/angledgrip/upp, null, VENDOR_ITEM_REGULAR), list("Extended Barrel", 10, /obj/item/attachable/extended_barrel, null, VENDOR_ITEM_REGULAR), - list("Laser Sight", 10, /obj/item/attachable/lasersight/union, null, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 10, /obj/item/attachable/reddot/union, null, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 10, /obj/item/attachable/reflex/union, null, VENDOR_ITEM_REGULAR), + list("Laser Sight", 10, /obj/item/attachable/lasersight/upp, null, VENDOR_ITEM_REGULAR), + list("Red-Dot Sight", 10, /obj/item/attachable/reddot/upp, null, VENDOR_ITEM_REGULAR), + list("Reflex Sight", 10, /obj/item/attachable/reflex/upp, null, VENDOR_ITEM_REGULAR), list("Suppressor", 10, /obj/item/attachable/suppressor, null, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 10, /obj/item/attachable/verticalgrip/union, null, VENDOR_ITEM_REGULAR), + list("Vertical Grip", 10, /obj/item/attachable/verticalgrip/upp, null, VENDOR_ITEM_REGULAR), list("EXPLOSIVES", 0, null, null, null), list("Smoke Grenade", 5, /obj/item/explosive/grenade/smokebomb, null, VENDOR_ITEM_REGULAR), @@ -306,13 +306,13 @@ list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), - list("Angled Grip", 0, /obj/item/attachable/angledgrip/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Angled Grip", 0, /obj/item/attachable/angledgrip/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Extended Barrel", 0, /obj/item/attachable/extended_barrel, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Laser Sight", 0, /obj/item/attachable/lasersight/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 0, /obj/item/attachable/reddot/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 0, /obj/item/attachable/reflex/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Laser Sight", 0, /obj/item/attachable/lasersight/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Red-Dot Sight", 0, /obj/item/attachable/reddot/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Reflex Sight", 0, /obj/item/attachable/reflex/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Suppressor", 0, /obj/item/attachable/suppressor, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 0, /obj/item/attachable/verticalgrip/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Vertical Grip", 0, /obj/item/attachable/verticalgrip/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("MASK (CHOOSE 1)", 0, null, null, null), list("Gas Mask", 0, /obj/item/clothing/mask/gas, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), @@ -366,13 +366,13 @@ list("Type 71 AP Magazine (5.45x39mm)", 10, /obj/item/ammo_magazine/rifle/type71/ap , null, VENDOR_ITEM_REGULAR), list("ATTACHMENTS", 0, null, null, null), - list("Angled Grip", 10, /obj/item/attachable/angledgrip/union, null, VENDOR_ITEM_REGULAR), + list("Angled Grip", 10, /obj/item/attachable/angledgrip/upp, null, VENDOR_ITEM_REGULAR), list("Extended Barrel", 10, /obj/item/attachable/extended_barrel, null, VENDOR_ITEM_REGULAR), - list("Laser Sight", 10, /obj/item/attachable/lasersight/union, null, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 10, /obj/item/attachable/reddot/union, null, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 10, /obj/item/attachable/reflex/union, null, VENDOR_ITEM_REGULAR), + list("Laser Sight", 10, /obj/item/attachable/lasersight/upp, null, VENDOR_ITEM_REGULAR), + list("Red-Dot Sight", 10, /obj/item/attachable/reddot/upp, null, VENDOR_ITEM_REGULAR), + list("Reflex Sight", 10, /obj/item/attachable/reflex/upp, null, VENDOR_ITEM_REGULAR), list("Suppressor", 10, /obj/item/attachable/suppressor, null, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 10, /obj/item/attachable/verticalgrip/union, null, VENDOR_ITEM_REGULAR), + list("Vertical Grip", 10, /obj/item/attachable/verticalgrip/upp, null, VENDOR_ITEM_REGULAR), list("EXPLOSIVES", 0, null, null, null), list("Smoke Grenade", 5, /obj/item/explosive/grenade/smokebomb, null, VENDOR_ITEM_REGULAR), @@ -499,13 +499,13 @@ list("Type 71 AP Magazine (5.45x39mm)", 10, /obj/item/ammo_magazine/rifle/type71/ap , null, VENDOR_ITEM_REGULAR), list("ATTACHMENTS", 0, null, null, null), - list("Angled Grip", 10, /obj/item/attachable/angledgrip/union, null, VENDOR_ITEM_REGULAR), + list("Angled Grip", 10, /obj/item/attachable/angledgrip/upp, null, VENDOR_ITEM_REGULAR), list("Extended Barrel", 10, /obj/item/attachable/extended_barrel, null, VENDOR_ITEM_REGULAR), - list("Laser Sight", 10, /obj/item/attachable/lasersight/union, null, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 10, /obj/item/attachable/reddot/union, null, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 10, /obj/item/attachable/reflex/union, null, VENDOR_ITEM_REGULAR), + list("Laser Sight", 10, /obj/item/attachable/lasersight/upp, null, VENDOR_ITEM_REGULAR), + list("Red-Dot Sight", 10, /obj/item/attachable/reddot/upp, null, VENDOR_ITEM_REGULAR), + list("Reflex Sight", 10, /obj/item/attachable/reflex/upp, null, VENDOR_ITEM_REGULAR), list("Suppressor", 10, /obj/item/attachable/suppressor, null, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 10, /obj/item/attachable/verticalgrip/union, null, VENDOR_ITEM_REGULAR), + list("Vertical Grip", 10, /obj/item/attachable/verticalgrip/upp, null, VENDOR_ITEM_REGULAR), list("EXPLOSIVES", 0, null, null, null), list("Plastic Explosive", 5, /obj/item/explosive/plastic, null, VENDOR_ITEM_REGULAR), @@ -604,13 +604,13 @@ list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), - list("Angled Grip", 0, /obj/item/attachable/angledgrip/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Angled Grip", 0, /obj/item/attachable/angledgrip/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Extended Barrel", 0, /obj/item/attachable/extended_barrel, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Laser Sight", 0, /obj/item/attachable/lasersight/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 0, /obj/item/attachable/reddot/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 0, /obj/item/attachable/reflex/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Laser Sight", 0, /obj/item/attachable/lasersight/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Red-Dot Sight", 0, /obj/item/attachable/reddot/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Reflex Sight", 0, /obj/item/attachable/reflex/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Suppressor", 0, /obj/item/attachable/suppressor, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 0, /obj/item/attachable/verticalgrip/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Vertical Grip", 0, /obj/item/attachable/verticalgrip/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("MASK (CHOOSE 1)", 0, null, null, null), list("Gas Mask", 0, /obj/item/clothing/mask/gas, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), @@ -626,13 +626,13 @@ list("QYJ-72 Box Magazine(7.62x54mmR)", 15, /obj/item/ammo_magazine/pkp , null, VENDOR_ITEM_RECOMMENDED), list("ATTACHMENTS (NONE FIT QYJ-72)", 0, null, null, null), - list("Angled Grip", 10, /obj/item/attachable/angledgrip/union, null, VENDOR_ITEM_REGULAR), + list("Angled Grip", 10, /obj/item/attachable/angledgrip/upp, null, VENDOR_ITEM_REGULAR), list("Extended Barrel", 10, /obj/item/attachable/extended_barrel, null, VENDOR_ITEM_REGULAR), - list("Laser Sight", 10, /obj/item/attachable/lasersight/union, null, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 10, /obj/item/attachable/reddot/union, null, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 10, /obj/item/attachable/reflex/union, null, VENDOR_ITEM_REGULAR), + list("Laser Sight", 10, /obj/item/attachable/lasersight/upp, null, VENDOR_ITEM_REGULAR), + list("Red-Dot Sight", 10, /obj/item/attachable/reddot/upp, null, VENDOR_ITEM_REGULAR), + list("Reflex Sight", 10, /obj/item/attachable/reflex/upp, null, VENDOR_ITEM_REGULAR), list("Suppressor", 10, /obj/item/attachable/suppressor, null, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 10, /obj/item/attachable/verticalgrip/union, null, VENDOR_ITEM_REGULAR), + list("Vertical Grip", 10, /obj/item/attachable/verticalgrip/upp, null, VENDOR_ITEM_REGULAR), list("EXPLOSIVES", 0, null, null, null), list("Plastic Explosive", 5, /obj/item/explosive/plastic, null, VENDOR_ITEM_REGULAR), @@ -729,13 +729,13 @@ list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), - list("Angled Grip", 0, /obj/item/attachable/angledgrip/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Angled Grip", 0, /obj/item/attachable/angledgrip/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Extended Barrel", 0, /obj/item/attachable/extended_barrel, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Laser Sight", 0, /obj/item/attachable/lasersight/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 0, /obj/item/attachable/reddot/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 0, /obj/item/attachable/reflex/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Laser Sight", 0, /obj/item/attachable/lasersight/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Red-Dot Sight", 0, /obj/item/attachable/reddot/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Reflex Sight", 0, /obj/item/attachable/reflex/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Suppressor", 0, /obj/item/attachable/suppressor, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 0, /obj/item/attachable/verticalgrip/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Vertical Grip", 0, /obj/item/attachable/verticalgrip/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("MASK (CHOOSE 1)", 0, null, null, null), list("Gas Mask", 0, /obj/item/clothing/mask/gas, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), @@ -751,13 +751,13 @@ list("QYJ-72 Box Magazine (7.62x54mmR)", 15, /obj/item/ammo_magazine/pkp , null, VENDOR_ITEM_RECOMMENDED), list("ATTACHMENTS (NONE FIT QYJ-72)", 0, null, null, null), - list("Angled Grip", 10, /obj/item/attachable/angledgrip/union, null, VENDOR_ITEM_REGULAR), + list("Angled Grip", 10, /obj/item/attachable/angledgrip/upp, null, VENDOR_ITEM_REGULAR), list("Extended Barrel", 10, /obj/item/attachable/extended_barrel, null, VENDOR_ITEM_REGULAR), - list("Laser Sight", 10, /obj/item/attachable/lasersight/union, null, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 10, /obj/item/attachable/reddot/union, null, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 10, /obj/item/attachable/reflex/union, null, VENDOR_ITEM_REGULAR), + list("Laser Sight", 10, /obj/item/attachable/lasersight/upp, null, VENDOR_ITEM_REGULAR), + list("Red-Dot Sight", 10, /obj/item/attachable/reddot/upp, null, VENDOR_ITEM_REGULAR), + list("Reflex Sight", 10, /obj/item/attachable/reflex/upp, null, VENDOR_ITEM_REGULAR), list("Suppressor", 10, /obj/item/attachable/suppressor, null, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 10, /obj/item/attachable/verticalgrip/union, null, VENDOR_ITEM_REGULAR), + list("Vertical Grip", 10, /obj/item/attachable/verticalgrip/upp, null, VENDOR_ITEM_REGULAR), list("EXPLOSIVES", 0, null, null, null), list("Plastic Explosive", 5, /obj/item/explosive/plastic, null, VENDOR_ITEM_REGULAR), @@ -868,13 +868,13 @@ list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), - list("Angled Grip", 0, /obj/item/attachable/angledgrip/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Angled Grip", 0, /obj/item/attachable/angledgrip/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Extended Barrel", 0, /obj/item/attachable/extended_barrel, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Laser Sight", 0, /obj/item/attachable/lasersight/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 0, /obj/item/attachable/reddot/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 0, /obj/item/attachable/reflex/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Laser Sight", 0, /obj/item/attachable/lasersight/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Red-Dot Sight", 0, /obj/item/attachable/reddot/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Reflex Sight", 0, /obj/item/attachable/reflex/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Suppressor", 0, /obj/item/attachable/suppressor, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 0, /obj/item/attachable/verticalgrip/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Vertical Grip", 0, /obj/item/attachable/verticalgrip/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("MASK (CHOOSE 1)", 0, null, null, null), list("Gas Mask", 0, /obj/item/clothing/mask/gas, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), @@ -919,13 +919,13 @@ list("Type 71 AP Magazine (5.45x39mm)", 10, /obj/item/ammo_magazine/rifle/type71/ap , null, VENDOR_ITEM_REGULAR), list("ATTACHMENTS", 0, null, null, null), - list("Angled Grip", 10, /obj/item/attachable/angledgrip/union, null, VENDOR_ITEM_REGULAR), + list("Angled Grip", 10, /obj/item/attachable/angledgrip/upp, null, VENDOR_ITEM_REGULAR), list("Extended Barrel", 10, /obj/item/attachable/extended_barrel, null, VENDOR_ITEM_REGULAR), - list("Laser Sight", 10, /obj/item/attachable/lasersight/union, null, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 10, /obj/item/attachable/reddot/union, null, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 10, /obj/item/attachable/reflex/union, null, VENDOR_ITEM_REGULAR), + list("Laser Sight", 10, /obj/item/attachable/lasersight/upp, null, VENDOR_ITEM_REGULAR), + list("Red-Dot Sight", 10, /obj/item/attachable/reddot/upp, null, VENDOR_ITEM_REGULAR), + list("Reflex Sight", 10, /obj/item/attachable/reflex/upp, null, VENDOR_ITEM_REGULAR), list("Suppressor", 10, /obj/item/attachable/suppressor, null, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 10, /obj/item/attachable/verticalgrip/union, null, VENDOR_ITEM_REGULAR), + list("Vertical Grip", 10, /obj/item/attachable/verticalgrip/upp, null, VENDOR_ITEM_REGULAR), list("EXPLOSIVES", 0, null, null, null), list("Plastic Explosive", 5, /obj/item/explosive/plastic, null, VENDOR_ITEM_REGULAR), @@ -1020,13 +1020,13 @@ list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), - list("Angled Grip", 0, /obj/item/attachable/angledgrip/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Angled Grip", 0, /obj/item/attachable/angledgrip/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Extended Barrel", 0, /obj/item/attachable/extended_barrel, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Laser Sight", 0, /obj/item/attachable/lasersight/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 0, /obj/item/attachable/reddot/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 0, /obj/item/attachable/reflex/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Laser Sight", 0, /obj/item/attachable/lasersight/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Red-Dot Sight", 0, /obj/item/attachable/reddot/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Reflex Sight", 0, /obj/item/attachable/reflex/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Suppressor", 0, /obj/item/attachable/suppressor, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 0, /obj/item/attachable/verticalgrip/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Vertical Grip", 0, /obj/item/attachable/verticalgrip/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("MASK (CHOOSE 1)", 0, null, null, null), list("Gas Mask", 0, /obj/item/clothing/mask/gas/pmc/upp, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), @@ -1071,13 +1071,13 @@ list("Type 71 AP Magazine (5.45x39mm)", 10, /obj/item/ammo_magazine/rifle/type71/ap , null, VENDOR_ITEM_REGULAR), list("ATTACHMENTS", 0, null, null, null), - list("Angled Grip", 10, /obj/item/attachable/angledgrip/union, null, VENDOR_ITEM_REGULAR), + list("Angled Grip", 10, /obj/item/attachable/angledgrip/upp, null, VENDOR_ITEM_REGULAR), list("Extended Barrel", 10, /obj/item/attachable/extended_barrel, null, VENDOR_ITEM_REGULAR), - list("Laser Sight", 10, /obj/item/attachable/lasersight/union, null, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 10, /obj/item/attachable/reddot/union, null, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 10, /obj/item/attachable/reflex/union, null, VENDOR_ITEM_REGULAR), + list("Laser Sight", 10, /obj/item/attachable/lasersight/upp, null, VENDOR_ITEM_REGULAR), + list("Red-Dot Sight", 10, /obj/item/attachable/reddot/upp, null, VENDOR_ITEM_REGULAR), + list("Reflex Sight", 10, /obj/item/attachable/reflex/upp, null, VENDOR_ITEM_REGULAR), list("Suppressor", 10, /obj/item/attachable/suppressor, null, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 10, /obj/item/attachable/verticalgrip/union, null, VENDOR_ITEM_REGULAR), + list("Vertical Grip", 10, /obj/item/attachable/verticalgrip/upp, null, VENDOR_ITEM_REGULAR), list("EXPLOSIVES", 0, null, null, null), list("Plastic Explosive", 5, /obj/item/explosive/plastic, null, VENDOR_ITEM_REGULAR), @@ -1183,13 +1183,13 @@ list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), - list("Angled Grip", 0, /obj/item/attachable/angledgrip/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Angled Grip", 0, /obj/item/attachable/angledgrip/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Extended Barrel", 0, /obj/item/attachable/extended_barrel, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Laser Sight", 0, /obj/item/attachable/lasersight/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 0, /obj/item/attachable/reddot/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 0, /obj/item/attachable/reflex/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Laser Sight", 0, /obj/item/attachable/lasersight/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Red-Dot Sight", 0, /obj/item/attachable/reddot/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Reflex Sight", 0, /obj/item/attachable/reflex/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Suppressor", 0, /obj/item/attachable/suppressor, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 0, /obj/item/attachable/verticalgrip/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Vertical Grip", 0, /obj/item/attachable/verticalgrip/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("MASK (CHOOSE 1)", 0, null, null, null), list("Gas Mask", 0, /obj/item/clothing/mask/gas/pmc/upp, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), @@ -1234,13 +1234,13 @@ list("Type 71 HEAP Magazine (5.45x39mm)", 10, /obj/item/ammo_magazine/rifle/type71/heap , null, VENDOR_ITEM_REGULAR), list("ATTACHMENTS", 0, null, null, null), - list("Angled Grip", 10, /obj/item/attachable/angledgrip/union, null, VENDOR_ITEM_REGULAR), + list("Angled Grip", 10, /obj/item/attachable/angledgrip/upp, null, VENDOR_ITEM_REGULAR), list("Extended Barrel", 10, /obj/item/attachable/extended_barrel, null, VENDOR_ITEM_REGULAR), - list("Laser Sight", 10, /obj/item/attachable/lasersight/union, null, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 10, /obj/item/attachable/reddot/union, null, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 10, /obj/item/attachable/reflex/union, null, VENDOR_ITEM_REGULAR), + list("Laser Sight", 10, /obj/item/attachable/lasersight/upp, null, VENDOR_ITEM_REGULAR), + list("Red-Dot Sight", 10, /obj/item/attachable/reddot/upp, null, VENDOR_ITEM_REGULAR), + list("Reflex Sight", 10, /obj/item/attachable/reflex/upp, null, VENDOR_ITEM_REGULAR), list("Suppressor", 10, /obj/item/attachable/suppressor, null, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 10, /obj/item/attachable/verticalgrip/union, null, VENDOR_ITEM_REGULAR), + list("Vertical Grip", 10, /obj/item/attachable/verticalgrip/upp, null, VENDOR_ITEM_REGULAR), list("EXPLOSIVES", 0, null, null, null), list("Plastic Explosive", 5, /obj/item/explosive/plastic, null, VENDOR_ITEM_REGULAR), @@ -1343,13 +1343,13 @@ list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), - list("Angled Grip", 0, /obj/item/attachable/angledgrip/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Angled Grip", 0, /obj/item/attachable/angledgrip/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Extended Barrel", 0, /obj/item/attachable/extended_barrel, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Laser Sight", 0, /obj/item/attachable/lasersight/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 0, /obj/item/attachable/reddot/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 0, /obj/item/attachable/reflex/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Laser Sight", 0, /obj/item/attachable/lasersight/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Red-Dot Sight", 0, /obj/item/attachable/reddot/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Reflex Sight", 0, /obj/item/attachable/reflex/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Suppressor", 0, /obj/item/attachable/suppressor, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 0, /obj/item/attachable/verticalgrip/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Vertical Grip", 0, /obj/item/attachable/verticalgrip/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("MASK (CHOOSE 1)", 0, null, null, null), list("Gas Mask", 0, /obj/item/clothing/mask/gas/pmc/upp, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), @@ -1394,13 +1394,13 @@ list("Type 71 HEAP Magazine (5.45x39mm)", 10, /obj/item/ammo_magazine/rifle/type71/heap , null, VENDOR_ITEM_REGULAR), list("ATTACHMENTS", 0, null, null, null), - list("Angled Grip", 10, /obj/item/attachable/angledgrip/union, null, VENDOR_ITEM_REGULAR), + list("Angled Grip", 10, /obj/item/attachable/angledgrip/upp, null, VENDOR_ITEM_REGULAR), list("Extended Barrel", 10, /obj/item/attachable/extended_barrel, null, VENDOR_ITEM_REGULAR), - list("Laser Sight", 10, /obj/item/attachable/lasersight/union, null, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 10, /obj/item/attachable/reddot/union, null, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 10, /obj/item/attachable/reflex/union, null, VENDOR_ITEM_REGULAR), + list("Laser Sight", 10, /obj/item/attachable/lasersight/upp, null, VENDOR_ITEM_REGULAR), + list("Red-Dot Sight", 10, /obj/item/attachable/reddot/upp, null, VENDOR_ITEM_REGULAR), + list("Reflex Sight", 10, /obj/item/attachable/reflex/upp, null, VENDOR_ITEM_REGULAR), list("Suppressor", 10, /obj/item/attachable/suppressor, null, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 10, /obj/item/attachable/verticalgrip/union, null, VENDOR_ITEM_REGULAR), + list("Vertical Grip", 10, /obj/item/attachable/verticalgrip/upp, null, VENDOR_ITEM_REGULAR), list("EXPLOSIVES", 0, null, null, null), list("Plastic Explosive", 5, /obj/item/explosive/plastic, null, VENDOR_ITEM_REGULAR), @@ -1504,13 +1504,13 @@ list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), - list("Angled Grip", 0, /obj/item/attachable/angledgrip/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Angled Grip", 0, /obj/item/attachable/angledgrip/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Extended Barrel", 0, /obj/item/attachable/extended_barrel, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Laser Sight", 0, /obj/item/attachable/lasersight/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 0, /obj/item/attachable/reddot/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 0, /obj/item/attachable/reflex/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Laser Sight", 0, /obj/item/attachable/lasersight/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Red-Dot Sight", 0, /obj/item/attachable/reddot/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Reflex Sight", 0, /obj/item/attachable/reflex/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Suppressor", 0, /obj/item/attachable/suppressor, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 0, /obj/item/attachable/verticalgrip/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Vertical Grip", 0, /obj/item/attachable/verticalgrip/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("MASK (CHOOSE 1)", 0, null, null, null), list("Gas Mask", 0, /obj/item/clothing/mask/gas/pmc/upp, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), @@ -1555,13 +1555,13 @@ list("Type 71 HEAP Magazine (5.45x39mm)", 10, /obj/item/ammo_magazine/rifle/type71/heap , null, VENDOR_ITEM_REGULAR), list("ATTACHMENTS", 0, null, null, null), - list("Angled Grip", 10, /obj/item/attachable/angledgrip/union, null, VENDOR_ITEM_REGULAR), + list("Angled Grip", 10, /obj/item/attachable/angledgrip/upp, null, VENDOR_ITEM_REGULAR), list("Extended Barrel", 10, /obj/item/attachable/extended_barrel, null, VENDOR_ITEM_REGULAR), - list("Laser Sight", 10, /obj/item/attachable/lasersight/union, null, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 10, /obj/item/attachable/reddot/union, null, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 10, /obj/item/attachable/reflex/union, null, VENDOR_ITEM_REGULAR), + list("Laser Sight", 10, /obj/item/attachable/lasersight/upp, null, VENDOR_ITEM_REGULAR), + list("Red-Dot Sight", 10, /obj/item/attachable/reddot/upp, null, VENDOR_ITEM_REGULAR), + list("Reflex Sight", 10, /obj/item/attachable/reflex/upp, null, VENDOR_ITEM_REGULAR), list("Suppressor", 10, /obj/item/attachable/suppressor, null, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 10, /obj/item/attachable/verticalgrip/union, null, VENDOR_ITEM_REGULAR), + list("Vertical Grip", 10, /obj/item/attachable/verticalgrip/upp, null, VENDOR_ITEM_REGULAR), list("EXPLOSIVES", 0, null, null, null), list("Plastic Explosive", 5, /obj/item/explosive/plastic, null, VENDOR_ITEM_REGULAR), @@ -1665,13 +1665,13 @@ list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), - list("Angled Grip", 0, /obj/item/attachable/angledgrip/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Angled Grip", 0, /obj/item/attachable/angledgrip/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Extended Barrel", 0, /obj/item/attachable/extended_barrel, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Laser Sight", 0, /obj/item/attachable/lasersight/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 0, /obj/item/attachable/reddot/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 0, /obj/item/attachable/reflex/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Laser Sight", 0, /obj/item/attachable/lasersight/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Red-Dot Sight", 0, /obj/item/attachable/reddot/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Reflex Sight", 0, /obj/item/attachable/reflex/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Suppressor", 0, /obj/item/attachable/suppressor, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 0, /obj/item/attachable/verticalgrip/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Vertical Grip", 0, /obj/item/attachable/verticalgrip/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("MASK (CHOOSE 1)", 0, null, null, null), list("Gas Mask", 0, /obj/item/clothing/mask/gas/pmc/upp, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), @@ -1716,13 +1716,13 @@ list("Type 71 HEAP Magazine (5.45x39mm)", 10, /obj/item/ammo_magazine/rifle/type71/heap , null, VENDOR_ITEM_REGULAR), list("ATTACHMENTS", 0, null, null, null), - list("Angled Grip", 10, /obj/item/attachable/angledgrip/union, null, VENDOR_ITEM_REGULAR), + list("Angled Grip", 10, /obj/item/attachable/angledgrip/upp, null, VENDOR_ITEM_REGULAR), list("Extended Barrel", 10, /obj/item/attachable/extended_barrel, null, VENDOR_ITEM_REGULAR), - list("Laser Sight", 10, /obj/item/attachable/lasersight/union, null, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 10, /obj/item/attachable/reddot/union, null, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 10, /obj/item/attachable/reflex/union, null, VENDOR_ITEM_REGULAR), + list("Laser Sight", 10, /obj/item/attachable/lasersight/upp, null, VENDOR_ITEM_REGULAR), + list("Red-Dot Sight", 10, /obj/item/attachable/reddot/upp, null, VENDOR_ITEM_REGULAR), + list("Reflex Sight", 10, /obj/item/attachable/reflex/upp, null, VENDOR_ITEM_REGULAR), list("Suppressor", 10, /obj/item/attachable/suppressor, null, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 10, /obj/item/attachable/verticalgrip/union, null, VENDOR_ITEM_REGULAR), + list("Vertical Grip", 10, /obj/item/attachable/verticalgrip/upp, null, VENDOR_ITEM_REGULAR), list("EXPLOSIVES", 0, null, null, null), list("Plastic Explosive", 5, /obj/item/explosive/plastic, null, VENDOR_ITEM_REGULAR), @@ -1826,13 +1826,13 @@ list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), - list("Angled Grip", 0, /obj/item/attachable/angledgrip/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Angled Grip", 0, /obj/item/attachable/angledgrip/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Extended Barrel", 0, /obj/item/attachable/extended_barrel, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Laser Sight", 0, /obj/item/attachable/lasersight/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 0, /obj/item/attachable/reddot/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 0, /obj/item/attachable/reflex/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Laser Sight", 0, /obj/item/attachable/lasersight/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Red-Dot Sight", 0, /obj/item/attachable/reddot/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Reflex Sight", 0, /obj/item/attachable/reflex/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Suppressor", 0, /obj/item/attachable/suppressor, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 0, /obj/item/attachable/verticalgrip/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Vertical Grip", 0, /obj/item/attachable/verticalgrip/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("MASK (CHOOSE 1)", 0, null, null, null), list("Gas Mask", 0, /obj/item/clothing/mask/gas/pmc/upp, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), @@ -1877,13 +1877,13 @@ list("Type 71 HEAP Magazine (5.45x39mm)", 10, /obj/item/ammo_magazine/rifle/type71/heap , null, VENDOR_ITEM_REGULAR), list("ATTACHMENTS", 0, null, null, null), - list("Angled Grip", 10, /obj/item/attachable/angledgrip/union, null, VENDOR_ITEM_REGULAR), + list("Angled Grip", 10, /obj/item/attachable/angledgrip/upp, null, VENDOR_ITEM_REGULAR), list("Extended Barrel", 10, /obj/item/attachable/extended_barrel, null, VENDOR_ITEM_REGULAR), - list("Laser Sight", 10, /obj/item/attachable/lasersight/union, null, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 10, /obj/item/attachable/reddot/union, null, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 10, /obj/item/attachable/reflex/union, null, VENDOR_ITEM_REGULAR), + list("Laser Sight", 10, /obj/item/attachable/lasersight/upp, null, VENDOR_ITEM_REGULAR), + list("Red-Dot Sight", 10, /obj/item/attachable/reddot/upp, null, VENDOR_ITEM_REGULAR), + list("Reflex Sight", 10, /obj/item/attachable/reflex/upp, null, VENDOR_ITEM_REGULAR), list("Suppressor", 10, /obj/item/attachable/suppressor, null, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 10, /obj/item/attachable/verticalgrip/union, null, VENDOR_ITEM_REGULAR), + list("Vertical Grip", 10, /obj/item/attachable/verticalgrip/upp, null, VENDOR_ITEM_REGULAR), list("EXPLOSIVES", 0, null, null, null), list("Plastic Explosive", 5, /obj/item/explosive/plastic, null, VENDOR_ITEM_REGULAR), @@ -1987,13 +1987,13 @@ list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), - list("Angled Grip", 0, /obj/item/attachable/angledgrip/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Angled Grip", 0, /obj/item/attachable/angledgrip/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Extended Barrel", 0, /obj/item/attachable/extended_barrel, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Laser Sight", 0, /obj/item/attachable/lasersight/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 0, /obj/item/attachable/reddot/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 0, /obj/item/attachable/reflex/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Laser Sight", 0, /obj/item/attachable/lasersight/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Red-Dot Sight", 0, /obj/item/attachable/reddot/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Reflex Sight", 0, /obj/item/attachable/reflex/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Suppressor", 0, /obj/item/attachable/suppressor, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 0, /obj/item/attachable/verticalgrip/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Vertical Grip", 0, /obj/item/attachable/verticalgrip/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("MASK (CHOOSE 1)", 0, null, null, null), list("Gas Mask", 0, /obj/item/clothing/mask/gas/pmc/upp, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), @@ -2038,13 +2038,13 @@ list("Type 71 HEAP Magazine (5.45x39mm)", 10, /obj/item/ammo_magazine/rifle/type71/heap , null, VENDOR_ITEM_REGULAR), list("ATTACHMENTS", 0, null, null, null), - list("Angled Grip", 10, /obj/item/attachable/angledgrip/union, null, VENDOR_ITEM_REGULAR), + list("Angled Grip", 10, /obj/item/attachable/angledgrip/upp, null, VENDOR_ITEM_REGULAR), list("Extended Barrel", 10, /obj/item/attachable/extended_barrel, null, VENDOR_ITEM_REGULAR), - list("Laser Sight", 10, /obj/item/attachable/lasersight/union, null, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 10, /obj/item/attachable/reddot/union, null, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 10, /obj/item/attachable/reflex/union, null, VENDOR_ITEM_REGULAR), + list("Laser Sight", 10, /obj/item/attachable/lasersight/upp, null, VENDOR_ITEM_REGULAR), + list("Red-Dot Sight", 10, /obj/item/attachable/reddot/upp, null, VENDOR_ITEM_REGULAR), + list("Reflex Sight", 10, /obj/item/attachable/reflex/upp, null, VENDOR_ITEM_REGULAR), list("Suppressor", 10, /obj/item/attachable/suppressor, null, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 10, /obj/item/attachable/verticalgrip/union, null, VENDOR_ITEM_REGULAR), + list("Vertical Grip", 10, /obj/item/attachable/verticalgrip/upp, null, VENDOR_ITEM_REGULAR), list("EXPLOSIVES", 0, null, null, null), list("Plastic Explosive", 5, /obj/item/explosive/plastic, null, VENDOR_ITEM_REGULAR), @@ -2148,13 +2148,13 @@ list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), - list("Angled Grip", 0, /obj/item/attachable/angledgrip/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Angled Grip", 0, /obj/item/attachable/angledgrip/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Extended Barrel", 0, /obj/item/attachable/extended_barrel, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Laser Sight", 0, /obj/item/attachable/lasersight/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 0, /obj/item/attachable/reddot/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 0, /obj/item/attachable/reflex/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Laser Sight", 0, /obj/item/attachable/lasersight/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Red-Dot Sight", 0, /obj/item/attachable/reddot/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Reflex Sight", 0, /obj/item/attachable/reflex/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Suppressor", 0, /obj/item/attachable/suppressor, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 0, /obj/item/attachable/verticalgrip/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Vertical Grip", 0, /obj/item/attachable/verticalgrip/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("MASK (CHOOSE 1)", 0, null, null, null), list("Gas Mask", 0, /obj/item/clothing/mask/gas/pmc/upp, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), @@ -2199,13 +2199,13 @@ list("Type 71 HEAP Magazine (5.45x39mm)", 10, /obj/item/ammo_magazine/rifle/type71/heap , null, VENDOR_ITEM_REGULAR), list("ATTACHMENTS", 0, null, null, null), - list("Angled Grip", 10, /obj/item/attachable/angledgrip/union, null, VENDOR_ITEM_REGULAR), + list("Angled Grip", 10, /obj/item/attachable/angledgrip/upp, null, VENDOR_ITEM_REGULAR), list("Extended Barrel", 10, /obj/item/attachable/extended_barrel, null, VENDOR_ITEM_REGULAR), - list("Laser Sight", 10, /obj/item/attachable/lasersight/union, null, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 10, /obj/item/attachable/reddot/union, null, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 10, /obj/item/attachable/reflex/union, null, VENDOR_ITEM_REGULAR), + list("Laser Sight", 10, /obj/item/attachable/lasersight/upp, null, VENDOR_ITEM_REGULAR), + list("Red-Dot Sight", 10, /obj/item/attachable/reddot/upp, null, VENDOR_ITEM_REGULAR), + list("Reflex Sight", 10, /obj/item/attachable/reflex/upp, null, VENDOR_ITEM_REGULAR), list("Suppressor", 10, /obj/item/attachable/suppressor, null, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 10, /obj/item/attachable/verticalgrip/union, null, VENDOR_ITEM_REGULAR), + list("Vertical Grip", 10, /obj/item/attachable/verticalgrip/upp, null, VENDOR_ITEM_REGULAR), list("EXPLOSIVES", 0, null, null, null), list("Plastic Explosive", 5, /obj/item/explosive/plastic, null, VENDOR_ITEM_REGULAR), @@ -2309,13 +2309,13 @@ list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), - list("Angled Grip", 0, /obj/item/attachable/angledgrip/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Angled Grip", 0, /obj/item/attachable/angledgrip/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Extended Barrel", 0, /obj/item/attachable/extended_barrel, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Laser Sight", 0, /obj/item/attachable/lasersight/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 0, /obj/item/attachable/reddot/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 0, /obj/item/attachable/reflex/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Laser Sight", 0, /obj/item/attachable/lasersight/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Red-Dot Sight", 0, /obj/item/attachable/reddot/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Reflex Sight", 0, /obj/item/attachable/reflex/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Suppressor", 0, /obj/item/attachable/suppressor, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 0, /obj/item/attachable/verticalgrip/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Vertical Grip", 0, /obj/item/attachable/verticalgrip/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("MASK (CHOOSE 1)", 0, null, null, null), list("Gas Mask", 0, /obj/item/clothing/mask/gas/pmc/upp, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), @@ -2360,13 +2360,13 @@ list("Type 71 HEAP Magazine (5.45x39mm)", 10, /obj/item/ammo_magazine/rifle/type71/heap , null, VENDOR_ITEM_REGULAR), list("ATTACHMENTS", 0, null, null, null), - list("Angled Grip", 10, /obj/item/attachable/angledgrip/union, null, VENDOR_ITEM_REGULAR), + list("Angled Grip", 10, /obj/item/attachable/angledgrip/upp, null, VENDOR_ITEM_REGULAR), list("Extended Barrel", 10, /obj/item/attachable/extended_barrel, null, VENDOR_ITEM_REGULAR), - list("Laser Sight", 10, /obj/item/attachable/lasersight/union, null, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 10, /obj/item/attachable/reddot/union, null, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 10, /obj/item/attachable/reflex/union, null, VENDOR_ITEM_REGULAR), + list("Laser Sight", 10, /obj/item/attachable/lasersight/upp, null, VENDOR_ITEM_REGULAR), + list("Red-Dot Sight", 10, /obj/item/attachable/reddot/upp, null, VENDOR_ITEM_REGULAR), + list("Reflex Sight", 10, /obj/item/attachable/reflex/upp, null, VENDOR_ITEM_REGULAR), list("Suppressor", 10, /obj/item/attachable/suppressor, null, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 10, /obj/item/attachable/verticalgrip/union, null, VENDOR_ITEM_REGULAR), + list("Vertical Grip", 10, /obj/item/attachable/verticalgrip/upp, null, VENDOR_ITEM_REGULAR), list("EXPLOSIVES", 0, null, null, null), list("Plastic Explosive", 5, /obj/item/explosive/plastic, null, VENDOR_ITEM_REGULAR), @@ -2470,13 +2470,13 @@ list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), - list("Angled Grip", 0, /obj/item/attachable/angledgrip/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Angled Grip", 0, /obj/item/attachable/angledgrip/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Extended Barrel", 0, /obj/item/attachable/extended_barrel, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Laser Sight", 0, /obj/item/attachable/lasersight/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 0, /obj/item/attachable/reddot/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 0, /obj/item/attachable/reflex/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Laser Sight", 0, /obj/item/attachable/lasersight/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Red-Dot Sight", 0, /obj/item/attachable/reddot/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Reflex Sight", 0, /obj/item/attachable/reflex/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Suppressor", 0, /obj/item/attachable/suppressor, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 0, /obj/item/attachable/verticalgrip/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Vertical Grip", 0, /obj/item/attachable/verticalgrip/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("MASK (CHOOSE 1)", 0, null, null, null), list("Gas Mask", 0, /obj/item/clothing/mask/gas/pmc/upp, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), @@ -2521,13 +2521,13 @@ list("Type 71 HEAP Magazine (5.45x39mm)", 10, /obj/item/ammo_magazine/rifle/type71/heap , null, VENDOR_ITEM_REGULAR), list("ATTACHMENTS", 0, null, null, null), - list("Angled Grip", 10, /obj/item/attachable/angledgrip/union, null, VENDOR_ITEM_REGULAR), + list("Angled Grip", 10, /obj/item/attachable/angledgrip/upp, null, VENDOR_ITEM_REGULAR), list("Extended Barrel", 10, /obj/item/attachable/extended_barrel, null, VENDOR_ITEM_REGULAR), - list("Laser Sight", 10, /obj/item/attachable/lasersight/union, null, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 10, /obj/item/attachable/reddot/union, null, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 10, /obj/item/attachable/reflex/union, null, VENDOR_ITEM_REGULAR), + list("Laser Sight", 10, /obj/item/attachable/lasersight/upp, null, VENDOR_ITEM_REGULAR), + list("Red-Dot Sight", 10, /obj/item/attachable/reddot/upp, null, VENDOR_ITEM_REGULAR), + list("Reflex Sight", 10, /obj/item/attachable/reflex/upp, null, VENDOR_ITEM_REGULAR), list("Suppressor", 10, /obj/item/attachable/suppressor, null, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 10, /obj/item/attachable/verticalgrip/union, null, VENDOR_ITEM_REGULAR), + list("Vertical Grip", 10, /obj/item/attachable/verticalgrip/upp, null, VENDOR_ITEM_REGULAR), list("EXPLOSIVES", 0, null, null, null), list("Plastic Explosive", 5, /obj/item/explosive/plastic, null, VENDOR_ITEM_REGULAR), @@ -2877,7 +2877,7 @@ list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), - list("Laser Sight", 0, /obj/item/attachable/lasersight/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Laser Sight", 0, /obj/item/attachable/lasersight/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("MASK (CHOOSE 1)", 0, null, null, null), list("Tactical Bandana", 0, /obj/item/clothing/mask/rebreather/scarf/tacticalmask/green, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR) @@ -2981,13 +2981,13 @@ list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), - list("Angled Grip", 0, /obj/item/attachable/angledgrip/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Angled Grip", 0, /obj/item/attachable/angledgrip/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Extended Barrel", 0, /obj/item/attachable/extended_barrel, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Laser Sight", 0, /obj/item/attachable/lasersight/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 0, /obj/item/attachable/reddot/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 0, /obj/item/attachable/reflex/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Laser Sight", 0, /obj/item/attachable/lasersight/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Red-Dot Sight", 0, /obj/item/attachable/reddot/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Reflex Sight", 0, /obj/item/attachable/reflex/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Suppressor", 0, /obj/item/attachable/suppressor, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 0, /obj/item/attachable/verticalgrip/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Vertical Grip", 0, /obj/item/attachable/verticalgrip/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("MASK (CHOOSE 1)", 0, null, null, null), list("Gas Mask", 0, /obj/item/clothing/mask/gas, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), @@ -3004,13 +3004,13 @@ list("Type 71 HEAP Magazine (5.45x39mm)", 10, /obj/item/ammo_magazine/rifle/type71/heap , null, VENDOR_ITEM_REGULAR), list("ATTACHMENTS", 0, null, null, null), - list("Angled Grip", 10, /obj/item/attachable/angledgrip/union, null, VENDOR_ITEM_REGULAR), + list("Angled Grip", 10, /obj/item/attachable/angledgrip/upp, null, VENDOR_ITEM_REGULAR), list("Extended Barrel", 10, /obj/item/attachable/extended_barrel, null, VENDOR_ITEM_REGULAR), - list("Laser Sight", 10, /obj/item/attachable/lasersight/union, null, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 10, /obj/item/attachable/reddot/union, null, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 10, /obj/item/attachable/reflex/union, null, VENDOR_ITEM_REGULAR), + list("Laser Sight", 10, /obj/item/attachable/lasersight/upp, null, VENDOR_ITEM_REGULAR), + list("Red-Dot Sight", 10, /obj/item/attachable/reddot/upp, null, VENDOR_ITEM_REGULAR), + list("Reflex Sight", 10, /obj/item/attachable/reflex/upp, null, VENDOR_ITEM_REGULAR), list("Suppressor", 10, /obj/item/attachable/suppressor, null, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 10, /obj/item/attachable/verticalgrip/union, null, VENDOR_ITEM_REGULAR), + list("Vertical Grip", 10, /obj/item/attachable/verticalgrip/upp, null, VENDOR_ITEM_REGULAR), list("EXPLOSIVES", 0, null, null, null), list("Smoke Grenade", 5, /obj/item/explosive/grenade/smokebomb, null, VENDOR_ITEM_REGULAR), @@ -3114,13 +3114,13 @@ list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), - list("Angled Grip", 0, /obj/item/attachable/angledgrip/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Angled Grip", 0, /obj/item/attachable/angledgrip/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Extended Barrel", 0, /obj/item/attachable/extended_barrel, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Laser Sight", 0, /obj/item/attachable/lasersight/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 0, /obj/item/attachable/reddot/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 0, /obj/item/attachable/reflex/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Laser Sight", 0, /obj/item/attachable/lasersight/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Red-Dot Sight", 0, /obj/item/attachable/reddot/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Reflex Sight", 0, /obj/item/attachable/reflex/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Suppressor", 0, /obj/item/attachable/suppressor, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 0, /obj/item/attachable/verticalgrip/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Vertical Grip", 0, /obj/item/attachable/verticalgrip/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("MASK (CHOOSE 1)", 0, null, null, null), list("Gas Mask", 0, /obj/item/clothing/mask/gas, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), @@ -3174,13 +3174,13 @@ list("Type 71 HEAP Magazine (5.45x39mm)", 10, /obj/item/ammo_magazine/rifle/type71/heap , null, VENDOR_ITEM_REGULAR), list("ATTACHMENTS", 0, null, null, null), - list("Angled Grip", 10, /obj/item/attachable/angledgrip/union, null, VENDOR_ITEM_REGULAR), + list("Angled Grip", 10, /obj/item/attachable/angledgrip/upp, null, VENDOR_ITEM_REGULAR), list("Extended Barrel", 10, /obj/item/attachable/extended_barrel, null, VENDOR_ITEM_REGULAR), - list("Laser Sight", 10, /obj/item/attachable/lasersight/union, null, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 10, /obj/item/attachable/reddot/union, null, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 10, /obj/item/attachable/reflex/union, null, VENDOR_ITEM_REGULAR), + list("Laser Sight", 10, /obj/item/attachable/lasersight/upp, null, VENDOR_ITEM_REGULAR), + list("Red-Dot Sight", 10, /obj/item/attachable/reddot/upp, null, VENDOR_ITEM_REGULAR), + list("Reflex Sight", 10, /obj/item/attachable/reflex/upp, null, VENDOR_ITEM_REGULAR), list("Suppressor", 10, /obj/item/attachable/suppressor, null, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 10, /obj/item/attachable/verticalgrip/union, null, VENDOR_ITEM_REGULAR), + list("Vertical Grip", 10, /obj/item/attachable/verticalgrip/upp, null, VENDOR_ITEM_REGULAR), list("EXPLOSIVES", 0, null, null, null), list("Smoke Grenade", 5, /obj/item/explosive/grenade/smokebomb, null, VENDOR_ITEM_REGULAR), @@ -3276,13 +3276,13 @@ list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), - list("Angled Grip", 0, /obj/item/attachable/angledgrip/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Angled Grip", 0, /obj/item/attachable/angledgrip/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Extended Barrel", 0, /obj/item/attachable/extended_barrel, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Laser Sight", 0, /obj/item/attachable/lasersight/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 0, /obj/item/attachable/reddot/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 0, /obj/item/attachable/reflex/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Laser Sight", 0, /obj/item/attachable/lasersight/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Red-Dot Sight", 0, /obj/item/attachable/reddot/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Reflex Sight", 0, /obj/item/attachable/reflex/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Suppressor", 0, /obj/item/attachable/suppressor, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 0, /obj/item/attachable/verticalgrip/union, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("Vertical Grip", 0, /obj/item/attachable/verticalgrip/upp, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("MASK (CHOOSE 1)", 0, null, null, null), list("Gas Mask", 0, /obj/item/clothing/mask/gas, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), @@ -3327,13 +3327,13 @@ list("Type 71 HEAP Magazine (5.45x39mm)", 10, /obj/item/ammo_magazine/rifle/type71/heap , null, VENDOR_ITEM_REGULAR), list("ATTACHMENTS", 0, null, null, null), - list("Angled Grip", 10, /obj/item/attachable/angledgrip/union, null, VENDOR_ITEM_REGULAR), + list("Angled Grip", 10, /obj/item/attachable/angledgrip/upp, null, VENDOR_ITEM_REGULAR), list("Extended Barrel", 10, /obj/item/attachable/extended_barrel, null, VENDOR_ITEM_REGULAR), - list("Laser Sight", 10, /obj/item/attachable/lasersight/union, null, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 10, /obj/item/attachable/reddot/union, null, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 10, /obj/item/attachable/reflex/union, null, VENDOR_ITEM_REGULAR), + list("Laser Sight", 10, /obj/item/attachable/lasersight/upp, null, VENDOR_ITEM_REGULAR), + list("Red-Dot Sight", 10, /obj/item/attachable/reddot/upp, null, VENDOR_ITEM_REGULAR), + list("Reflex Sight", 10, /obj/item/attachable/reflex/upp, null, VENDOR_ITEM_REGULAR), list("Suppressor", 10, /obj/item/attachable/suppressor, null, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 10, /obj/item/attachable/verticalgrip/union, null, VENDOR_ITEM_REGULAR), + list("Vertical Grip", 10, /obj/item/attachable/verticalgrip/upp, null, VENDOR_ITEM_REGULAR), list("EXPLOSIVES", 0, null, null, null), list("Plastic Explosive", 5, /obj/item/explosive/plastic, null, VENDOR_ITEM_REGULAR), @@ -3530,19 +3530,19 @@ list("Heat Absorbent Coif", 0, /obj/item/clothing/mask/rebreather/scarf, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), list("ATTACHMENTS", 0, null, null, null), - list("Angled Grip", 10, /obj/item/attachable/angledgrip/union, null, VENDOR_ITEM_REGULAR), + list("Angled Grip", 10, /obj/item/attachable/angledgrip/upp, null, VENDOR_ITEM_REGULAR), list("Extended Barrel", 10, /obj/item/attachable/extended_barrel, null, VENDOR_ITEM_REGULAR), list("Gyroscopic Stabilizer", 10, /obj/item/attachable/gyro, null, VENDOR_ITEM_REGULAR), - list("Laser Sight", 10, /obj/item/attachable/lasersight/union, null, VENDOR_ITEM_REGULAR), + list("Laser Sight", 10, /obj/item/attachable/lasersight/upp, null, VENDOR_ITEM_REGULAR), list("Masterkey Shotgun", 10, /obj/item/attachable/attached_gun/shotgun, null, VENDOR_ITEM_REGULAR), list("M37 Wooden Stock", 10, /obj/item/attachable/stock/shotgun, null, VENDOR_ITEM_REGULAR), list("M39 Stock", 10, /obj/item/attachable/stock/smg, null, VENDOR_ITEM_REGULAR), list("M41A Solid Stock", 10, /obj/item/attachable/stock/rifle, null, VENDOR_ITEM_REGULAR), list("Recoil Compensator", 10, /obj/item/attachable/compensator, null, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 10, /obj/item/attachable/reddot/union, null, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 10, /obj/item/attachable/reflex/union, null, VENDOR_ITEM_REGULAR), + list("Red-Dot Sight", 10, /obj/item/attachable/reddot/upp, null, VENDOR_ITEM_REGULAR), + list("Reflex Sight", 10, /obj/item/attachable/reflex/upp, null, VENDOR_ITEM_REGULAR), list("Suppressor", 10, /obj/item/attachable/suppressor, null, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 10, /obj/item/attachable/verticalgrip/union, null, VENDOR_ITEM_REGULAR), + list("Vertical Grip", 10, /obj/item/attachable/verticalgrip/upp, null, VENDOR_ITEM_REGULAR), list("UTILITIES", 0, null, null, null), list("Fire Extinguisher (Portable)", 5, /obj/item/tool/extinguisher/mini, null, VENDOR_ITEM_REGULAR), diff --git a/code/modules/projectiles/gun_attachables.dm b/code/modules/projectiles/gun_attachables.dm index 43dc8282c6..5e4f741ff0 100644 --- a/code/modules/projectiles/gun_attachables.dm +++ b/code/modules/projectiles/gun_attachables.dm @@ -625,7 +625,7 @@ Defined in conflicts.dm of the #defines folder. accuracy_unwielded_mod = HIT_ACCURACY_MULT_TIER_1 movement_onehanded_acc_penalty_mod = MOVEMENT_ACCURACY_PENALTY_MULT_TIER_5 -/obj/item/attachable/reddot/union +/obj/item/attachable/reddot/upp name = "EKP-9-M Red Dot Sight" desc = "Cutting edge UPP sight with automated reticle correction for a fixed zero point. Increases accuracy significantly." @@ -645,7 +645,7 @@ Defined in conflicts.dm of the #defines folder. burst_scatter_mod = -1 movement_onehanded_acc_penalty_mod = MOVEMENT_ACCURACY_PENALTY_MULT_TIER_5 -/obj/item/attachable/reflex/union +/obj/item/attachable/reflex/upp name = "PK-12 Reflex Sight" desc = "Reflector type gunsight compatible with most standard issue UPP firearms. Durable but the power supply is notoriously unreliable. Reduces scatter significantly and boosts accuracy slightly." @@ -811,7 +811,7 @@ Defined in conflicts.dm of the #defines folder. to_chat(user, SPAN_NOTICE("Hold on there cowboy, that grip is bolted on. You are unable to modify it.")) return -/obj/item/attachable/flashlight/grip/union +/obj/item/attachable/flashlight/grip/upp name = "RK-5A Flashlight Grip" desc = "Folding grip with an integrated flashlight. Reduces recoil and scatter marginally, boosts accuracy slightly. \nStatistically udentical to the underbarrel flashlight grip." @@ -997,7 +997,7 @@ Defined in conflicts.dm of the #defines folder. #define ZOOM_LEVEL_2X 0 #define ZOOM_LEVEL_4X 1 -/obj/item/attachable/scope/union +/obj/item/attachable/scope/upp name = "PO-M 4x Optic" desc = "Old fashioned 4x scope. Sturdy, but a little unergonomic. UPP tradition. Reduces RoF and increases wield time. Major accuracy bonus when scoped." @@ -1106,7 +1106,7 @@ Defined in conflicts.dm of the #defines folder. G.slowdown -= dynamic_aim_slowdown ..() -/obj/item/attachable/scope/mini/union +/obj/item/attachable/scope/mini/upp name = "1P93 2x Optic" desc = "Mild update of a 2159 UPP design. Holds zero in all conditions, antiglint grid prevents glare, but the reticle is unfortunately cluttered and busy. Reduces RoF and increases wield time, boosts accuracy while scoped." @@ -3204,7 +3204,7 @@ Defined in conflicts.dm of the #defines folder. accuracy_unwielded_mod = -HIT_ACCURACY_MULT_TIER_3 scatter_unwielded_mod = SCATTER_AMOUNT_TIER_10 -/obj/item/attachable/verticalgrip/union +/obj/item/attachable/verticalgrip/upp name = "RK-5 Vertical Grip" desc = "Sturdy grip positioned at optimal place offers enhanced stability in rapid fire. Increases weapon size, penalizes one handed fire, improves scatter and accuracy while wielded." @@ -3219,7 +3219,7 @@ Defined in conflicts.dm of the #defines folder. slot = "under" pixel_shift_x = 20 -/obj/item/attachable/angledgrip/union +/obj/item/attachable/angledgrip/upp name = "RK-9 Angled Grip" desc = "Ergonomic grip decreases time for shouldering the weapon. Increases weapon size, accelerates wield speed." @@ -3266,7 +3266,7 @@ Defined in conflicts.dm of the #defines folder. scatter_unwielded_mod = -SCATTER_AMOUNT_TIER_9 accuracy_unwielded_mod = HIT_ACCURACY_MULT_TIER_1 -/obj/item/attachable/lasersight/union +/obj/item/attachable/lasersight/upp name = "Zvezda Laser Module" desc = "Visible band 512nm green laser, compatible with NVG and IR. Bears striking resemblance to an old Weyland Yutani offering... Decreases scatter, especially onehanded, slightly boosts accuracy. " icon = 'icons/obj/items/weapons/guns/attachments/under.dmi' diff --git a/code/modules/projectiles/guns/rifles.dm b/code/modules/projectiles/guns/rifles.dm index 4b017e86a5..e0f481a7e4 100644 --- a/code/modules/projectiles/guns/rifles.dm +++ b/code/modules/projectiles/guns/rifles.dm @@ -1302,24 +1302,24 @@ /obj/item/attachable/flashlight, // Rail /obj/item/attachable/magnetic_harness, /obj/item/attachable/scope, - /obj/item/attachable/scope/union, + /obj/item/attachable/scope/upp, /obj/item/attachable/scope/mini, - /obj/item/attachable/scope/mini/union, + /obj/item/attachable/scope/mini/upp, /obj/item/attachable/reddot, - /obj/item/attachable/reddot/union, + /obj/item/attachable/reddot/upp, /obj/item/attachable/reflex, - /obj/item/attachable/reflex/union, + /obj/item/attachable/reflex/upp, /obj/item/attachable/suppressor, // Muzzle /obj/item/attachable/bayonet, /obj/item/attachable/bayonet/upp, /obj/item/attachable/extended_barrel, /obj/item/attachable/heavy_barrel, /obj/item/attachable/verticalgrip, // Underbarrel - /obj/item/attachable/verticalgrip/union, + /obj/item/attachable/verticalgrip/upp, /obj/item/attachable/flashlight/grip, - /obj/item/attachable/flashlight/grip/union, + /obj/item/attachable/flashlight/grip/upp, /obj/item/attachable/lasersight, - /obj/item/attachable/lasersight/union, + /obj/item/attachable/lasersight/upp, /obj/item/attachable/burstfire_assembly, /obj/item/attachable/attached_gun/flamer, /obj/item/attachable/attached_gun/flamer/advanced, @@ -1362,7 +1362,7 @@ random_spawn_chance = 100 random_rail_chance = 70 random_spawn_rail = list( - /obj/item/attachable/reflex/union, + /obj/item/attachable/reflex/upp, /obj/item/attachable/flashlight, ) random_muzzle_chance = 100 @@ -1371,14 +1371,14 @@ ) random_under_chance = 40 random_spawn_under = list( - /obj/item/attachable/verticalgrip/union, + /obj/item/attachable/verticalgrip/upp, ) /obj/item/weapon/gun/rifle/type71/dual random_spawn_chance = 100 random_rail_chance = 70 random_spawn_rail = list( - /obj/item/attachable/reflex/union, + /obj/item/attachable/reflex/upp, /obj/item/attachable/flashlight, ) random_muzzle_chance = 100 @@ -1387,8 +1387,8 @@ ) random_under_chance = 40 random_spawn_under = list( - /obj/item/attachable/lasersight/union, - /obj/item/attachable/verticalgrip/union, + /obj/item/attachable/lasersight/upp, + /obj/item/attachable/verticalgrip/upp, ) /obj/item/weapon/gun/rifle/type71/sapper @@ -1396,7 +1396,7 @@ random_spawn_chance = 100 random_rail_chance = 80 random_spawn_rail = list( - /obj/item/attachable/reflex/union, + /obj/item/attachable/reflex/upp, /obj/item/attachable/flashlight, /obj/item/attachable/magnetic_harness, ) @@ -1417,12 +1417,12 @@ /obj/item/attachable/flashlight, // Rail /obj/item/attachable/magnetic_harness, /obj/item/attachable/scope, - /obj/item/attachable/scope/union, + /obj/item/attachable/scope/upp, /obj/item/attachable/scope/mini, - /obj/item/attachable/scope/mini/union, - /obj/item/attachable/reddot/union, + /obj/item/attachable/scope/mini/upp, + /obj/item/attachable/reddot/upp, /obj/item/attachable/reflex, - /obj/item/attachable/reflex/union, + /obj/item/attachable/reflex/upp, /obj/item/attachable/suppressor, // Muzzle /obj/item/attachable/bayonet, /obj/item/attachable/bayonet/upp, @@ -1441,10 +1441,10 @@ random_spawn_chance = 100 random_rail_chance = 100 random_spawn_rail = list( - /obj/item/attachable/reflex/union, + /obj/item/attachable/reflex/upp, /obj/item/attachable/flashlight, /obj/item/attachable/magnetic_harness, - /obj/item/attachable/scope/mini/union, + /obj/item/attachable/scope/mini/upp, ) random_muzzle_chance = 100 random_spawn_muzzle = list( @@ -1464,20 +1464,20 @@ /obj/item/attachable/flashlight, // Rail /obj/item/attachable/magnetic_harness, /obj/item/attachable/scope, - /obj/item/attachable/scope/union, + /obj/item/attachable/scope/upp, /obj/item/attachable/scope/mini, - /obj/item/attachable/scope/mini/union, + /obj/item/attachable/scope/mini/upp, /obj/item/attachable/reddot, - /obj/item/attachable/reddot/union, + /obj/item/attachable/reddot/upp, /obj/item/attachable/reflex, - /obj/item/attachable/reflex/union, + /obj/item/attachable/reflex/upp, /obj/item/attachable/suppressor, // Muzzle /obj/item/attachable/bayonet, /obj/item/attachable/bayonet/upp, /obj/item/attachable/extended_barrel, /obj/item/attachable/heavy_barrel, /obj/item/attachable/verticalgrip, // Underbarrel - /obj/item/attachable/verticalgrip/union, + /obj/item/attachable/verticalgrip/upp, /obj/item/attachable/burstfire_assembly, ) @@ -1500,7 +1500,7 @@ random_spawn_chance = 100 random_rail_chance = 70 random_spawn_rail = list( - /obj/item/attachable/reflex/union, + /obj/item/attachable/reflex/upp, /obj/item/attachable/flashlight, ) random_muzzle_chance = 100 @@ -1509,7 +1509,7 @@ ) random_under_chance = 40 random_spawn_under = list( - /obj/item/attachable/verticalgrip/union, + /obj/item/attachable/verticalgrip/upp, ) /obj/item/weapon/gun/rifle/type71/carbine/commando @@ -1524,7 +1524,7 @@ current_mag = /obj/item/ammo_magazine/rifle/type71/ap attachable_allowed = list( /obj/item/attachable/verticalgrip, - /obj/item/attachable/verticalgrip/union, + /obj/item/attachable/verticalgrip/upp, ) random_spawn_chance = 0 random_spawn_rail = list() diff --git a/code/modules/projectiles/guns/shotguns.dm b/code/modules/projectiles/guns/shotguns.dm index b69c98772c..a705861f98 100644 --- a/code/modules/projectiles/guns/shotguns.dm +++ b/code/modules/projectiles/guns/shotguns.dm @@ -374,18 +374,18 @@ can cause issues with ammo types getting mixed up during the burst. current_mag = /obj/item/ammo_magazine/internal/shotgun/type23 attachable_allowed = list( /obj/item/attachable/reddot, // Rail - /obj/item/attachable/reddot/union, + /obj/item/attachable/reddot/upp, /obj/item/attachable/reflex, - /obj/item/attachable/reflex/union, + /obj/item/attachable/reflex/upp, /obj/item/attachable/flashlight, /obj/item/attachable/magnetic_harness, /obj/item/attachable/bayonet, // Muzzle /obj/item/attachable/heavy_barrel, /obj/item/attachable/bayonet/upp, /obj/item/attachable/verticalgrip, // Underbarrel - /obj/item/attachable/verticalgrip/union, + /obj/item/attachable/verticalgrip/upp, /obj/item/attachable/flashlight/grip, - /obj/item/attachable/flashlight/grip/union, + /obj/item/attachable/flashlight/grip/upp, /obj/item/attachable/attached_gun/flamer, /obj/item/attachable/attached_gun/flamer/advanced, /obj/item/attachable/attached_gun/extinguisher, @@ -425,7 +425,7 @@ can cause issues with ammo types getting mixed up during the burst. ) random_under_chance = 40 random_spawn_under = list( - /obj/item/attachable/verticalgrip/union, + /obj/item/attachable/verticalgrip/upp, ) /obj/item/weapon/gun/shotgun/type23/breacher/slug @@ -448,7 +448,7 @@ can cause issues with ammo types getting mixed up during the burst. random_under_chance = 100 random_spawn_under = list( /obj/item/attachable/flashlight/grip, - /obj/item/attachable/verticalgrip/union, + /obj/item/attachable/verticalgrip/upp, ) /obj/item/weapon/gun/shotgun/type23/dragon @@ -474,13 +474,13 @@ can cause issues with ammo types getting mixed up during the burst. current_mag = /obj/item/ammo_magazine/internal/shotgun/type23/beanbag attachable_allowed = list( /obj/item/attachable/reddot, //Rail - /obj/item/attachable/reddot/union, + /obj/item/attachable/reddot/upp, /obj/item/attachable/reflex, - /obj/item/attachable/reflex/union, + /obj/item/attachable/reflex/upp, /obj/item/attachable/flashlight, /obj/item/attachable/magnetic_harness, /obj/item/attachable/verticalgrip, //Underbarrel - /obj/item/attachable/verticalgrip/union, + /obj/item/attachable/verticalgrip/upp, /obj/item/attachable/stock/type23, //Stock ) flags_gun_features = GUN_CAN_POINTBLANK|GUN_AMMO_COUNTER|GUN_INTERNAL_MAG diff --git a/code/modules/projectiles/guns/specialist/sniper.dm b/code/modules/projectiles/guns/specialist/sniper.dm index 763ebfac4c..b9db1ab6a4 100644 --- a/code/modules/projectiles/guns/specialist/sniper.dm +++ b/code/modules/projectiles/guns/specialist/sniper.dm @@ -473,7 +473,7 @@ /obj/item/attachable/bayonet/upp, //Under, /obj/item/attachable/verticalgrip, - /obj/item/attachable/verticalgrip/union, + /obj/item/attachable/verticalgrip/upp, /obj/item/attachable/bipod, //Integrated, /obj/item/attachable/type88_barrel, From 3e3e1fcb02b0b0dd26431e9288dddb3f76d198b6 Mon Sep 17 00:00:00 2001 From: KoishiVibe <111302138+KoishiVibe@users.noreply.github.com> Date: Sun, 11 Aug 2024 02:23:56 -0500 Subject: [PATCH 14/15] commits DMC suggestion Co-authored-by: Doubleumc --- code/modules/projectiles/gun_attachables.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/projectiles/gun_attachables.dm b/code/modules/projectiles/gun_attachables.dm index 5e4f741ff0..0c6da6f973 100644 --- a/code/modules/projectiles/gun_attachables.dm +++ b/code/modules/projectiles/gun_attachables.dm @@ -3270,8 +3270,8 @@ Defined in conflicts.dm of the #defines folder. name = "Zvezda Laser Module" desc = "Visible band 512nm green laser, compatible with NVG and IR. Bears striking resemblance to an old Weyland Yutani offering... Decreases scatter, especially onehanded, slightly boosts accuracy. " icon = 'icons/obj/items/weapons/guns/attachments/under.dmi' - icon_state = "lasersight_union" - attach_icon = "lasersight_union_a" + icon_state = "lasersight_upp" + attach_icon = "lasersight_upp_a" pixel_shift_x = 15 pixel_shift_y = 18 From a66247728b992b04a25539cb8c9252ba669bd2e4 Mon Sep 17 00:00:00 2001 From: Steeclad Cat Date: Tue, 13 Aug 2024 01:26:29 -0500 Subject: [PATCH 15/15] we did it, we fixed the one shitty bug. also --- .../items/weapons/guns/attachments/under.dmi | Bin 15088 -> 15087 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/obj/items/weapons/guns/attachments/under.dmi b/icons/obj/items/weapons/guns/attachments/under.dmi index 3458bc07866ba6b752d65a1ff42c2a6e99b71193..8947ecd174a7fb00f82002eef6fdccb1a3226e0f 100644 GIT binary patch delta 588 zcmV-S0<-<_b?sktbFPOO-Tdk_xOG=JsErD$b?4H2>$dd05n@8eXgIA}jyj8XU zQ}JNL;r=J@%^)I*8qADtGD;!!+`|F%9b$LfD95Cnc+3^ewdHG)v+ zjC=&$l4wbyDeRt<`PgdL8sIpa)uS<0x11($!DA#^qC`uV*b^o8bO}k6kaUUP?tvx$ z;U5qk)mhefnwpoiu?cwJY~W6H8AEpylwUuMW>|@?qZpF#dJ5bm{%{psaQ}a+%Lu;_ zyn9MncAu@Y&5k?jf4gNEd?!P7=r%v*k)7*?TESgkdqsazG!SU-R!HZcMl%fGH7Wn# aZ&|iUS-M_@zW^=2^_d;_|KhWQ0&O@)3m_i= delta 589 zcmV-T0!$8_dm`H4{XM6ZsJHP z>)4Eq;%IM01@FJlz|%U*H*7KAZ1Vd@_OSTY7ZFwU5h^gg8*jxy$-RHF5LEi94zbOwAJ&h=+Xk;*nW9my z1RL%k3r0v7R?i~}JFI^X5I)Mn0vJw|=tiK0jF92+@+UDR>986n6B3L|zt^GyU)uVm z@0iAMBteT4o3YWL6=%P8C#C z(gc^fHOj-eFXuiYq&@k`IOYY4ldby_Pd|Ds9i)SFkp69fU><*~wL%d1c{R}3YZeJY zp*8dobVH&giKehSQs!f$ePe;+tX7A{RNZl!zy*(yXowOGU1CR+*wG~aWcV5v^_Ch>=_;DU$0uP!6P zR`BjAWBGl)%GW$wssnD9q4%Ej)uG+|m`ir98)^l&o$VF