diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm index 205b8cbdac3..9eace6f7c1d 100644 --- a/code/datums/uplink_item.dm +++ b/code/datums/uplink_item.dm @@ -184,8 +184,8 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) //mime /datum/uplink_item/jobspecific/caneshotgun - name = "Cane Shotgun + Assassination Darts" - desc = "A specialized, one shell shotgun with a built-in cloaking device to mimic a cane. The shotgun is capable of hiding it's contents and the pin alongside being supressed. Comes with 6 special darts and a preloaded shrapnel round." + name = "Cane Shotgun and Assassination Shells" + desc = "A specialised, one shell shotgun with a built-in cloaking device to mimic a cane. The shotgun is capable of hiding it's contents and the pin alongside being supressed. Comes boxed with 6 specialised shrapnel rounds laced with a silencing toxin and 1 preloaded in the shotgun's chamber." reference = "MCS" item = /obj/item/storage/box/syndie_kit/caneshotgun cost = 10 diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm index ef2292afb64..b4d4a89c7b1 100644 --- a/code/game/objects/items/weapons/storage/uplink_kits.dm +++ b/code/game/objects/items/weapons/storage/uplink_kits.dm @@ -207,12 +207,12 @@ /obj/item/storage/box/syndie_kit/caneshotgun/New() ..() - new /obj/item/ammo_casing/shotgun/dart/assassination(src) - new /obj/item/ammo_casing/shotgun/dart/assassination(src) - new /obj/item/ammo_casing/shotgun/dart/assassination(src) - new /obj/item/ammo_casing/shotgun/dart/assassination(src) - new /obj/item/ammo_casing/shotgun/dart/assassination(src) - new /obj/item/ammo_casing/shotgun/dart/assassination(src) + new /obj/item/ammo_casing/shotgun/assassination(src) + new /obj/item/ammo_casing/shotgun/assassination(src) + new /obj/item/ammo_casing/shotgun/assassination(src) + new /obj/item/ammo_casing/shotgun/assassination(src) + new /obj/item/ammo_casing/shotgun/assassination(src) + new /obj/item/ammo_casing/shotgun/assassination(src) new /obj/item/gun/projectile/revolver/doublebarrel/improvised/cane(src) /obj/item/storage/box/syndie_kit/mimery diff --git a/code/modules/projectiles/ammunition/ammo_casings.dm b/code/modules/projectiles/ammunition/ammo_casings.dm index c525ef92ee1..ec94126fbfd 100644 --- a/code/modules/projectiles/ammunition/ammo_casings.dm +++ b/code/modules/projectiles/ammunition/ammo_casings.dm @@ -369,12 +369,13 @@ projectile_type = /obj/item/projectile/bullet/reusable/foam_dart/riot icon_state = "foamdart_riot" -/obj/item/ammo_casing/shotgun/dart/assassination - desc = "A specialist shotgun dart designed to inncapacitate and kill the target over time, so you can get very far away from your target" - -/obj/item/ammo_casing/shotgun/dart/assassination/New() - ..() - reagents.add_reagent("neurotoxin", 6) +/obj/item/ammo_casing/shotgun/assassination + name = "assassination shell" + desc = "A specialist shrapnel shell that has been laced with a silencing toxin." + projectile_type = /obj/item/projectile/bullet/pellet/assassination + icon_state = "gshell" + pellets = 6 + variance = 25 /obj/item/ammo_casing/cap desc = "A cap for children toys." diff --git a/code/modules/projectiles/ammunition/magazines.dm b/code/modules/projectiles/ammunition/magazines.dm index 6d6e28092c1..89eab0ca882 100644 --- a/code/modules/projectiles/ammunition/magazines.dm +++ b/code/modules/projectiles/ammunition/magazines.dm @@ -122,6 +122,9 @@ ammo_type = /obj/item/ammo_casing/shotgun/improvised max_ammo = 1 +/obj/item/ammo_box/magazine/internal/shot/improvised/cane + ammo_type = /obj/item/ammo_casing/shotgun/assassination + /obj/item/ammo_box/magazine/internal/shot/riot name = "riot shotgun internal magazine" ammo_type = /obj/item/ammo_casing/shotgun/rubbershot diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm index 2f7a7fc1cd9..8fae0a9bac1 100644 --- a/code/modules/projectiles/guns/projectile/revolver.dm +++ b/code/modules/projectiles/guns/projectile/revolver.dm @@ -417,7 +417,7 @@ can_unsuppress = 0 slot_flags = null origin_tech = "" // NO GIVAWAYS - mag_type = /obj/item/ammo_box/magazine/internal/shot/improvised + mag_type = /obj/item/ammo_box/magazine/internal/shot/improvised/cane sawn_desc = "I'm sorry, but why did you saw your cane in the first place?" attack_verb = list("bludgeoned", "whacked", "disciplined", "thrashed") fire_sound = 'sound/weapons/Gunshot_silenced.ogg' diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm index c55f367d8c3..c0fcce8c1fb 100644 --- a/code/modules/projectiles/projectile/bullets.dm +++ b/code/modules/projectiles/projectile/bullets.dm @@ -109,6 +109,15 @@ range = rand(1, 10) ..() +/obj/item/projectile/bullet/pellet/assassination + damage = 12 + tile_dropoff = 1 // slightly less damage and greater damage falloff compared to normal buckshot + +/obj/item/projectile/bullet/pellet/assassination/on_hit(atom/target, blocked = 0) + if(..(target, blocked)) + var/mob/living/M = target + M.AdjustSilence(2) // HELP MIME KILLING ME IN MAINT + /obj/item/projectile/bullet/pellet/overload/on_hit(atom/target, blocked = 0) ..() explosion(target, 0, 0, 2)