diff --git a/code/game/objects/items/weapons/guns_new.dm b/code/game/objects/items/weapons/guns_new.dm index 9360034c7a2..884d36768e0 100644 --- a/code/game/objects/items/weapons/guns_new.dm +++ b/code/game/objects/items/weapons/guns_new.dm @@ -62,7 +62,6 @@ effects["weak"] = 10 effects["stun"] = 10 - suffocationbullet damage = 65 mobdamage = list(BRUTE = 50, BURN = 0, TOX = 0, OXY = 15, CLONE = 0) @@ -132,6 +131,17 @@ effects["weak"] = 10 effects["stutter"] = 10 effectprob["weak"] = 25 + gyro + name ="gyro" + icon_state= "bolter" + pass_flags = PASSTABLE + damage = 50 + mobdamage = list(BRUTE = 50, BURN = 0, TOX = 0, OXY = 0, CLONE = 0) + flag = "bullet" + New() + ..() + effects["weak"] = 10 + effects["stun"] = 10 declone name = "declown" @@ -350,6 +360,16 @@ pixel_y = rand(-10.0, 10) dir = pick(cardinal) + a75 + name = "bullet casing (.75)" + desc = "A .75 bullet casing." + caliber = "75" + + New() + BB = new /obj/item/projectile/gyro(src) + pixel_x = rand(-10.0, 10) + pixel_y = rand(-10.0, 10) + dir = pick(cardinal) a666 name = "bullet casing (.666)" desc = "A .666 bullet casing." @@ -494,6 +514,14 @@ icon_state = text("[initial(icon_state)]-[]", stored_ammo.len) desc = text("There are [] shell\s left!", stored_ammo.len) + a75 + name = "ammo magazine (.75)" + icon_state = "gyro" + New() + for(var/i = 1, i <= 8, i++) + stored_ammo += new /obj/item/ammo_casing/a75(src) + update_icon() + c38 name = "speed loader (.38)" icon_state = "38" @@ -814,6 +842,22 @@ loaded += new /obj/item/ammo_casing/c45(src) update_icon() + gyropistol + name = "Gyrojet Pistol" + desc = "A bulky pistol designed to fire self propelled rounds" + icon_state = "gyropistol" + w_class = 3.0 + force = 15 + max_shells = 8 + caliber = "a75" + fire_sound = 'Explosion1.ogg' + origin_tech = "combat=3" + + New() + for(var/i = 1, i <= max_shells, i++) + loaded += new /obj/item/ammo_casing/a75(src) + update_icon() + energy icon_state = "energy" name = "energy gun" diff --git a/icons/obj/ammo.dmi b/icons/obj/ammo.dmi index f3e031576d1..29d3e8f0d65 100644 Binary files a/icons/obj/ammo.dmi and b/icons/obj/ammo.dmi differ diff --git a/icons/obj/gun.dmi b/icons/obj/gun.dmi index 1fdb27b6424..bbcf97da3a3 100644 Binary files a/icons/obj/gun.dmi and b/icons/obj/gun.dmi differ diff --git a/icons/obj/projectiles.dmi b/icons/obj/projectiles.dmi index 90ff21375cb..1aa3729a475 100644 Binary files a/icons/obj/projectiles.dmi and b/icons/obj/projectiles.dmi differ