diff --git a/code/game/objects/items/weapons/guns_new.dm b/code/game/objects/items/weapons/guns_new.dm index 116ec7ff45f..3a206923af4 100644 --- a/code/game/objects/items/weapons/guns_new.dm +++ b/code/game/objects/items/weapons/guns_new.dm @@ -96,6 +96,15 @@ var/const/PROJECTILE_WEAKERBULLETBURST = 12 mobdamage = list(BRUTE = 0, BURN = 20, TOX = 0, OXY = 0, CLONE = 0) flag = "laser" + declone + name = "declown" + //damage_type = PROJECTILE_DECLONE + icon_state = "declone" + pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE + damage = 20 + mobdamage = list(BRUTE = 0, BURN = 0, TOX = 0, OXY = 0, CLONE = 70) + flag = "laser" + dart name = "dart" //damage_type = PROJECTILE_DART @@ -888,6 +897,30 @@ var/const/PROJECTILE_WEAKERBULLETBURST = 12 power_supply = new /obj/item/weapon/cell(src) power_supply.give(power_supply.maxcharge) + decloner + name = "decloner" + desc = "A high tech energy weapon that declones a target." + icon_state = "decloner" + fire_sound = 'pulse3.ogg' + origin_tech = "combat=5;materials=4;powerstorage=3" + charge_cost = 100 + + load_into_chamber() + if(in_chamber) + return 1 + if(power_supply.charge <= charge_cost) + return 0 + in_chamber = new /obj/item/projectile/declone(src) + power_supply.use(charge_cost) + return 1 + + attack_self(mob/living/user as mob) + return + + New() + power_supply = new /obj/item/weapon/cell(src) + power_supply.give(power_supply.maxcharge) + stunrevolver name = "stun revolver" desc = "A high-tech revolver that fires stun cartridges. The stun cartridges can be recharged using a conventional energy weapon recharger." diff --git a/code/game/research/designs.dm b/code/game/research/designs.dm index 54fbe8fd798..1bf9a6c27e8 100644 --- a/code/game/research/designs.dm +++ b/code/game/research/designs.dm @@ -1019,6 +1019,15 @@ datum materials = list("$metal" = 8000, "$silver" = 3000, "$gold" = 500) build_path = "/obj/item/weapon/gun/energy/shockgun" + decloner + name = "Decloner" + desc = "Your opponent will bubble into a messy pile of goop." + id = "decloner" + req_tech = list("combat" = 8, "materials" = 7, "biotech" = 5, "powerstorage" = 6) + build_type = PROTOLATHE + materials = list("$gold" = 5000,"$uranium" = 10000, "mutagen" = 40) + build_path = "/obj/item/weapon/gun/energy/shockgun" + chemsprayer name = "Chem Sprayer" desc = "An advanced chem spraying device." diff --git a/icons/obj/gun.dmi b/icons/obj/gun.dmi index 44f9fb99e27..f45e1911ccd 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 b17ccefb747..16e4ad82f98 100644 Binary files a/icons/obj/projectiles.dmi and b/icons/obj/projectiles.dmi differ