From eac4f841ce9e27b17213fc25884627fccec7b369 Mon Sep 17 00:00:00 2001 From: Mark van Alphen Date: Thu, 2 May 2019 01:39:11 +0200 Subject: [PATCH] Switch to penetrator/sopo rounds only --- .../items/weapons/storage/uplink_kits.dm | 2 +- .../projectiles/guns/projectile/sniper.dm | 22 ++++++++++++++----- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm index 93b6daf3fec..5d31cc3f59b 100644 --- a/code/game/objects/items/weapons/storage/uplink_kits.dm +++ b/code/game/objects/items/weapons/storage/uplink_kits.dm @@ -105,7 +105,7 @@ return if("professional") // 32 TC + two 0TC - new /obj/item/gun/projectile/automatic/sniper_rifle(src) // 16TC + new /obj/item/gun/projectile/automatic/sniper_rifle/syndicate/penetrator(src) // 16TC new /obj/item/ammo_box/magazine/sniper_rounds/penetrator(src) // 5TC new /obj/item/ammo_box/magazine/sniper_rounds/soporific(src) // 3TC new /obj/item/clothing/glasses/thermal/syndi/sunglasses(src) // 6TC diff --git a/code/modules/projectiles/guns/projectile/sniper.dm b/code/modules/projectiles/guns/projectile/sniper.dm index 1be05bf03ef..e030c9afb2a 100644 --- a/code/modules/projectiles/guns/projectile/sniper.dm +++ b/code/modules/projectiles/guns/projectile/sniper.dm @@ -1,6 +1,6 @@ /obj/item/gun/projectile/automatic/sniper_rifle name = "sniper rifle" - desc = "the kind of gun that will leave you crying for mummy before you even realise your leg's missing" + desc = "The kind of gun that will leave you crying for mummy before you even realise your leg's missing." icon_state = "sniper" item_state = "sniper" recoil = 2 @@ -20,17 +20,27 @@ slot_flags = SLOT_BACK actions_types = list() +/obj/item/gun/projectile/automatic/sniper_rifle/syndicate + name = "syndicate sniper rifle" + desc = "Syndicate flavoured sniper rifle, it packs quite a punch, a punch to your face." + origin_tech = "combat=7;syndicate=6" + +/obj/item/gun/projectile/automatic/sniper_rifle/syndicate/penetrator + name = "syndicate penetrator sniper rifle" + +/obj/item/gun/projectile/automatic/sniper_rifle/syndicate/penetrator/Initialize(mapload) + . = ..() + desc += " It comes loaded with a penetrator magazine, but can use different magazines." + + QDEL_NULL(magazine) + magazine = new /obj/item/ammo_box/magazine/sniper_rounds/penetrator(src) + /obj/item/gun/projectile/automatic/sniper_rifle/update_icon() if(magazine) icon_state = "sniper-mag" else icon_state = "sniper" -/obj/item/gun/projectile/automatic/sniper_rifle/syndicate - name = "syndicate sniper rifle" - desc = "Syndicate flavoured sniper rifle, it packs quite a punch, a punch to your face" - origin_tech = "combat=7;syndicate=6" - /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."