diff --git a/code/defines/obj/hydro.dm b/code/defines/obj/hydro.dm index f7850f044d5e..0ca30a391ec5 100644 --- a/code/defines/obj/hydro.dm +++ b/code/defines/obj/hydro.dm @@ -78,13 +78,14 @@ return FALSE 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." +/obj/item/seeds/peashooter + name = "pack of peashooter seeds" + cases = list("семена Горохострела", "семян Горохострела", "семенам Горохострела", "семена Горохострела", "семенами Горохострела", "семенах Горохострела") + desc = "Эти семена вырастают в Горохострел" icon_state = "seed-gatfruit" - species = "gatfruit" - plantname = "Gatfruit Tree" - product_type = /obj/item/weapon/reagent_containers/food/snacks/grown/gatfruit + species = "peashooter" + plantname = "Peashooter Tree" + product_type = /obj/item/weapon/reagent_containers/food/snacks/grown/peashooter lifespan = 20 endurance = 20 maturation = 10 @@ -115,7 +116,7 @@ if(!istype(E, /datum/disease2/effect/gibbingtons)) return if(prob(holder.stage * 10)) - mutatelist = list(/obj/item/seeds/gatfruit) + mutatelist = list(/obj/item/seeds/peashooter) tray.mutatespecie() /obj/item/seeds/chiliseed diff --git a/code/modules/cargo/exports/grown.dm b/code/modules/cargo/exports/grown.dm index 6ba6ce49dd2c..88042a0caa5e 100644 --- a/code/modules/cargo/exports/grown.dm +++ b/code/modules/cargo/exports/grown.dm @@ -1,7 +1,7 @@ -/datum/export/gatfruit +/datum/export/peashooter unit_name = "strange fruit" cost = 150 - export_types = list(/obj/item/weapon/reagent_containers/food/snacks/grown/gatfruit) + export_types = list(/obj/item/weapon/reagent_containers/food/snacks/grown/peashooter) /* /export/grown subtype diff --git a/code/modules/projectiles/ammunition/bullets.dm b/code/modules/projectiles/ammunition/bullets.dm index 77bae69382c4..dac26949c934 100644 --- a/code/modules/projectiles/ammunition/bullets.dm +++ b/code/modules/projectiles/ammunition/bullets.dm @@ -27,6 +27,13 @@ projectile_type = /obj/item/projectile/bullet/midbullet2 m_amt = 300 +/obj/item/ammo_casing/pea + name = "Pea bullet casing" + cases = list("гороховый патрон", "горохового патрона", "гороховому патрону", "гороховый патрон", "гороховым патроном", "гороховом патроне") + desc = "Гороховый патрон" + caliber = "Pea" + projectile_type = /obj/item/projectile/bullet/peabullet + /obj/item/ammo_casing/c9mmr desc = "Патрон от резиновой пули калибра 9мм." icon_state = "casing_rubber" diff --git a/code/modules/projectiles/ammunition/magazines.dm b/code/modules/projectiles/ammunition/magazines.dm index 258b30de1a90..dc095251e28c 100644 --- a/code/modules/projectiles/ammunition/magazines.dm +++ b/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 = "Pea" + ammo_type = /obj/item/ammo_casing/pea + max_ammo = 6 + origin_tech = "combat=2" diff --git a/code/modules/projectiles/guns/projectile/pistol.dm b/code/modules/projectiles/guns/projectile/pistol.dm index a883e0d71aa7..1525ed64b7ce 100644 --- a/code/modules/projectiles/guns/projectile/pistol.dm +++ b/code/modules/projectiles/guns/projectile/pistol.dm @@ -117,3 +117,18 @@ 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 = "Горохострел. Стреляет горохом." + cases = list("горохострел", "горохострела", "горохострелу", "горохострел", "горохострелом", "горохостреле") + 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 + +/obj/item/weapon/gun/projectile/automatic/pistol/peashooter/attack_self(mob/living/user) + to_chat(user, "Вы не можете вынуть горох из [CASE(src, GENITIVE_CASE)].") + return diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm index d525b3d9ee53..19f1150e5ca6 100644 --- a/code/modules/projectiles/projectile/bullets.dm +++ b/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 diff --git a/code/modules/reagents/reagent_containers/food/snacks/grown.dm b/code/modules/reagents/reagent_containers/food/snacks/grown.dm index 5c56feb88963..e86172483e03 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/grown.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/grown.dm @@ -1179,16 +1179,17 @@ reagents.add_reagent("nutriment", 1 + round(potency / 5)) bitesize = 1 + round(reagents.total_volume / 2, 1) -/obj/item/weapon/reagent_containers/food/snacks/grown/gatfruit - seed_type = /obj/item/seeds/gatfruit - name = "gatfruit" - desc = "It smells like burning." - icon_state = "gatfruit" +/obj/item/weapon/reagent_containers/food/snacks/grown/peashooter + seed_type = /obj/item/seeds/peashooter + name = "peashooter" + cases = list("горохострел", "горохострела", "горохострелу", "горохострел", "горохострелом", "горохостреле") + desc = "Нераскрывшийся плод горохострела, подозрительно напоминающий пистолет" + icon_state = "peashooter" 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() +/obj/item/weapon/reagent_containers/food/snacks/grown/peashooter/atom_init() . = ..() reagents.add_reagent("potassium", 1 + round(potency / 25, 1)) reagents.add_reagent("carbon", 1 + round(potency / 10, 1)) diff --git a/icons/mob/inhands/guns_lefthand.dmi b/icons/mob/inhands/guns_lefthand.dmi index 58ec84aa0437..4ee8b4fdc8d6 100644 Binary files a/icons/mob/inhands/guns_lefthand.dmi and b/icons/mob/inhands/guns_lefthand.dmi differ diff --git a/icons/mob/inhands/guns_righthand.dmi b/icons/mob/inhands/guns_righthand.dmi index 85d95134bb9f..988040dcb905 100644 Binary files a/icons/mob/inhands/guns_righthand.dmi and b/icons/mob/inhands/guns_righthand.dmi differ diff --git a/icons/obj/gun.dmi b/icons/obj/gun.dmi index e45adf6adf2b..fbebe8417bd3 100644 Binary files a/icons/obj/gun.dmi and b/icons/obj/gun.dmi differ diff --git a/icons/obj/hydroponics/growing.dmi b/icons/obj/hydroponics/growing.dmi index 76a6081e1882..097548696859 100644 Binary files a/icons/obj/hydroponics/growing.dmi and b/icons/obj/hydroponics/growing.dmi differ diff --git a/icons/obj/hydroponics/harvest.dmi b/icons/obj/hydroponics/harvest.dmi index f7b14f43e56f..58e3ac8704f7 100644 Binary files a/icons/obj/hydroponics/harvest.dmi and b/icons/obj/hydroponics/harvest.dmi differ