diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm index 922c454004e..384218f4c3a 100644 --- a/code/modules/hydroponics/grown.dm +++ b/code/modules/hydroponics/grown.dm @@ -178,6 +178,8 @@ // For item-containing growns such as eggy or gatfruit /obj/item/reagent_containers/food/snacks/grown/shell/attack_self(mob/user) + if(!do_after(user, 1.5 SECONDS, target = user)) + return user.unEquip(src) if(trash) var/obj/item/T = generate_trash() diff --git a/code/modules/hydroponics/grown/misc_seeds.dm b/code/modules/hydroponics/grown/misc_seeds.dm index 96cf7450528..1d34ff8a0eb 100644 --- a/code/modules/hydroponics/grown/misc_seeds.dm +++ b/code/modules/hydroponics/grown/misc_seeds.dm @@ -110,7 +110,7 @@ desc = "It smells like burning." icon_state = "gatfruit" origin_tech = "combat=6" - trash = /obj/item/gun/projectile/revolver + trash = /obj/item/gun/projectile/revolver/overgrown tastes = list("2nd amendment" = 1, "freedom" = 1) bitesize_mod = 2 wine_power = 0.9 //It burns going down, too. diff --git a/code/modules/projectiles/ammunition/ammo_casings.dm b/code/modules/projectiles/ammunition/ammo_casings.dm index fa2f62870f5..5311a217887 100644 --- a/code/modules/projectiles/ammunition/ammo_casings.dm +++ b/code/modules/projectiles/ammunition/ammo_casings.dm @@ -53,6 +53,10 @@ /obj/item/ammo_casing/c10mm/hp projectile_type = /obj/item/projectile/bullet/midbullet3/hp +/obj/item/ammo_casing/overgrown + projectile_type = /obj/item/projectile/bullet/midbullet3/overgrown + icon_state = "peashooter_bullet" + /obj/item/ammo_casing/c9mm desc = "A 9mm bullet casing." caliber = "9mm" diff --git a/code/modules/projectiles/ammunition/magazines.dm b/code/modules/projectiles/ammunition/magazines.dm index 16c46758527..eb6d5b76c7b 100644 --- a/code/modules/projectiles/ammunition/magazines.dm +++ b/code/modules/projectiles/ammunition/magazines.dm @@ -80,6 +80,12 @@ caliber = "cap" max_ammo = 7 +/obj/item/ammo_box/magazine/internal/overgrown + name = "overgrown pistol magazine" + desc = "Oh god, this shouldn't be here" + ammo_type = /obj/item/ammo_casing/overgrown + max_ammo = 8 + // Shotgun internal mags /obj/item/ammo_box/magazine/internal/shot name = "shotgun internal magazine" diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm index 8dae5f84ed2..a52ee846880 100644 --- a/code/modules/projectiles/guns/projectile/revolver.dm +++ b/code/modules/projectiles/guns/projectile/revolver.dm @@ -165,6 +165,17 @@ can_suppress = TRUE mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev762 +/obj/item/gun/projectile/revolver/overgrown + name = "overgrown revolver" + desc = "A bulky revolver that seems to be made out of a plant." + icon_state = "pea_shooter" + item_state = "peashooter" + lefthand_file = 'icons/mob/inhands/guns_lefthand.dmi' + righthand_file = 'icons/mob/inhands/guns_righthand.dmi' + w_class = WEIGHT_CLASS_BULKY + origin_tech = "combat=3;biotech=5" + mag_type = /obj/item/ammo_box/magazine/internal/overgrown + // A gun to play Russian Roulette! // You can spin the chamber to randomize the position of the bullet. diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm index 486e3e6f80d..f255f5709f8 100644 --- a/code/modules/projectiles/projectile/bullets.dm +++ b/code/modules/projectiles/projectile/bullets.dm @@ -158,6 +158,12 @@ M.adjust_fire_stacks(1) M.IgniteMob() +/obj/item/projectile/bullet/midbullet3/overgrown + icon = 'icons/obj/ammo.dmi' + item_state = "peashooter_bullet" + icon_state = "peashooter_bullet" + damage = 25 + /obj/item/projectile/bullet/heavybullet damage = 35 diff --git a/icons/mob/inhands/guns_lefthand.dmi b/icons/mob/inhands/guns_lefthand.dmi index e9f8a82547a..c39e21b0ef0 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 98bf3058ec9..8e18427f19c 100644 Binary files a/icons/mob/inhands/guns_righthand.dmi and b/icons/mob/inhands/guns_righthand.dmi differ diff --git a/icons/mob/inhands/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi index 5153d41f4d3..ef37eb7bf97 100644 Binary files a/icons/mob/inhands/items_lefthand.dmi and b/icons/mob/inhands/items_lefthand.dmi differ diff --git a/icons/mob/inhands/items_righthand.dmi b/icons/mob/inhands/items_righthand.dmi index 7bd06900925..2e6e9114c82 100644 Binary files a/icons/mob/inhands/items_righthand.dmi and b/icons/mob/inhands/items_righthand.dmi differ diff --git a/icons/obj/ammo.dmi b/icons/obj/ammo.dmi index fb1f6459b40..a291de4b714 100644 Binary files a/icons/obj/ammo.dmi and b/icons/obj/ammo.dmi differ diff --git a/icons/obj/guns/projectile.dmi b/icons/obj/guns/projectile.dmi index 84d6c9ea919..69de707c5f3 100644 Binary files a/icons/obj/guns/projectile.dmi and b/icons/obj/guns/projectile.dmi differ