diff --git a/_maps/templates/battlecruiser_starfury.dmm b/_maps/templates/battlecruiser_starfury.dmm index e3d596cbc33..e8020ed61d5 100644 --- a/_maps/templates/battlecruiser_starfury.dmm +++ b/_maps/templates/battlecruiser_starfury.dmm @@ -2630,11 +2630,11 @@ dir = 8; layer = 2.9 }, -/obj/item/gun/ballistic/revolver{ +/obj/item/gun/ballistic/revolver/syndicate{ pixel_x = 2; pixel_y = 5 }, -/obj/item/gun/ballistic/revolver{ +/obj/item/gun/ballistic/revolver/syndicate{ pixel_x = -1; pixel_y = 2 }, diff --git a/code/game/objects/items/storage/uplink_kits.dm b/code/game/objects/items/storage/uplink_kits.dm index c9345ef060c..cb930ecf106 100644 --- a/code/game/objects/items/storage/uplink_kits.dm +++ b/code/game/objects/items/storage/uplink_kits.dm @@ -71,7 +71,7 @@ new /obj/item/jammer(src) if(KIT_GUN) - new /obj/item/gun/ballistic/revolver(src) + new /obj/item/gun/ballistic/revolver/syndicate(src) new /obj/item/ammo_box/a357(src) new /obj/item/ammo_box/a357(src) new /obj/item/card/emag(src) @@ -250,7 +250,7 @@ new /obj/item/pen/sleepy(src) new /obj/item/reagent_containers/pill/cyanide(src) new /obj/item/chameleon(src) //its not the original cloaking device, but it will do. - new /obj/item/gun/ballistic/revolver(src) + new /obj/item/gun/ballistic/revolver/syndicate(src) new /obj/item/implanter/freedom(src) new /obj/item/stack/telecrystal(src) //The failsafe/self destruct isn't an item we can physically include in the kit, but 1 TC is technically enough to buy the equivalent. diff --git a/code/modules/projectiles/guns/ballistic/revolver.dm b/code/modules/projectiles/guns/ballistic/revolver.dm index 35b654f7490..218cd8f89ae 100644 --- a/code/modules/projectiles/guns/ballistic/revolver.dm +++ b/code/modules/projectiles/guns/ballistic/revolver.dm @@ -1,6 +1,6 @@ /obj/item/gun/ballistic/revolver name = "\improper .357 revolver" - desc = "A suspicious revolver. Uses .357 ammo." //usually used by syndicates + desc = "A suspicious revolver. Uses .357 ammo." icon_state = "revolver" mag_type = /obj/item/ammo_box/magazine/internal/cylinder fire_sound = 'sound/weapons/gun/revolver/shot_alt.ogg' @@ -124,12 +124,17 @@ "Police Positive Special" = "c38_police", "Blued Steel" = "c38_blued", "Stainless Steel" = "c38_stainless", - "Gold Trim" = "c38_gold", - "Leopard Spots" = "c38_leopard", + "Gold Trim" = "c38_trim", + "Golden" = "c38_gold", "The Peacemaker" = "c38_peacemaker", "Black Panther" = "c38_panther" ) +/obj/item/gun/ballistic/revolver/syndicate + name = "\improper Syndicate Revolver" + desc = "A modernized 7 round revolver manufactured by Waffle Co. Uses .357 ammo." + icon_state = "revolversyndie" + /obj/item/gun/ballistic/revolver/mateba name = "\improper Unica 6 auto-revolver" desc = "A retro high-powered autorevolver typically used by officers of the New Russia military. Uses .357 ammo." diff --git a/code/modules/spells/spell_types/right_and_wrong.dm b/code/modules/spells/spell_types/right_and_wrong.dm index 2ce1ffda59c..9b973b90f48 100644 --- a/code/modules/spells/spell_types/right_and_wrong.dm +++ b/code/modules/spells/spell_types/right_and_wrong.dm @@ -13,6 +13,7 @@ GLOBAL_LIST_INIT(summoned_guns, list( /obj/item/gun/energy/e_gun/advtaser, /obj/item/gun/energy/laser, /obj/item/gun/ballistic/revolver, + /obj/item/gun/ballistic/revolver/syndicate, /obj/item/gun/ballistic/revolver/c38/detective, /obj/item/gun/ballistic/automatic/pistol/deagle/camo, /obj/item/gun/ballistic/automatic/gyropistol, diff --git a/code/modules/uplink/uplink_items/dangerous.dm b/code/modules/uplink/uplink_items/dangerous.dm index 955604f267c..ed3d305cf63 100644 --- a/code/modules/uplink/uplink_items/dangerous.dm +++ b/code/modules/uplink/uplink_items/dangerous.dm @@ -95,8 +95,8 @@ /datum/uplink_item/dangerous/revolver name = "Syndicate Revolver" - desc = "A brutally simple Syndicate revolver that fires .357 Magnum rounds and has 7 chambers." - item = /obj/item/gun/ballistic/revolver + desc = "Waffle Co.'s modernized Syndicate revolver. Fires 7 brutal rounds of .357 Magnum." + item = /obj/item/gun/ballistic/revolver/syndicate progression_minimum = 30 MINUTES cost = 13 surplus = 50 diff --git a/icons/obj/weapons/guns/ballistic.dmi b/icons/obj/weapons/guns/ballistic.dmi index 872368c40d5..ffcc607626e 100644 Binary files a/icons/obj/weapons/guns/ballistic.dmi and b/icons/obj/weapons/guns/ballistic.dmi differ