Горохострел (вместо револьверного дерева)

code/defines/obj/hydro.dm

@@ -79,11 +79,11 @@
 	return ..() // Fallthrough to item/attackby() so that bags can pick seeds up
 
 /obj/item/seeds/gatfruit
-	name = "pack of gatfruit seeds"
-	desc = "These seeds grow into .357 revolvers."
+	name = "pack of peashooter seeds"
+	desc = "These seeds grow into peashooter"
 	icon_state = "seed-gatfruit"
 	species = "gatfruit"
-	plantname = "Gatfruit Tree"
+	plantname = "Peashooter Tree"
 	product_type = /obj/item/weapon/reagent_containers/food/snacks/grown/gatfruit
 	lifespan = 20
 	endurance = 20

code/modules/projectiles/ammunition/bullets.dm

@@ -27,6 +27,14 @@
 	projectile_type = /obj/item/projectile/bullet/midbullet2
 	m_amt = 300
 
+/obj/item/ammo_casing/pea
+	name = "Гороховая гильза"
+	desc = "Гороховая оболочка для патрона."
+	caliber = "9mm"
+	projectile_type = /obj/item/projectile/bullet/peabullet
+	m_amt = 300 
+
+
 /obj/item/ammo_casing/c9mmr
 	desc = "Патрон от резиновой пули калибра 9мм."
 	icon_state = "casing_rubber"

code/modules/projectiles/ammunition/magazines.dm

@@ -637,3 +637,12 @@
 	icon_state = "38"
 	ammo_type = /obj/item/ammo_casing/c45r
 	max_ammo = 6
+
+/obj/item/ammo_box/magazine/pea
+	name = "pealoader"
+	cases = list("гороховый зарядник", "горохового зарядника","гороховому заряднику", "гороховый зарядник", "гороховым зарядником", "гороховом заряднике")
+	desc = "Гороховый зарядник для горохового пистолета."
+	caliber = "9mm"
+	ammo_type = /obj/item/ammo_casing/pea
+	max_ammo = 6
+	origin_tech = "combat=2"

code/modules/projectiles/guns/projectile.dm

@@ -91,6 +91,9 @@
 			update_icon()
 			return
 		return ..()
+	else if(istype(src, /obj/item/weapon/gun/projectile/automatic/pistol/peashooter))
+		to_chat(user, "<span class='notice'>Вы не можете вынуть горох из [src].</span>")
+		return
 	else if(magazine)
 		magazine.loc = get_turf(src.loc)
 		user.put_in_hands(magazine)

code/modules/projectiles/guns/projectile/pistol.dm

@@ -117,3 +117,13 @@
 	fire_sound = 'sound/weapons/guns/gunshot_light.ogg'
 	can_be_holstered = TRUE
 	recoil = 1.5
+
+/obj/item/weapon/gun/projectile/automatic/pistol/peashooter
+	name = "Peashooter"
+	desc = "Горохострел. Стреляет горохом."
+	icon_state = "peashooter"
+	item_state = "peashooter"
+	origin_tech = "combat=1;materials=1"
+	initial_mag = /obj/item/ammo_box/magazine/pea
+	suitable_mags = /obj/item/ammo_box/magazine/pea
+	can_be_holstered = TRUE

code/modules/projectiles/projectile/bullets.dm

@@ -70,6 +70,11 @@
 	hitscan = 1
 	armor_multiplier = 0.7
 
+/obj/item/projectile/bullet/peabullet
+	name = "pea bullet"
+	damage = 5
+	agony = 5
+
 /obj/item/projectile/bullet/midbullet2 // 9x19
 	damage = 25
 

code/modules/reagents/reagent_containers/food/snacks/grown.dm

@@ -1181,12 +1181,12 @@
 
 /obj/item/weapon/reagent_containers/food/snacks/grown/gatfruit
 	seed_type = /obj/item/seeds/gatfruit
-	name = "gatfruit"
-	desc = "It smells like burning."
+	name = "peashooter"
+	desc = "It smells like pea-palm in the morning"
 	icon_state = "gatfruit"
 	potency = 25
 	filling_color = "#020108"
-	trash = /obj/item/weapon/gun/projectile/revolver
+	trash = /obj/item/weapon/gun/projectile/automatic/pistol/peashooter
 
 /obj/item/weapon/reagent_containers/food/snacks/grown/gatfruit/atom_init()
 	. = ..()