Changes the revolver obtained from gatfruit to an overgrown revolver (#21320)
* gatfruit more like gattofruit * increases max ammo to 8 * bio is not a valid research * small issue * adds a missing space * gatfruit takes time to open now * Sirryan's request * adds the sprite * lewcc review + sprites * ghhhhhh * sprites are working
@@ -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()
|
||||
|
||||
@@ -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.
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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.
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
|
Before Width: | Height: | Size: 67 KiB After Width: | Height: | Size: 67 KiB |
|
Before Width: | Height: | Size: 78 KiB After Width: | Height: | Size: 78 KiB |
|
Before Width: | Height: | Size: 181 KiB After Width: | Height: | Size: 182 KiB |
|
Before Width: | Height: | Size: 180 KiB After Width: | Height: | Size: 180 KiB |
|
Before Width: | Height: | Size: 38 KiB After Width: | Height: | Size: 38 KiB |
|
Before Width: | Height: | Size: 46 KiB After Width: | Height: | Size: 46 KiB |