From fb8128d9342cf48d369a0522d8dc852ac64fbb10 Mon Sep 17 00:00:00 2001 From: Michiyamenotehifunana <31995558+Michiyamenotehifunana@users.noreply.github.com> Date: Sun, 17 Sep 2017 21:38:57 +0800 Subject: [PATCH 1/2] Adds Anti Tank pistols Due to balance concerns and unironed out bugs, adminspawn only. --- code/citadel/cit_guns.dm | 24 +++++++++++++++++++++++- icons/obj/guns/cit_guns.dmi | Bin 1188 -> 2044 bytes 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/code/citadel/cit_guns.dm b/code/citadel/cit_guns.dm index ae78d1d172..990a0cf469 100644 --- a/code/citadel/cit_guns.dm +++ b/code/citadel/cit_guns.dm @@ -26,4 +26,26 @@ build_type = PROTOLATHE materials = list(MAT_GOLD = 2500, MAT_METAL = 5000, MAT_GLASS = 5000) build_path = /obj/item/gun/energy/laser/carbine/nopin - category = list("Weapons") \ No newline at end of file + category = list("Weapons") + +/obj/item/gun/ballistic/pistol/antitank + name = "Anti Tank Pistol" + desc = "A massively impractical and silly monstrosity of a pistol that fires .50 calliber rounds. The recoil is likely to dislocate your wrist." + icon = 'icons/obj/guns/cit_guns.dmi' + icon_state = "atp" + item_state = "pistol" + recoil = 2 + mag_type = /obj/item/ammo_box/magazine/sniper_rounds + fire_delay = 40 + burst_size = 1 + origin_tech = "combat=7" + can_suppress = 0 + w_class = WEIGHT_CLASS_NORMAL + actions_types = list() + + +/obj/item/gun/ballistic/pistol/antitank/update_icon() + if(magazine) + icon_state = "atp" + else + icon_state = "atp-e" \ No newline at end of file diff --git a/icons/obj/guns/cit_guns.dmi b/icons/obj/guns/cit_guns.dmi index e1b2e8ac1a582c60cf36a7cc2f6dea6a7e0eaa25..c5f49d0a2e7d7c8969c5177f8db8e6aa7eaf631a 100644 GIT binary patch literal 2044 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 From 1f84944deeb41efaba8bd9a90f7cc0ef1fc47f50 Mon Sep 17 00:00:00 2001 From: Michiyamenotehifunana <31995558+Michiyamenotehifunana@users.noreply.github.com> Date: Mon, 18 Sep 2017 23:11:14 +0800 Subject: [PATCH 2/2] Anti Tank Pistol Improvements and Implementation Fixes the issues with the ATP, modifies its sprite slightly, and adds it to the nukeops uplink list. --- code/citadel/cit_guns.dm | 24 ++++++++++++++++++------ code/modules/uplink/uplink_item_cit.dm | 12 ++++++++++++ icons/obj/guns/cit_guns.dmi | Bin 2044 -> 2368 bytes 3 files changed, 30 insertions(+), 6 deletions(-) diff --git a/code/citadel/cit_guns.dm b/code/citadel/cit_guns.dm index 990a0cf469..ec1caacdab 100644 --- a/code/citadel/cit_guns.dm +++ b/code/citadel/cit_guns.dm @@ -28,24 +28,36 @@ build_path = /obj/item/gun/energy/laser/carbine/nopin category = list("Weapons") -/obj/item/gun/ballistic/pistol/antitank +/obj/item/gun/ballistic/automatic/pistol/antitank name = "Anti Tank Pistol" desc = "A massively impractical and silly monstrosity of a pistol that fires .50 calliber rounds. The recoil is likely to dislocate your wrist." icon = 'icons/obj/guns/cit_guns.dmi' icon_state = "atp" item_state = "pistol" - recoil = 2 + recoil = 6 mag_type = /obj/item/ammo_box/magazine/sniper_rounds - fire_delay = 40 + fire_delay = 50 burst_size = 1 origin_tech = "combat=7" can_suppress = 0 w_class = WEIGHT_CLASS_NORMAL actions_types = list() + fire_sound = 'sound/weapons/blastcannon.ogg' + spread = 30 //damn thing has no rifling. -/obj/item/gun/ballistic/pistol/antitank/update_icon() +/obj/item/gun/ballistic/automatic/pistol/antitank/update_icon() + ..() if(magazine) - icon_state = "atp" + cut_overlays() + add_overlay("atp-mag") else - icon_state = "atp-e" \ No newline at end of file + cut_overlays() + icon_state = "[initial(icon_state)][chambered ? "" : "-e"]" + +/obj/item/gun/ballistic/automatic/pistol/antitank/syndicate + name = "Syndicate Anti Tank Pistol" + desc = "A massively impractical and silly monstrosity of a pistol that fires .50 calliber rounds. The recoil is likely to dislocate a variety of joints without proper bracing." + pin = /obj/item/device/firing_pin/implant/pindicate + origin_tech = "combat=7;syndicate=6" + diff --git a/code/modules/uplink/uplink_item_cit.dm b/code/modules/uplink/uplink_item_cit.dm index 68000d6d5c..c9bb091303 100644 --- a/code/modules/uplink/uplink_item_cit.dm +++ b/code/modules/uplink/uplink_item_cit.dm @@ -28,3 +28,15 @@ /obj/item/storage/box/syndie_kit/holoparasite/PopulateContents() new /obj/item/guardiancreator/tech/choose/traitor(src) new /obj/item/paper/guides/antag/guardian(src) + +/datum/uplink_item/dangerous/antitank + name = "Anti Tank Pistol" + desc = "Essentially amounting to a sniper rifle with no stock and barrel (or indeed, any rifling at all),\ + this extremely dubious pistol is guaranteed to dislocate your wrists and hit the broad side of a barn!\ + Uses sniper ammo.\ + Bullets tend to veer off-course. We are not responsible for any unintentional damage or injury resulting from inaacuracy." + item = /obj/item/gun/ballistic/automatic/pistol/antitank/syndicate + refundable = TRUE + cost = 14 + surplus = 25 + include_modes = list(/datum/game_mode/nuclear) diff --git a/icons/obj/guns/cit_guns.dmi b/icons/obj/guns/cit_guns.dmi index c5f49d0a2e7d7c8969c5177f8db8e6aa7eaf631a..b5a2ae8fdcf5230bdeedaf88f6cd9f2ef1621ea3 100644 GIT binary patch literal 2368 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