делает универсальный глушитель чуть более универсальным (TauCetiStati…

…on#11216)
Polotos · Apr 9, 2023 · 0106418 · 0106418
1 parent 541f81f
commit 0106418
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 1 deletion.
diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm
@@ -21,7 +21,7 @@
 		var/image/magazine_icon = image('icons/obj/gun.dmi', "[magazine.overlay]")
 		add_overlay(magazine_icon)
 	if(silenced)
-		var/image/silencer_icon = image('icons/obj/gun.dmi', "[initial(icon_state)]-silencer")
+		var/image/silencer_icon = image('icons/obj/gun_40x32.dmi', "[initial(icon_state)]-silencer")
 		add_overlay(silencer_icon)
 
 /obj/item/weapon/gun/projectile/automatic/attackby(obj/item/I, mob/user, params)
@@ -54,6 +54,7 @@
 	can_be_holstered = TRUE
 	origin_tech = "combat=5;materials=2;syndicate=8"
 	initial_mag = /obj/item/ammo_box/magazine/mac10
+	can_be_silenced = TRUE
 
 /obj/item/weapon/gun/projectile/automatic/c20r
 	name = "C-20r SMG"
@@ -131,6 +132,7 @@
 	initial_mag = /obj/item/ammo_box/magazine/l13
 	suitable_mags = list(/obj/item/ammo_box/magazine/l13, /obj/item/ammo_box/magazine/l13/lethal)
 	fire_sound = 'sound/weapons/guns/gunshot_l13.ogg'
+	can_be_silenced = TRUE
 
 /obj/item/weapon/gun/projectile/automatic/tommygun
 	name = "tommy gun"
@@ -143,6 +145,7 @@
 	origin_tech = "combat=5;materials=1;syndicate=2"
 	initial_mag = /obj/item/ammo_box/magazine/tommygun
 	fire_sound = 'sound/weapons/guns/gunshot_light.ogg'
+	can_be_silenced = TRUE
 
 /obj/item/weapon/gun/projectile/automatic/bar
 	name = "Browning M1918"

diff --git a/code/modules/projectiles/guns/projectile/pistol.dm b/code/modules/projectiles/guns/projectile/pistol.dm
@@ -21,6 +21,7 @@
 	suitable_mags = list(/obj/item/ammo_box/magazine/glock, /obj/item/ammo_box/magazine/glock/rubber, /obj/item/ammo_box/magazine/glock/extended, /obj/item/ammo_box/magazine/glock/extended/rubber)
 	fire_sound = 'sound/weapons/guns/gunshot_light.ogg'
 	can_be_holstered = TRUE
+	can_be_silenced = TRUE
 
 /obj/item/weapon/gun/projectile/automatic/glock/spec
 	name = "G17 GEN3"
@@ -75,6 +76,7 @@
 	suitable_mags = list(/obj/item/ammo_box/magazine/colt/rubber, /obj/item/ammo_box/magazine/colt)
 	can_be_holstered = TRUE
 	fire_sound = 'sound/weapons/guns/gunshot_colt1911.ogg'
+	can_be_silenced = TRUE
 
 /obj/item/weapon/gun/projectile/automatic/colt1911/dungeon
 	desc = "A single-action, semi-automatic, magazine-fed, recoil-operated pistol chambered for the .45 ACP cartridge."

diff --git a/icons/obj/gun.dmi b/icons/obj/gun.dmi
diff --git a/icons/obj/gun_40x32.dmi b/icons/obj/gun_40x32.dmi