diff --git a/code/game/gamemodes/gang/gang_datum.dm b/code/game/gamemodes/gang/gang_datum.dm index fc1ab12c6c..d6aa1830f2 100644 --- a/code/game/gamemodes/gang/gang_datum.dm +++ b/code/game/gamemodes/gang/gang_datum.dm @@ -75,7 +75,7 @@ /datum/gang_item/clothing/hands, /datum/gang_item/clothing/belt, - /datum/gang_item/weapon/shuriken, + /datum/gang_item/weapon/shuriken, /datum/gang_item/weapon/switchblade, /datum/gang_item/weapon/improvised, /datum/gang_item/weapon/ammo/improvised_ammo, diff --git a/code/game/gamemodes/gang/gang_items.dm b/code/game/gamemodes/gang/gang_items.dm index 1145bd2a66..dae3c85be1 100644 --- a/code/game/gamemodes/gang/gang_items.dm +++ b/code/game/gamemodes/gang/gang_items.dm @@ -111,7 +111,7 @@ /datum/gang_item/clothing/hat name = "Pimp Hat" id = "hat" - cost = 18 + cost = 16 item_path = /obj/item/clothing/head/collectable/petehat/gang /obj/item/clothing/head/collectable/petehat/gang @@ -121,7 +121,7 @@ /datum/gang_item/clothing/mask name = "Golden Death Mask" id = "mask" - cost = 20 + cost = 18 item_path = /obj/item/clothing/mask/gskull /obj/item/clothing/mask/gskull @@ -133,7 +133,7 @@ /datum/gang_item/clothing/shoes name = "Bling Boots" id = "boots" - cost = 25 + cost = 22 item_path = /obj/item/clothing/shoes/gang /obj/item/clothing/shoes/gang @@ -144,14 +144,14 @@ /datum/gang_item/clothing/neck name = "Gold Necklace" id = "necklace" - cost = 10 + cost = 9 item_path = /obj/item/clothing/neck/necklace/dope /datum/gang_item/clothing/hands name = "Decorative Brass Knuckles" id = "hand" - cost = 12 + cost = 11 item_path = /obj/item/clothing/gloves/gang /obj/item/clothing/gloves/gang @@ -163,7 +163,7 @@ /datum/gang_item/clothing/belt name = "Badass Belt" id = "belt" - cost = 15 + cost = 13 item_path = /obj/item/weapon/storage/belt/military/gang /obj/item/weapon/storage/belt/military/gang @@ -215,7 +215,6 @@ name = "Sawn-Off Improvised Shotgun" id = "sawn" cost = 6 - item_path = /obj/item/weapon/gun/ballistic/revolver/doublebarrel/improvised/sawn /datum/gang_item/weapon/ammo/improvised_ammo name = "Box of Buckshot" @@ -236,16 +235,24 @@ item_path = /obj/item/ammo_box/magazine/m10mm /datum/gang_item/weapon/sniper - name = ".50cal Sniper Rifle" + name = "Black Market .50cal Sniper Rifle" id = "sniper" cost = 40 item_path = /obj/item/weapon/gun/ballistic/automatic/sniper_rifle /datum/gang_item/weapon/ammo/sniper_ammo - name = "Standard .50cal Sniper Rounds" + name = "Smuggled .50cal Sniper Rounds" id = "sniper_ammo" cost = 15 - item_path = /obj/item/ammo_box/magazine/sniper_rounds + item_path = /obj/item/ammo_box/magazine/sniper_rounds/gang + + +/datum/gang_item/weapon/ammo/sleeper_ammo + name = "Illicit Tranquilizer Cartridges" + id = "sniper_ammo" + cost = 15 + item_path = /obj/item/ammo_box/magazine/sniper_rounds/gang/sleeper + /datum/gang_item/weapon/machinegun name = "Mounted Machine Gun" diff --git a/code/modules/projectiles/ammunition/ammo_casings.dm b/code/modules/projectiles/ammunition/ammo_casings.dm index 65b9ef926f..d91859f198 100644 --- a/code/modules/projectiles/ammunition/ammo_casings.dm +++ b/code/modules/projectiles/ammunition/ammo_casings.dm @@ -117,7 +117,7 @@ desc = "A .50 bullet casing, specialised in sending the target to sleep, instead of hell." caliber = ".50" projectile_type = /obj/item/projectile/bullet/sniper/soporific - icon_state = ".50" + icon_state = "sleeper" /obj/item/ammo_casing/haemorrhage desc = "A .50 bullet casing, specialised in causing massive bloodloss" @@ -131,7 +131,14 @@ projectile_type = /obj/item/projectile/bullet/sniper/penetrator icon_state = ".50" +/obj/item/ammo_casing/point50/gang + desc = "A black market .50 bullet casing." + projectile_type = /obj/item/projectile/bullet/sniper/gang +/obj/item/ammo_casing/point50/gang/sleeper + desc = "Am illegally modified tranquilizer round." + projectile_type = /obj/item/projectile/bullet/sniper/gang/sleeper + icon_state = "sleeper" /// SAW ROUNDS diff --git a/code/modules/projectiles/boxes_magazines/external_mag.dm b/code/modules/projectiles/boxes_magazines/external_mag.dm index c2a7129b4e..6c798efe3e 100644 --- a/code/modules/projectiles/boxes_magazines/external_mag.dm +++ b/code/modules/projectiles/boxes_magazines/external_mag.dm @@ -264,6 +264,17 @@ origin_tech = "combat=6;syndicate=3" max_ammo = 5 +/obj/item/ammo_box/magazine/sniper_rounds/gang + name = "black market sniper rounds (.50)" + icon_state = ".50mag" + origin_tech = "combat=6" + ammo_type = /obj/item/ammo_casing/point50/gang + +/obj/item/ammo_box/magazine/sniper_rounds/gang/sleeper + name = "illegally modified tranquilizer round" + icon_state = "soporific" + origin_tech = "combat=6" + ammo_type = /obj/item/ammo_casing/point50/gang/sleeper //// SAW MAGAZINES @@ -371,4 +382,4 @@ icon_state = "oldrifle-[round(ammo_count(),4)]" /obj/item/ammo_box/magazine/recharge/attack_self() //No popping out the "bullets" - return \ No newline at end of file + return diff --git a/code/modules/projectiles/guns/ballistic/automatic.dm b/code/modules/projectiles/guns/ballistic/automatic.dm index daaf87082a..90d30e6b88 100644 --- a/code/modules/projectiles/guns/ballistic/automatic.dm +++ b/code/modules/projectiles/guns/ballistic/automatic.dm @@ -380,6 +380,11 @@ pin = /obj/item/device/firing_pin/implant/pindicate origin_tech = "combat=7;syndicate=6" +/obj/item/weapon/gun/ballistic/automatic/sniper_rifle/gang + name = "black market sniper rifle" + desc = "A long ranged weapon that does significant damage. It is well worn from years of service." + mag_type = /obj/item/ammo_box/magazine/sniper_rounds/gang + // Old Semi-Auto Rifle // /obj/item/weapon/gun/ballistic/automatic/surplus diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm index 5ffebf33b3..ae2377b8e3 100644 --- a/code/modules/projectiles/projectile/bullets.dm +++ b/code/modules/projectiles/projectile/bullets.dm @@ -279,7 +279,30 @@ target.ex_act(rand(1,2)) return ..() +/obj/item/projectile/bullet/sniper/gang + damage = 55 + stun = 1 + weaken = 1 + dismemberment = 15 + armour_penetration = 25 +/obj/item/projectile/bullet/sniper/gang/sleeper + nodamage = 1 + stun = 0 + weaken = 0 + dismemberment = 0 + breakthings = FALSE + +/obj/item/projectile/bullet/sniper/gang/sleeper/on_hit(atom/target, blocked = 0) + if((blocked != 100) && isliving(target)) + var/mob/living/L = target + L.blur_eyes(8) + if(L.staminaloss >= 40) + L.Sleeping(20) + else + L.adjustStaminaLoss(55) + return 1 + /obj/item/projectile/bullet/sniper/soporific armour_penetration = 0 nodamage = 1