diff --git a/modular_ss220/objects/code/miscellaneous.dm b/modular_ss220/objects/code/miscellaneous.dm index e896a5ed6cac..8d3d8a5e8ba4 100644 --- a/modular_ss220/objects/code/miscellaneous.dm +++ b/modular_ss220/objects/code/miscellaneous.dm @@ -140,5 +140,5 @@ // Display Cases /obj/structure/displaycase/hos alert = TRUE - start_showpiece_type = /obj/item/food/donut/sprinkles + start_showpiece_type = /obj/item/gun/projectile/revolver/reclinable/judge req_access = list(ACCESS_HOS) diff --git a/modular_ss220/objects/code/weapons/ranged/revolvers.dm b/modular_ss220/objects/code/weapons/ranged/revolvers.dm index 58fe886f8edd..ab3af135a95e 100644 --- a/modular_ss220/objects/code/weapons/ranged/revolvers.dm +++ b/modular_ss220/objects/code/weapons/ranged/revolvers.dm @@ -88,6 +88,27 @@ icon = 'modular_ss220/objects/icons/ammo.dmi' icon_state = "44_box" +/obj/item/gun/projectile/revolver/reclinable/judge + name = "\improper Judge" + desc = "Тяжёлый револьвер ружейного калибра. Несмотря на короткий ствол и высокую отдачу крайне эффективное оружие ближней дистанции." + mag_type = /obj/item/ammo_box/magazine/internal/cylinder/ga12 + lefthand_file = 'modular_ss220/objects/icons/inhands/guns_lefthand.dmi' + righthand_file = 'modular_ss220/objects/icons/inhands/guns_righthand.dmi' + icon = 'modular_ss220/objects/icons/guns.dmi' + icon_state = "judge" + item_state = "judge" + w_class = WEIGHT_CLASS_NORMAL + fire_sound = 'modular_ss220/objects/sound/weapons/gunshots/gunshot_judge.ogg' + spread = 10 + recoil = 2 + fire_delay = 5 + +/obj/item/ammo_box/magazine/internal/cylinder/ga12 + name = ".12 revolver cylinder" + ammo_type = /obj/item/ammo_casing/shotgun/rubbershot + caliber = "shotgun" + max_ammo = 3 + // RSH-12 12.7 /obj/item/gun/projectile/revolver/reclinable/rsh12 name = "RSh-12" diff --git a/modular_ss220/objects/icons/guns.dmi b/modular_ss220/objects/icons/guns.dmi index f8b2a57d0c3f..dee535c69061 100644 Binary files a/modular_ss220/objects/icons/guns.dmi and b/modular_ss220/objects/icons/guns.dmi differ diff --git a/modular_ss220/objects/icons/inhands/guns_lefthand.dmi b/modular_ss220/objects/icons/inhands/guns_lefthand.dmi index efc57de302c2..204f9527ebe0 100644 Binary files a/modular_ss220/objects/icons/inhands/guns_lefthand.dmi and b/modular_ss220/objects/icons/inhands/guns_lefthand.dmi differ diff --git a/modular_ss220/objects/icons/inhands/guns_righthand.dmi b/modular_ss220/objects/icons/inhands/guns_righthand.dmi index 1f7f67772815..29da95a9c061 100644 Binary files a/modular_ss220/objects/icons/inhands/guns_righthand.dmi and b/modular_ss220/objects/icons/inhands/guns_righthand.dmi differ diff --git a/modular_ss220/objects/sound/weapons/gunshots/gunshot_judge.ogg b/modular_ss220/objects/sound/weapons/gunshots/gunshot_judge.ogg new file mode 100644 index 000000000000..12205a02d695 Binary files /dev/null and b/modular_ss220/objects/sound/weapons/gunshots/gunshot_judge.ogg differ