From bb3f2266cf3b2b96af9c9c937a79e5cb252d0070 Mon Sep 17 00:00:00 2001 From: Fox McCloud Date: Sun, 17 Feb 2019 03:32:10 -0500 Subject: [PATCH 1/2] Adds Compact Sniper Rifle to Uplink --- code/datums/uplink_item.dm | 10 +++++++ .../projectiles/guns/projectile/sniper.dm | 28 +++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm index bbeb28316f2..3f236404b27 100644 --- a/code/datums/uplink_item.dm +++ b/code/datums/uplink_item.dm @@ -482,6 +482,16 @@ 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, non-scopable 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 9f8c451be65..740149fbb0e 100644 --- a/code/modules/projectiles/guns/projectile/sniper.dm +++ b/code/modules/projectiles/guns/projectile/sniper.dm @@ -39,6 +39,17 @@ can_unsuppress = 0 can_suppress = 0 +/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, non-scopable version of the standard issue syndicate sniper rifle. Still capable of sending people crying." + 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 + //Normal Boolets /obj/item/ammo_box/magazine/sniper_rounds name = "sniper rounds (.50)" @@ -160,6 +171,23 @@ weaken = 0 breakthings = FALSE +//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/compact + icon_state = ".50" + +/obj/item/projectile/bullet/sniper/compact //Can't dismember, and can't break things; just deals massive damage. + dismemberment = 0 + breakthings = FALSE + //toy magazine /obj/item/ammo_box/magazine/toy/sniper_rounds name = "donksoft Sniper magazine" From 182177f6eb890d85c0951c60c20ac20c6b961f5f Mon Sep 17 00:00:00 2001 From: Fox McCloud Date: Sat, 23 Feb 2019 18:17:21 -0500 Subject: [PATCH 2/2] grammar/wording --- code/datums/uplink_item.dm | 2 +- code/modules/projectiles/guns/projectile/sniper.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm index 3f236404b27..4e49980af5b 100644 --- a/code/datums/uplink_item.dm +++ b/code/datums/uplink_item.dm @@ -484,7 +484,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) /datum/uplink_item/dangerous/sniper_compact //For when you really really hate that one guy. name = "Compact Sniper Rifle" - desc = "A compact, non-scopable version of the operative sniper rifle. Packs a powerful punch, but ammo is limited." + 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 diff --git a/code/modules/projectiles/guns/projectile/sniper.dm b/code/modules/projectiles/guns/projectile/sniper.dm index 740149fbb0e..cbffd8ecf8a 100644 --- a/code/modules/projectiles/guns/projectile/sniper.dm +++ b/code/modules/projectiles/guns/projectile/sniper.dm @@ -41,7 +41,7 @@ /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, non-scopable version of the standard issue syndicate sniper rifle. Still capable of sending people crying." + desc = "a compact, unscoped version of the standard issue syndicate sniper rifle. Still capable of sending people crying." recoil = 0 weapon_weight = WEAPON_LIGHT fire_delay = 0