From 948c8a6bf0e9c26f06b5601f79305b65f5e09361 Mon Sep 17 00:00:00 2001 From: Tk420634 Date: Wed, 8 Jan 2025 11:42:35 -0600 Subject: [PATCH 1/3] Adds Parry to all hand items. Don't at me, tongue parry exists now. --- code/game/objects/hand_items.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/objects/hand_items.dm b/code/game/objects/hand_items.dm index 973acbcebe..5ff492f1da 100644 --- a/code/game/objects/hand_items.dm +++ b/code/game/objects/hand_items.dm @@ -14,6 +14,7 @@ resistance_flags = FIRE_PROOF | ACID_PROOF rad_flags = RAD_NO_CONTAMINATE slot_flags = INV_SLOTBIT_DENYPOCKET + block_parry_data = /datum/block_parry_data/bokken //release the butt parries /obj/item/hand_item/Initialize(mapload) . = ..() From bd9a9705e5eff80d7d69e579f485c988d2445c5b Mon Sep 17 00:00:00 2001 From: Tk420634 Date: Wed, 8 Jan 2025 12:02:41 -0600 Subject: [PATCH 2/3] Should make all directional melee weapons always use directional attacks --- code/datums/components/melee_special.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/components/melee_special.dm b/code/datums/components/melee_special.dm index ab02054cf9..9b74983e33 100644 --- a/code/datums/components/melee_special.dm +++ b/code/datums/components/melee_special.dm @@ -34,7 +34,7 @@ /// The maximum distance the weapon can hit a mob from. var/max_distance = 1 /// List of which intents trigger this thing - var/list/intent_flags = list(INTENT_HARM) + var/list/intent_flags = list(INTENT_HELP, INTENT_DISARM, INTENT_GRAB, INTENT_HARM) /// targetting flags var/target_flags = WS_TARGET_WALLS | WS_TARGET_IGNORE_DEAD | WS_TARGET_IGNORE_SELF | WS_TARGET_MOBS | WS_TARGET_STRUCTURES | WS_TARGET_MACHINES /// target mode From d9fc8bfd981ba7b9d721a788a8720bbf088fb144 Mon Sep 17 00:00:00 2001 From: Tk420634 Date: Wed, 8 Jan 2025 12:37:48 -0600 Subject: [PATCH 3/3] Unobfuscates Firearm names --- .../code/modules/znuguns/code/guns/tier0.dm | 14 +- .../code/modules/znuguns/code/guns/tier2.dm | 40 +++--- .../code/modules/znuguns/code/guns/tier3.dm | 32 ++--- .../modules/znuguns/code/guns/zloadout.dm | 132 +++++++++--------- 4 files changed, 107 insertions(+), 111 deletions(-) diff --git a/modular_coyote/code/modules/znuguns/code/guns/tier0.dm b/modular_coyote/code/modules/znuguns/code/guns/tier0.dm index 9b9c77b3bc..e939538172 100644 --- a/modular_coyote/code/modules/znuguns/code/guns/tier0.dm +++ b/modular_coyote/code/modules/znuguns/code/guns/tier0.dm @@ -1,7 +1,7 @@ // Put tier respective guns (and loadout options) here. Ammo goes in their respective files somewhere around modular_coyote/code/modules/znuguns/code/ammo . /obj/item/gun/flintlock/musket - name = "post-fall fire belcher" + name = "Musket" desc = "A decently made, probably even safe, muzzle loading rifle made after the fall of the old world." icon = 'modular_coyote/icons/objects/ancient.dmi' icon_state = "musket1" @@ -52,7 +52,7 @@ prefire_randomness = FLINTLOCK_MINIMUSKET_PREFIRE_STD /obj/item/gun/flintlock/musket/jezail - name = "post-fall heirloom long belcher" + name = "post-fall jezail" desc = "A well taken care of muzzle loading firearm. This one shows family insignia and looks to have been handed down for generations." icon = 'modular_coyote/icons/objects/ancient.dmi' icon_state = "jezail" @@ -77,7 +77,7 @@ weapon_special_component = /datum/component/weapon_special/single_turf /obj/item/gun/flintlock - name = "post-fall short belcher" + name = "post-fall muzzle loading pistol" desc = "An almost safe post-fall muzzle loading pistol. Probably- uh. Just don't drop it while loaded." icon_state = "flintlock" inhand_icon_state = "flintlock" @@ -97,7 +97,7 @@ gun_accuracy_zone_type = ZONE_WEIGHT_AUTOMATIC //smoothbore short barrel round ball /obj/item/gun/ballistic/automatic/pistol/pistol22 - name = "can tacker" + name = "Ruger .22 pistol" desc = "A 16 shot pre-fall handgun chambered in .22 long rifle. Great for killing rusty cans." icon_state = "silenced22" mag_type = /obj/item/ammo_box/magazine/m22 @@ -116,7 +116,7 @@ damage_multiplier = TIER0 /obj/item/gun/ballistic/revolver/detective - name = "sidewinder" + name = ".22 revolver" desc = "A very handy six shooter. If your only worries in life are killing a family of squirrels." icon_state = "detective" mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev22 @@ -130,7 +130,7 @@ damage_multiplier = TIER0 /obj/item/gun/ballistic/rifle/repeater/trainer - name = "snapback" + name = "Henry .22 leveraction" desc = "A lever action rifle chambered in .22LR. Used to teach people the basics of firearm operation." icon_state = "lever22" // Placeholder inhand_icon_state = "lever22" @@ -156,7 +156,7 @@ damage_multiplier = TIER0 /obj/item/gun/ballistic/automatic/sportcarbine - name = "spitball" + name = "Ruger 10-22" desc = "One of the many .22 LR carbines that were all the rage before the cataclysm. While lacking in firepower, it more than makes up for it with its cheapness to fire." icon_state = "surplus" inhand_icon_state = "rifle" diff --git a/modular_coyote/code/modules/znuguns/code/guns/tier2.dm b/modular_coyote/code/modules/znuguns/code/guns/tier2.dm index ede1f1ba10..1d553b19f7 100644 --- a/modular_coyote/code/modules/znuguns/code/guns/tier2.dm +++ b/modular_coyote/code/modules/znuguns/code/guns/tier2.dm @@ -1,7 +1,7 @@ // Put tier respective guns (and loadout options) here. Ammo goes in their respective files somewhere around modular_coyote/code/modules/znuguns/code/ammo . /obj/item/gun/ballistic/automatic/pistol/ninemil/rare99 - name = "warden" + name = "Colt N104-D" desc = "A compact .45 pistol. A shorter version of a straightline. It is tiny compared to its bigger brothers and packs a punch." icon = 'icons/fallout/objects/guns/ballistic.dmi' lefthand_file = 'icons/fallout/onmob/weapons/guns_lefthand.dmi' @@ -25,7 +25,7 @@ damage_multiplier = TIER2 /obj/item/gun/ballistic/automatic/pistol/beretta - name = "big nine" + name = "Beretta 9mm" desc = "One of the more common 9mm pistols, the Beretta is popular due to its reliability, 15 round magazine and good looks." icon_state = "beretta" init_mag_type = /obj/item/ammo_box/magazine/m9mm/doublestack @@ -82,7 +82,7 @@ icon_state = "autopipe[magazine ? "-[CEILING(get_ammo(0)/1, 6)*1]" : ""][chambered ? "" : "-e"][silenced ? "-suppressed" : ""]" /obj/item/gun/ballistic/automatic/pistol/sig - name = "straightline" + name = "Sig 9mm" desc = "A pistol that is compact and has an average rate of fire, but still in .45. Adopted by Park Rangers." icon_state = "newsig" inhand_icon_state = "gun" @@ -106,7 +106,7 @@ damage_multiplier = TIER2 /obj/item/gun/ballistic/automatic/pistol/deagle - name = "shucker" + name = "Desert Eagle" desc = "A .44 magnum semi-automatic handgun." icon_state = "deagle" inhand_icon_state = "deagle" @@ -124,7 +124,7 @@ damage_multiplier = TIER2 /obj/item/gun/ballistic/revolver/police - name = ".357 one step" + name = "Double Action Revoler" desc = "Pre-Cataclysm double action police revolver chambered in .357 magnum." icon_state = "police" mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev357 @@ -140,7 +140,7 @@ damage_multiplier = TIER2 /obj/item/gun/ballistic/revolver/m29 - name = ".44 one step" + name = "Big Iron" desc = "Powerful handgun for those who want to travel the deadlands safely in style. Has a bit of a kick." inhand_icon_state = "model29" icon_state = "m29" @@ -159,7 +159,7 @@ damage_multiplier = TIER2 /obj/item/gun/ballistic/automatic/smg/mini_uzi/mp5 - name = "hose" + name = "HK MP5" desc = "A pre-fall design, ancient and fairly common as far as sub machineguns go." icon = 'modular_coyote/icons/objects/automatic.dmi' mob_overlay_icon = 'modular_coyote/icons/objects/back.dmi' @@ -174,7 +174,7 @@ damage_multiplier = TIER2 /obj/item/gun/ballistic/automatic/smg/mini_uzi/mac10 - name = "lil' hose" + name = "MAC-10" desc = "A pre-fall compact machine pistol with a blistering fire rate. Not terribly accurate though." icon = 'modular_coyote/icons/objects/automatic.dmi' icon_state = "mac10" @@ -190,7 +190,7 @@ damage_multiplier = TIER2 /obj/item/gun/ballistic/automatic/smg/greasegun - name = "heavy hose" + name = "Greasegun" desc = "A pre-fall design similar to the fairly common post-fall open bolt smgs. It has tight tolerances and fires a heavy cartridge." icon_state = "grease_gun" inhand_icon_state = "smg9mm" @@ -212,7 +212,7 @@ damage_multiplier = TIER2 /obj/item/gun/ballistic/automatic/m1carbine/compact - name = "reservist compact" + name = "M1 Carbine - Folding Stock" desc = "Similar to the reservist carbine, this model has a folding stock for greater mobility." icon_state = "m1a1carbine" weapon_class = WEAPON_CLASS_CARBINE @@ -223,7 +223,7 @@ damage_multiplier = TIER2 /obj/item/gun/ballistic/automatic/varmint - name = "coyote" + name = "Ruger Ranch Rifle" desc = "A simple pre-fall semi-auto rifle in 5.56mm calibre. Easy to use and maintain." icon_state = "varmint" inhand_icon_state = "varmintrifle" @@ -249,7 +249,7 @@ damage_multiplier = TIER2 * 1.05 /obj/item/gun/ballistic/automatic/service - name = "wolf" + name = "AR-15" desc = "A pre-fall semi-automatic rifle that is believed to have served a great nation at one time. Now they're fairly rare, high maintenance and not very popular. Good for those who can keep it fed." icon_state = "service_rifle" inhand_icon_state = "servicerifle" @@ -272,7 +272,7 @@ damage_multiplier = TIER2 /obj/item/gun/ballistic/automatic/m1garand/sks // to-do, make this have an internal mag please - name = "eastern dragon" + name = "SKS" desc = "Somehow, despite all that has gone wrong over the last few hundred years this eastern rifle is still working. It's almost immaculate." icon = 'icons/fallout/objects/guns/ballistic.dmi' lefthand_file = 'icons/fallout/onmob/weapons/guns_lefthand.dmi' @@ -298,7 +298,7 @@ damage_multiplier = TIER2 /obj/item/gun/ballistic/automatic/aksmol - name = "eastern drake" + name = "Draco" desc = "An assault rifle given to rear echelon troops in place of an SMG. Lacks a stock, but packs a punch." icon = 'icons/fallout/objects/guns/ballistic.dmi' lefthand_file = 'icons/fallout/onmob/weapons/guns_lefthand.dmi' @@ -323,7 +323,7 @@ damage_multiplier = TIER2 /obj/item/gun/ballistic/automatic/fnfal/ak47 - name = "eastern wyvern" + name = "AK-47" desc = "A fairly uncommon eastern rifle. It's hard to tell if this one is in good shape or really bad. They just don't ever look quite right." icon_state = "trueak" inhand_icon_state = "trueak" @@ -348,7 +348,7 @@ damage_multiplier = TIER2 /obj/item/gun/ballistic/automatic/armalite - name = "bear" + name = "AR-10" desc = "A pre-fall semi-automatic .308 rifle. Accurate and packs a punch, but recoil picks up quick, and it's heavy. Makes it suitable for bashing skulls, at least..." icon_state = "armalite" inhand_icon_state = "assault_carbine" @@ -365,7 +365,7 @@ damage_multiplier = TIER2 /obj/item/gun/ballistic/shotgun/grenade // keep this out of the loot list until we fix it - name = "bloop" + name = "Grenade Launcher" desc = "A pre-fall bulky but surprisingly lightweight grenade launcher with a stiff pump." icon = 'modular_coyote/icons/objects/ncrrangersguns.dmi' icon_state = "china_lake" @@ -384,7 +384,7 @@ damage_multiplier = TIER2 /obj/item/gun/ballistic/shotgun/hunting - name = "razorback" + name = "Pump Shotgun" desc = "A pre-fall traditional hunting shotgun with wood furniture and a four-shell capacity underneath." icon_state = "pump" inhand_icon_state = "shotgunpump" @@ -398,7 +398,7 @@ damage_multiplier = TIER2 /obj/item/gun/ballistic/shotgun/automatic/combat/auto5 - name = "hawg" + name = "Auto 5" desc = "A pre-fall semi-automatic shotgun with a four round tube." icon_state = "auto5" inhand_icon_state = "shotgunauto5" @@ -415,7 +415,7 @@ damage_multiplier = TIER2 /obj/item/gun/ballistic/rifle/repeater/trail - name = "heavy snapback" + name = ".44 Lever Action" desc = "A lever action rifle chambered in .44 Magnum." icon_state = "trailcarbine" inhand_icon_state = "trailcarbine" diff --git a/modular_coyote/code/modules/znuguns/code/guns/tier3.dm b/modular_coyote/code/modules/znuguns/code/guns/tier3.dm index 4b94dc647d..16c2cd951d 100644 --- a/modular_coyote/code/modules/znuguns/code/guns/tier3.dm +++ b/modular_coyote/code/modules/znuguns/code/guns/tier3.dm @@ -1,7 +1,7 @@ // Put tier respective guns (and loadout options) here. Ammo goes in their respective files somewhere around modular_coyote/code/modules/znuguns/code/ammo . /obj/item/gun/ballistic/revolver/police/webley - name = "half step" + name = "Webley" desc = "A gas operated police revolver that fires just about as fast as you can click the trigger." icon = 'icons/fallout/objects/guns/ballistic.dmi' icon_state = "webley" @@ -19,7 +19,7 @@ damage_multiplier = TIER3 /obj/item/gun/ballistic/automatic/smg/tommygun - name = "drumroll" + name = "Tommygun" desc = "A powerful pre-fall submachinegun chambered in .45 ACP, this weapon fires at a blistering rate with a heavy pistol cartridge, and can accept very high capacity magazines, to boot." mob_overlay_icon = 'modular_coyote/icons/objects/back.dmi' icon_state = "tommygun" @@ -39,7 +39,7 @@ damage_multiplier = TIER3 /obj/item/gun/ballistic/automatic/smg/mini_uzi - name = "staccato" + name = "Mini-Uzi" desc = "A lightweight, automatic submachine gun, for when you really want someone dead. Uses 9mm rounds." icon_state = "uzi" inhand_icon_state = "uzi" @@ -60,7 +60,7 @@ damage_multiplier = TIER3 /obj/item/gun/ballistic/automatic/smg/mp5sd - name = "nailtacker" + name = "MP5 SD" desc = "An integrally suppressed submachinegun chambered in 9mm." mob_overlay_icon = 'modular_coyote/icons/objects/back.dmi' icon_state = "mp5" @@ -81,7 +81,7 @@ damage_multiplier = TIER3 /obj/item/gun/ballistic/automatic/m1garand - name = "eagle" + name = "M1 Garand" desc = "A very hefty pre-fall rifle with an en-bloc magazine known for making an appealing noise when it is ejected." mob_overlay_icon = 'modular_coyote/icons/objects/back.dmi' icon_state = "m1garand" @@ -112,7 +112,7 @@ damage_multiplier = TIER3 /obj/item/gun/ballistic/automatic/ak556 - name = "eastern lynx" + name = "AK-74" desc = "A pre-fall eastern rifle of a design believed to be more modern. A bit of a unicorn of a gun, and kind of needy." icon = 'icons/fallout/objects/guns/ballistic.dmi' lefthand_file = 'icons/fallout/onmob/weapons/guns_lefthand.dmi' @@ -136,7 +136,7 @@ damage_multiplier = TIER3 /obj/item/gun/ballistic/automatic/z34rifle - name = "eastern puma" + name = "Z-34" desc = "A pre-fall large eastern rifle designed for hunting. Hunting what? Men." icon_state = "zastava" inhand_icon_state = "zastava" @@ -161,7 +161,7 @@ damage_multiplier = TIER3 /obj/item/gun/ballistic/automatic/fnfal - name = "handy" + name = "FN FAL" desc = "A large pre-fall battle rifle. Known today as a tempermental, heavy, beast of a weapon. At least the designers had the foresight to add a handle." mob_overlay_icon = 'modular_coyote/icons/objects/back.dmi' icon_state = "fnfal" @@ -181,7 +181,7 @@ damage_multiplier = TIER3 /obj/item/gun/ballistic/automatic/fnfal/g3battlerifle - name = "forte" + name = "G3" desc = "A foreign designed battle rifle. Pre-fall in design and well. Tempermental. Pretty decent overall though." icon_state = "g3" inhand_icon_state = "g3" @@ -206,7 +206,7 @@ damage_multiplier = TIER3 /obj/item/gun/ballistic/automatic/rpd - name = "eastern whirlwind" + name = "RPD" desc = "A pre-fall eastern designed light machine gun. It's rude, it's crude, it's downright demonic." icon_state = "rpd" inhand_icon_state = "rpd" @@ -230,7 +230,7 @@ damage_multiplier = TIER3 /obj/item/gun/ballistic/automatic/bar - name = "lion" + name = "BAR" desc = "A pre-fall rifle. No one is sure who these were made for, they're almost too big for the average man to use. Perhaps people were larger back then?" icon = 'icons/fallout/objects/guns/bar.dmi' mob_overlay_icon = 'modular_coyote/icons/objects/back.dmi' @@ -252,7 +252,7 @@ damage_multiplier = TIER3 /obj/item/gun/ballistic/automatic/saiga12k - name = "eastern stag" + name = "Saiga" desc = "A pre-fall eastern shotgun. It's reliable and packs a punch. Sure hope you don't want spare parts though." icon = 'icons/fallout/objects/guns/ballistic.dmi' lefthand_file = 'icons/fallout/onmob/weapons/guns_lefthand.dmi' @@ -276,7 +276,7 @@ damage_multiplier = TIER3 /obj/item/gun/ballistic/shotgun/police - name = "jackhammer" + name = "SPAS" desc = "A Pre-Fall shotgun with large magazine and folding stock, made from steel and polymers. Flashlight attachment rail." mob_overlay_icon = 'icons/fallout/onmob/backslot_weapon.dmi' icon_state = "shotgunpolice" @@ -299,7 +299,7 @@ damage_multiplier = TIER3 /obj/item/gun/ballistic/shotgun/trench - name = "bucktoothed boar" + name = "Trench Shotgun" desc = "A post-fall military shotgun designed for close-quarters fighting, equipped with a bayonet lug." icon_state = "trench" inhand_icon_state = "shotguntrench" @@ -319,7 +319,7 @@ damage_multiplier = TIER3 /obj/item/gun/ballistic/rifle/repeater/brush - name = "smashback" + name = "Brush Gun" desc = "A heavy Lever-action rifle chambered in .30-06 its sturdy design lets it handle the largest cartridges and largest game." icon_state = "brushgun" inhand_icon_state = "brushgun" @@ -336,7 +336,7 @@ damage_multiplier = TIER3 /obj/item/gun/ballistic/rifle/enfield - name = "smelly" + name = "SMLE" desc = "A pre-fall 10 round bolt action rifle. No one is sure why they're called smellies, they don't stink at all generally and are quite good." sawn_desc = "Why would someone short stock a smelly? Does that make this just a whiff?" icon = 'modular_coyote/icons/objects/rifles.dmi' diff --git a/modular_coyote/code/modules/znuguns/code/guns/zloadout.dm b/modular_coyote/code/modules/znuguns/code/guns/zloadout.dm index 77a79ca500..edb0eba1cb 100644 --- a/modular_coyote/code/modules/znuguns/code/guns/zloadout.dm +++ b/modular_coyote/code/modules/znuguns/code/guns/zloadout.dm @@ -39,43 +39,39 @@ path = /obj/item/gun/ballistic/revolver/hobo/knifegun /datum/gear/weapon/tier0/postfallfirebelcher - name = "Musket - Post-Fall Fire Belcher" - path = /obj/item/gun/flintlock/musket - -/datum/gear/weapon/tier0/postfallfirebelcher - name = "Musket - Post-Fall Fire Belcher" + name = "Musket" path = /obj/item/gun/flintlock/musket /datum/gear/weapon/tier0/postfallthunderrod - name = "Musketoon - Post-Fall Thunder Rod" + name = "Musketoon" path = /obj/item/gun/flintlock/musketoon /datum/gear/weapon/tier0/postfalljezail - name = "Jezail - Heirloom Long Belcher" + name = "Jezail" path = /obj/item/gun/flintlock/musket/jezail /datum/gear/weapon/tier0/postfallshortbelcher - name = "Flintlock pistol - Post-Fall Short Belcher" + name = "Flintlock pistol" path = /obj/item/gun/flintlock /datum/gear/weapon/tier0/sidewinder - name = "Ruger .22 - .22 Can Tacker" + name = "Ruger .22 pistol" path = /obj/item/gun/ballistic/automatic/pistol/pistol22 /datum/gear/weapon/tier0/sidewinder - name = ".22 Detective Revolver - .22 Sidewinder" + name = ".22 revolver" path = /obj/item/gun/ballistic/revolver/detective /datum/gear/weapon/tier0/snapback - name = ".22 Henry Lever Action - .22 Snapback" + name = ".22 Henry Lever Action" path = /obj/item/ammo_box/magazine/internal/shot/long22 /datum/gear/weapon/tier0/snapback - name = "Ruger 10-22 - .22 Spitball" + name = "Ruger 10-22" path = /obj/item/gun/ballistic/automatic/sportcarbine /datum/gear/weapon/tier1/nine - name = "Hipoint 9mm - 9mm Nine" + name = "Browning Hi-power" path = /obj/item/gun/ballistic/automatic/pistol/ninemil/loadout /datum/gear/weapon/tier1/zip @@ -87,62 +83,62 @@ path = /obj/item/gun/ballistic/revolver/hobo/knucklegun /datum/gear/weapon/tier1/subby - name = "Skorpion vz. 61 - 9mm Subby" + name = "Skorpion vz. 61" path = /obj/item/gun/ballistic/automatic/pistol/ninemil/skorpion/loadout /datum/gear/weapon/tier1/ruby - name = "Ruby Pistol - 9mm Ruby" + name = "Ruby pistol" path = /obj/item/gun/ballistic/automatic/pistol/ninemil/ruby/loadout /datum/gear/weapon/tier1/makarov - name = "Gun - 9mm Makarov" + name = "9mm Makarov" path = /obj/item/gun/ballistic/automatic/pistol/ninemil/makarov/loadout /datum/gear/weapon/tier1/luger - name = "Gun - 9mm Luger" + name = "9mm Luger" path = /obj/item/gun/ballistic/automatic/pistol/ninemil/c93/luger/loadout /datum/gear/weapon/tier1/pd - name = "Glock 45 - 9mm P.D" + name = "Glock 45" path = /obj/item/gun/ballistic/automatic/pistol/ninemil/glock/loadout /datum/gear/weapon/tier1/type17 - name = "Gun - 9mm Type 17" + name = "9mm Type 17" path = /obj/item/gun/ballistic/automatic/pistol/type17/loadout /datum/gear/weapon/tier1/revolver45 - name = "Single Action Revolver - .45 Two Step" + name = "S&W .45 ACP revolver" path = /obj/item/gun/ballistic/revolver/revolver45/loadout /datum/gear/weapon/tier1/revolver357 - name = "Single Action Army - .357 Two Step" + name = "Single Action Army" path = /obj/item/gun/ballistic/revolver/colt357/loadout /datum/gear/weapon/tier1/buntline - name = "Colt Buntline - .45 Long Two Step" + name = "Colt Buntline" path = /obj/item/gun/ballistic/revolver/buntline/loadout /datum/gear/weapon/tier1/derringer - name = ".45 Derringer - .45 Garnet" + name = ".45 Derringer" path = /obj/item/gun/ballistic/revolver/derringerLC/loadout /datum/gear/weapon/tier1/openboltsweeper - name = "Carl Gustav m/45 - .45 Open Bolt Sweeper" + name = "Carl Gustav m/45" path = /obj/item/gun/ballistic/automatic/smg/cg45/loadout /datum/gear/weapon/tier1/reservistcarbine - name = "M1 Carbine - 9mm Reservist Carbine" + name = "M1 Carbine" path = /obj/item/gun/ballistic/automatic/m1carbine/loadout //pulled for now due to reloading not working on them properly @@ -156,101 +152,101 @@ /datum/gear/weapon/tier1/cavalryrifle - name = "Colt Repeater - .357 Cavalry Rfle" + name = "Colt Repeater" path = /obj/item/gun/ballistic/rifle/repeater/cowboy/loadout /datum/gear/weapon/tier1/mardigras - name = "Gras Rifle - .30-06 Mardi-Gras" + name = "Gras Rifle" path = /obj/item/gun/ballistic/rifle/antique/gras/loadout /datum/gear/weapon/tier1/salvagedboltactionrifle - name = "Boys ATR - .30-06 Salvaged Bolt-Action Rifle" + name = "Boys ATR" path = /obj/item/gun/ballistic/rifle/mag/boys/loadout /datum/gear/weapon/tier1/salvagedeasterndragon - name = "Scrap AK-74 - .223 / 5.56x45 Salvaged Eastern Dragon" + name = "Scrap AK-74" path = /obj/item/gun/ballistic/rifle/salvaged_eastern_rifle/loadout /datum/gear/weapon/tier1/flatline - name = "Colt 1911 - .45 Flatline" + name = "Colt 1911" path = /obj/item/gun/ballistic/automatic/pistol/m1911/loadout /datum/gear/weapon/tier1/shortbow - name = "Bow - Shortbow" + name = "Shortbow" path = /obj/item/gun/ballistic/bow/shortbow /////////////// TIER 2 /////////////// /datum/gear/weapon/tier2/warden - name = "Colt N104-D - .45 Warden" + name = "Colt N104-D" path = /obj/item/gun/ballistic/automatic/pistol/ninemil/rare99/loadout /datum/gear/weapon/tier2/bignine - name = "Beretta mm - 9mm Big Nine" + name = "Beretta 9mm" path = /obj/item/gun/ballistic/automatic/pistol/beretta/loadout /datum/gear/weapon/tier2/straightline - name = "Sig 9mm - .45 Straightline" + name = "Sig 9mm" path = /obj/item/gun/ballistic/automatic/pistol/sig/loadout /datum/gear/weapon/tier2/shucker - name = "Desert Eagle - .44 Shucker" + name = "Desert Eagle" path = /obj/item/gun/ballistic/automatic/pistol/deagle/loadout /datum/gear/weapon/tier2/onestep357 - name = "Double Action Revoler - .357 One Step" + name = "Double Action Revoler" path = /obj/item/gun/ballistic/revolver/police/loadout /datum/gear/weapon/tier2/onestep44 - name = "Big Iron - .44 One Step" + name = "Big Iron" path = /obj/item/gun/ballistic/revolver/m29/loadout /datum/gear/weapon/tier2/hose - name = "HK MP5 - 9mm Hose" + name = "HK MP5" path = /obj/item/gun/ballistic/automatic/smg/mini_uzi/mp5/loadout /datum/gear/weapon/tier2/lilhose - name = "MAC-10 - 9mm Lil' Hose" + name = "MAC-10" path = /obj/item/gun/ballistic/automatic/smg/mini_uzi/mac10/loadout /datum/gear/weapon/tier2/heavyhose - name = "Greasegun - .45 Heavy Hose" + name = "Greasegun" path = /obj/item/gun/ballistic/automatic/smg/greasegun/loadout /datum/gear/weapon/tier2/reservistcompact - name = "Folding M1 Carbine - 9mm Reservist Compact" + name = "Folding M1 Carbine" path = /obj/item/gun/ballistic/automatic/m1carbine/compact/loadout /datum/gear/weapon/tier2/coyote - name = "Ranch Rifle - .223 / 5.56x45mm Coyote" + name = "Ruger Ranch Rifle" path = /obj/item/gun/ballistic/automatic/varmint/loadout /datum/gear/weapon/tier2/wolf - name = "AR-15 - .223 / 5.56x45mm Wolf" + name = "AR-15" path = /obj/item/gun/ballistic/automatic/service/loadout /datum/gear/weapon/tier2/easterndragon - name = "SKS - 7.62x39mm Eastern Dragon" + name = "SKS" path = /obj/item/gun/ballistic/automatic/m1garand/sks/loadout /datum/gear/weapon/tier2/easterndrake - name = "Draco - .223 / 5.56x45mm Eastern Drake" + name = "Draco" path = /obj/item/gun/ballistic/automatic/aksmol/loadout /datum/gear/weapon/tier2/easternwyvern - name = "AK-47 - 7.62x39mm Eastern Wyvern" + name = "AK-47" path = /obj/item/gun/ballistic/automatic/fnfal/ak47/loadout /datum/gear/weapon/tier2/bear - name = "AR-10 - .308 / 7.62x51mm Bear" + name = "AR-10" path = /obj/item/gun/ballistic/automatic/armalite/loadout /datum/gear/weapon/tier2/longbow - name = "Bow - Longbow" + name = "Longbow" path = /obj/item/gun/ballistic/bow/longbow // /datum/gear/weapon/tier2/ @@ -260,11 +256,11 @@ // cost = 4 /datum/gear/weapon/tier2/razorback - name = "Pump Shotgun - 12 Gauge Razorback" + name = "Pump Shotgun" path = /obj/item/gun/ballistic/shotgun/hunting/loadout /datum/gear/weapon/tier2/hawg - name = "Auto-5 - 12 Gauge Hawg" + name = "Auto-5" path = /obj/item/gun/ballistic/shotgun/automatic/combat/auto5/loadout /datum/gear/weapon/tier2/heavysnapback @@ -272,7 +268,7 @@ path = /obj/item/gun/ballistic/rifle/repeater/trail/loadout /datum/gear/weapon/tier2/ - name = "Hunting/Surplus Rifles - .30-06 Hunting Rifle" + name = "Hunting/Surplus Rifles" path = /obj/item/gun/ballistic/rifle/hunting/loadout /datum/gear/weapon/tier2/autopipe @@ -283,71 +279,71 @@ /////////////// TIER 3 /////////////// /datum/gear/weapon/tier3/halfstep - name = "Webley - 9mm Half Step" + name = "Webley" path = /obj/item/gun/ballistic/revolver/police/webley/loadout /datum/gear/weapon/tier3/drumroll - name = "Tommygun - .45 Drumroll" + name = "Tommygun" path = /obj/item/gun/ballistic/automatic/smg/tommygun/loadout /datum/gear/weapon/tier3/staccato - name = "Mini-Uzi - 9mm Staccato" + name = "Mini-Uzi" path = /obj/item/gun/ballistic/automatic/smg/mini_uzi/loadout /datum/gear/weapon/tier3/nailtacker - name = "MP5 Silenced - 9mm Nailtacker" + name = "MP5 Silenced" path = /obj/item/gun/ballistic/automatic/smg/mp5sd/loadout /datum/gear/weapon/tier3/eagle - name = "M1 Garand - .30-06 Eagle" + name = "M1 Garand" path = /obj/item/gun/ballistic/automatic/m1garand/loadout /datum/gear/weapon/tier3/easternlynx - name = "AK-74 - 7.62x39 Eastern Lynx" + name = "AK-74" path = /obj/item/gun/ballistic/automatic/ak556/loadout /datum/gear/weapon/tier3/easternpuma - name = "Z-34 - .30-06 Eastern Puma" + name = "Z-34" path = /obj/item/gun/ballistic/automatic/z34rifle/loadout /datum/gear/weapon/tier3/handy - name = "FN FAL - .308 Handy" + name = "FN FAL" path = /obj/item/gun/ballistic/automatic/fnfal/loadout /datum/gear/weapon/tier3/forte - name = "G3 - .308 Forte" + name = "G3" path = /obj/item/gun/ballistic/automatic/fnfal/g3battlerifle/loadout /datum/gear/weapon/tier3/easternwhirlwind - name = "RPD - 7.62x39 Eastern Whirlwind" + name = "RPD" path = /obj/item/gun/ballistic/automatic/rpd/loadout /datum/gear/weapon/tier3/lion - name = "BAR - .30-06 Lion" + name = "BAR" path = /obj/item/gun/ballistic/automatic/bar/loadout /datum/gear/weapon/tier3/stag - name = "Saiga - 12 Gauge Eastern Stag" + name = "Saiga" path = /obj/item/gun/ballistic/automatic/saiga12k/loadout /datum/gear/weapon/tier3/jackhammer - name = "SPAS - 12 Gauge Jackhammer" + name = "SPAS" path = /obj/item/gun/ballistic/shotgun/police/loadout /datum/gear/weapon/tier3/bucktoothedboar - name = "Trench Shotgun - 12 Gauge Bucktoothed Boar" + name = "Trench Shotgun" path = /obj/item/gun/ballistic/shotgun/trench/loadout /datum/gear/weapon/tier3/smashback - name = "Brush Gun - .30-06 Smashback" + name = "Brush Gun" path = /obj/item/gun/ballistic/rifle/repeater/brush/loadout /datum/gear/weapon/tier3/smelly - name = "SMLE - .30-06 Smelly" + name = "SMLE" path = /obj/item/gun/ballistic/rifle/enfield/loadout /datum/gear/weapon/tier3/prefallcompoundbow - name = "Bow - Pre-Fall Compound Bow" + name = "Pre-Fall Compound Bow" path = /obj/item/gun/ballistic/bow/compoundbow/loadout //MAGIC STUFF