From 568c7f10be5ffd7d34140ab71791ee2d97d122ef Mon Sep 17 00:00:00 2001 From: Yoshax Date: Fri, 16 Jun 2017 19:43:57 +0100 Subject: [PATCH 1/2] Adds in the Thompson Contender --- .../projectiles/guns/projectile/contender.dm | 42 ++++++++++++++++++ icons/obj/gun.dmi | Bin 70811 -> 71537 bytes polaris.dme | 1 + 3 files changed, 43 insertions(+) create mode 100644 code/modules/projectiles/guns/projectile/contender.dm diff --git a/code/modules/projectiles/guns/projectile/contender.dm b/code/modules/projectiles/guns/projectile/contender.dm new file mode 100644 index 0000000000..c474e7d679 --- /dev/null +++ b/code/modules/projectiles/guns/projectile/contender.dm @@ -0,0 +1,42 @@ +/obj/item/weapon/gun/projectile/contender + name = "Thompson Contender" + desc = "A perfect, pristine replica of an ancient one-shot hand-cannon. For when you really want to make a hole. This one has been modified to work almost like a bolt-action." + icon_state = "pockrifle" + var/icon_retracted = "pockrifle-empty" + item_state = "revolver" + caliber = "357" + handle_casings = HOLD_CASINGS + max_shells = 1 + ammo_type = /obj/item/ammo_casing/a357 + var/retracted_bolt = 0 + load_method = SINGLE_CASING + +/obj/item/weapon/gun/projectile/contender/attack_self(mob/user as mob) + if(chambered) + chambered.loc = get_turf(src) + chambered = null + var/obj/item/ammo_casing/C = loaded[1] + loaded -= C + + if(!retracted_bolt) + to_chat(user, "You cycle back the bolt on [src], ejecting the casing and allowing you to reload.") + icon_state = icon_retracted + retracted_bolt = 1 + return 1 + else if(retracted_bolt && loaded.len) + to_chat(user, "You cycle the loaded round into the chamber, allowing you to fire.") + else + to_chat(user, "You cycle the boly back into position, leaving the gun empty.") + icon_state = initial(icon_state) + retracted_bolt = 0 + +/obj/item/weapon/gun/projectile/contender/load_ammo(var/obj/item/A, mob/user) + if(!retracted_bolt) + to_chat(user, "You can't load [src] without cycling the bolt.") + return + ..() + +/obj/item/weapon/gun/projectile/contender/tacticool + desc = "A modified replica of an ancient one-shot hand-cannon, reinvented with a tactical look. For when you really want to make a hole. This one has been modified to work almost like a bolt-action." + icon_state = "pockrifle_b" + icon_retracted = "pockrifle_b-empty" \ No newline at end of file diff --git a/icons/obj/gun.dmi b/icons/obj/gun.dmi index 75f5005aa5794183a1504ec505ee657b66650f9b..a548850ef96faff21fb879eb2a8277766815ea22 100644 GIT binary patch delta 13334 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 xWXk`KB(!`HQIPwuellrv(xvl&<&yOWi5jOz Date: Tue, 20 Jun 2017 14:12:36 +0100 Subject: [PATCH 2/2] Fixes things --- code/modules/projectiles/guns/projectile/contender.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/projectiles/guns/projectile/contender.dm b/code/modules/projectiles/guns/projectile/contender.dm index c474e7d679..4d840a214b 100644 --- a/code/modules/projectiles/guns/projectile/contender.dm +++ b/code/modules/projectiles/guns/projectile/contender.dm @@ -1,10 +1,10 @@ /obj/item/weapon/gun/projectile/contender name = "Thompson Contender" - desc = "A perfect, pristine replica of an ancient one-shot hand-cannon. For when you really want to make a hole. This one has been modified to work almost like a bolt-action." + desc = "A perfect, pristine replica of an ancient one-shot hand-cannon. For when you really want to make a hole. This one has been modified to work almost like a bolt-action. Uses .357 rounds." icon_state = "pockrifle" var/icon_retracted = "pockrifle-empty" item_state = "revolver" - caliber = "357" + caliber = ".357" handle_casings = HOLD_CASINGS max_shells = 1 ammo_type = /obj/item/ammo_casing/a357 @@ -37,6 +37,6 @@ ..() /obj/item/weapon/gun/projectile/contender/tacticool - desc = "A modified replica of an ancient one-shot hand-cannon, reinvented with a tactical look. For when you really want to make a hole. This one has been modified to work almost like a bolt-action." + desc = "A modified replica of an ancient one-shot hand-cannon, reinvented with a tactical look. For when you really want to make a hole. This one has been modified to work almost like a bolt-action. Uses .357 rounds." icon_state = "pockrifle_b" icon_retracted = "pockrifle_b-empty" \ No newline at end of file