From a7300d6199364e20c26bb81df4be09d9c18740a7 Mon Sep 17 00:00:00 2001 From: Viz <107632879+Inadvizable@users.noreply.github.com> Date: Fri, 15 Jul 2022 00:20:53 +0200 Subject: [PATCH] splash one awful gun (#18357) --- code/datums/uplink_item.dm | 10 ------ .../projectiles/guns/projectile/sniper.dm | 34 ------------------- 2 files changed, 44 deletions(-) diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm index 4fe01b8eeda..372b5ffd32d 100644 --- a/code/datums/uplink_item.dm +++ b/code/datums/uplink_item.dm @@ -509,16 +509,6 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) surplus = 25 gamemodes = list(/datum/game_mode/nuclear) -/datum/uplink_item/dangerous/sniper_compact //For when you really really hate that one guy. - name = "Compact Sniper Rifle" - desc = "A compact, unscoped version of the operative sniper rifle. Packs a powerful punch, but ammo is limited." - reference = "CSR" - item = /obj/item/gun/projectile/automatic/sniper_rifle/compact - cost = 16 - surplus = 0 - cant_discount = TRUE - excludefrom = list(/datum/game_mode/nuclear) - /datum/uplink_item/dangerous/crossbow name = "Energy Crossbow" desc = "A miniature energy crossbow that is small enough both to fit into a pocket and to slip into a backpack unnoticed by observers. Fires bolts tipped with toxin, a poisonous substance that is the product of a living organism. Stuns enemies for a short period of time. Recharges automatically." diff --git a/code/modules/projectiles/guns/projectile/sniper.dm b/code/modules/projectiles/guns/projectile/sniper.dm index 26ad0dab6fa..0ae34930234 100644 --- a/code/modules/projectiles/guns/projectile/sniper.dm +++ b/code/modules/projectiles/guns/projectile/sniper.dm @@ -41,24 +41,6 @@ else icon_state = "sniper" -/obj/item/gun/projectile/automatic/sniper_rifle/compact //holds very little ammo, lacks zooming, and bullets are primarily damage dealers, but the gun lacks the downsides of the full size rifle - name = "compact sniper rifle" - desc = "A compact, unscoped version of the standard issue syndicate sniper rifle. Still capable of sending people crying." - icon_state = "snipercompact" - recoil = 0 - weapon_weight = WEAPON_LIGHT - fire_delay = 0 - mag_type = /obj/item/ammo_box/magazine/sniper_rounds/compact - can_unsuppress = FALSE - can_suppress = FALSE - zoomable = FALSE - -/obj/item/gun/projectile/automatic/sniper_rifle/compact/update_icon() - if(magazine) - icon_state = "snipercompact-mag" - else - icon_state = "snipercompact" - //Normal Boolets /obj/item/ammo_box/magazine/sniper_rounds name = "sniper rounds (.50)" @@ -188,22 +170,6 @@ dismemberment = 0 weaken = 0 -//compact ammo -/obj/item/ammo_box/magazine/sniper_rounds/compact - name = "sniper rounds (compact)" - desc = "An extremely powerful round capable of inflicting massive damage on a target." - ammo_type = /obj/item/ammo_casing/compact - max_ammo = 4 - -/obj/item/ammo_casing/compact - desc = "A .50 caliber compact round casing." - caliber = ".50" - projectile_type = /obj/item/projectile/bullet/sniper //Same as the base sniper bullet, but can't be reloaded with any fancy sniper ammo in the mag, which only holds 4 - muzzle_flash_strength = MUZZLE_FLASH_STRENGTH_NORMAL - muzzle_flash_range = MUZZLE_FLASH_RANGE_NORMAL - icon_state = ".50" - - //toy magazine /obj/item/ammo_box/magazine/toy/sniper_rounds name = "donksoft Sniper magazine"