Skip to content

Commit

Permalink
armors, loadouts and guns.
Browse files Browse the repository at this point in the history
Adds a large amount of Pre-WW1 gear, adds WW2 soviet gear, redoes some of the sprites for some guns while also tidying up their sprites. Adjusts loadouts and adds new ones.
  • Loading branch information
FluffyTox committed Sep 29, 2023
1 parent b0ed5e9 commit 0a1eb75
Show file tree
Hide file tree
Showing 23 changed files with 402 additions and 58 deletions.
1 change: 1 addition & 0 deletions code/game/objects/effects/spawners/masterlootdrop.dm
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,7 @@
/obj/item/gun/ballistic/rifle/repeater/volcanic = 3,
/obj/item/gun/ballistic/revolver/Lemat = 2,
/obj/item/gun/ballistic/automatic/pistol/vg77 = 2,
/obj/item/gun/ballistic/rifle/salvaged_eastern_rifle = 2,
)

/obj/effect/spawner/lootdrop/f13/uncommon_guns
Expand Down
99 changes: 99 additions & 0 deletions code/modules/clothing/head/helmet.dm
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,105 @@
icon = 'icons/fallout/clothing/helmets.dmi'


/obj/item/clothing/head/cossackgear
name = "Black bearskin hat"
desc = "A very warm and well made bearskin hat. The black fur is commonly seen across the world from Kuban cossacks to the Queen's guard. The hat is remarkable soft and very useful for the winter. Take out that sabre and charge forth!"
icon_state = "cossack"
item_state = "cossack"
name = "Base for kevlar helmets of various degrees"
desc = "Base for Kevlar helmets 2.0 electric boogaloo"
armor_tokens = list( ARMOR_MODIFIER_UP_DT_T1 , ARMOR_MODIFIER_UP_ENV_T1)
armor = ARMOR_VALUE_LIGHT
dog_fashion = null
slowdown = ARMOR_SLOWDOWN_NONE * ARMOR_SLOWDOWN_GLOBAL_MULT
mob_overlay_icon = 'icons/fallout/onmob/clothes/helmet.dmi'
icon = 'icons/fallout/clothing/helmets.dmi'
flags_inv = HIDEEARS

/obj/item/clothing/head/cossackgear/white
name = "White bearskin hat"
desc = "A very warm and well made bearskin hat. The white fur is uncommonly seen across the world from cossacks to other groups across the world. The hat is remarkable soft and very useful for the winter. Take out that sabre and charge forth!"
icon_state = "wcossack"
item_state = "wcossack"
mob_overlay_icon = 'icons/fallout/onmob/clothes/helmet.dmi'
icon = 'icons/fallout/clothing/helmets.dmi'
flags_inv = HIDEEARS

/obj/item/clothing/head/cossackgear/papakhacossack
name = "Black Papahka hat"
desc = "A very warm and well made papakha hat. Made of wool, this hat was used throughout the Caucasus regions."
icon_state = "papakha"
item_state = "papakha"
mob_overlay_icon = 'icons/fallout/onmob/clothes/helmet.dmi'
icon = 'icons/fallout/clothing/helmets.dmi'
flags_inv = HIDEEARS

/obj/item/clothing/head/cossackgear/papakhawhitecossack
name = "White bearskin hat"
desc = "A very warm and well made papakha hat. Made of wool, this hat was used throughout the Caucasus regions. This one is white"
icon_state = "papakhaw"
item_state = "papakhaw"
mob_overlay_icon = 'icons/fallout/onmob/clothes/helmet.dmi'
icon = 'icons/fallout/clothing/helmets.dmi'
flags_inv = HIDEEARS

/obj/item/clothing/head/cossackgear/papakhakubancossack
name = "White bearskin hat"
desc = "A very warm and well made papakha hat. Made of wool, this hat was used throughout the Caucasus regions. This one is based off the hats used by the Kuban Cossacks."
icon_state = "papakhakuban"
item_state = "papakhakuban"
mob_overlay_icon = 'icons/fallout/onmob/clothes/helmet.dmi'
icon = 'icons/fallout/clothing/helmets.dmi'
flags_inv = HIDEEARS


/obj/item/clothing/head/kevlarhelmet/steelgerman
name = "Biker helmet"
desc = "A biker's steel helmet. Good on style and kicking ass at the bar. 'What did you say about my mother?'-some biker probably."
icon_state = "1919german"
item_state = "1919german"
mob_overlay_icon = 'icons/fallout/onmob/clothes/helmet.dmi'
icon = 'icons/fallout/clothing/helmets.dmi'

/obj/item/clothing/head/kevlarhelmet/steelww2soviet
name = "WW2 Soviet helmet"
desc = "A outdated yet functional soviet helmet from WW2. It is a plain, cut, simple, and simple-designed helmet that offers the same protection as any else steel helmet."
icon_state = "sovhelm"
item_state = "sovhelm"
mob_overlay_icon = 'icons/fallout/onmob/clothes/helmet.dmi'
icon = 'icons/fallout/clothing/helmets.dmi'

/obj/item/clothing/head/kevlarhelmet/pilotka
name = "Armored Pilotka hat"
desc = "A ballistic weaved pilotka hat. The hat originated during WW1 and saw extensive use by the Red Army in WW2. After the 1980s, the pilotka was used during the summer time. It still finds use in post-war and pre-war modern times."
icon_state = "pilotka"
item_state = "pilotka"
mob_overlay_icon = 'icons/fallout/onmob/clothes/helmet.dmi'
icon = 'icons/fallout/clothing/helmets.dmi'


/obj/item/clothing/head/armoredushanka
name = "Ballistic Soviet Union Ushanka"
desc = "A Ushanka made with ballistic weave and kevlar in mind. Now you can rock the motherland's style while having that head of yours be protected. Still comfortable if not a shy bit more comfortable than your usual ushanka."
icon_state = "newushanka"
item_state = "newushanka"
name = "Base for kevlar helmets of various degrees"
desc = "Base for Kevlar helmets 2.0 electric boogaloo"
armor_tokens = list( ARMOR_MODIFIER_UP_DT_T1 , ARMOR_MODIFIER_UP_ENV_T1)
armor = ARMOR_VALUE_LIGHT
dog_fashion = null
slowdown = ARMOR_SLOWDOWN_NONE * ARMOR_SLOWDOWN_GLOBAL_MULT
mob_overlay_icon = 'icons/fallout/onmob/clothes/helmet.dmi'
icon = 'icons/fallout/clothing/helmets.dmi'
flags_inv = HIDEEARS

/obj/item/clothing/head/kevlarhelmet/steelfrench
name = "French Adrian helmet"
desc = "A French, albeit outdated, Adrian helmet. It was the first helmet used by the French military during the great war. In WW2, the helmet was used again but named the M26. Adjust that helmet and get back to the frontlines!"
icon_state = "adrian"
item_state = "adrian"
mob_overlay_icon = 'icons/fallout/onmob/clothes/helmet.dmi'
icon = 'icons/fallout/clothing/helmets.dmi'

/obj/item/clothing/head/kevlarhelmet/toxtestinghelmet
name = "VeturrHjalmur"
Expand Down
41 changes: 41 additions & 0 deletions code/modules/clothing/suits/arfsuits.dm
Original file line number Diff line number Diff line change
Expand Up @@ -550,6 +550,23 @@
icon_state = "denison_smock"
item_state = "police_chief"


/obj/item/clothing/suit/armor/outfit/jacket/rdashjacket
name = "Dashing rainbow jacket"
desc = "A lovingly made jacket, adorn with rainbow colors and a thunderbolt symbol on the back of the jacket. If anything, this jacket makes you oh..I dunno..20% cooler?"
icon = 'icons/fallout/clothing/armored_light.dmi'
mob_overlay_icon = 'icons/fallout/onmob/clothes/armor_light.dmi'
icon_state = "rainbowdash"
item_state = "rainbowdash"

/obj/item/clothing/suit/armor/outfit/jacket/sovietpadded
name = "Padded Soviet jacket"
desc = "A padded and well made Soviet jacket. Useful for the winter, but doesn't offer much protection against bullets or really any form of punishment. Compliments any soldier belonging to the Motherland. A wise soldier once said 'As long as Mother Russia has enemies, I will answer her call...'."
icon = 'icons/fallout/clothing/armored_light.dmi'
mob_overlay_icon = 'icons/fallout/onmob/clothes/armor_light.dmi'
icon_state = "sovjacket"
item_state = "sovjacket"

// until togglesuits are made into normal suits, treat these as jackets

/obj/item/clothing/suit/toggle/labcoat
Expand Down Expand Up @@ -1306,6 +1323,30 @@
item_state = "hostrench"
body_parts_hidden = ARMS

/obj/item/clothing/suit/armor/light/duster/greatcoatgrey
name = "Grey greatcoat"
desc = "A greyed out greatcoat. This coat also comes with a furred interior for the toughest of winters"
icon_state = "gerparka"
item_state = "gerparka"
icon = 'icons/fallout/clothing/armored_light.dmi'
mob_overlay_icon = 'icons/fallout/onmob/clothes/armor_light.dmi'

/obj/item/clothing/suit/armor/light/duster/vlongcoat
name = "Black winter greatcoat"
desc = "A black greatcoat that resembles the coats used by Kuban cossacks. A greatcoat, fitting for your cold weather needs."
icon_state = "bcossack"
item_state = "bcossack"
icon = 'icons/fallout/clothing/armored_light.dmi'
mob_overlay_icon = 'icons/fallout/onmob/clothes/armor_light.dmi'

/obj/item/clothing/suit/armor/light/duster/vlongcoat/blue
name = "Blue winter greatcoat"
desc = "A blue greatcoat that resembles the coats used by Don cossacks. A greatcoat, fitting for your cold weather needs."
icon_state = "blcossack"
item_state = "blcossack"
icon = 'icons/fallout/clothing/armored_light.dmi'
mob_overlay_icon = 'icons/fallout/onmob/clothes/armor_light.dmi'

/obj/item/clothing/suit/armor/light/duster/town/leather
name = "leather trenchcoat"
desc = "A snazzy black trenchcoat, fit for a dragon."
Expand Down
50 changes: 50 additions & 0 deletions code/modules/clothing/under/f13.dm
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,56 @@
mob_overlay_icon = 'icons/fallout/onmob/clothes/uniform.dmi'
icon = 'icons/fallout/clothing/uniforms.dmi'

/obj/item/clothing/under/f13/thegreatwaruniforms
name = "Old french uniform"
desc = "An outdated yet classy french uniform. It saw service in the great war. During this time, it was dubbed the 'sky uniform' on account of its baby blue appearance. Steel yourself and fix bayonets!"
icon_state = "frenchuniform"
item_state = "frenchuniform"
mob_overlay_icon = 'icons/fallout/onmob/clothes/uniform.dmi'
icon = 'icons/fallout/clothing/uniforms.dmi'

/obj/item/clothing/under/f13/thegreatwaruniforms/german
name = "Old East german uniform"
desc = "An old and outdated East German uniform. It resembles the uniform used by Imperial Germany during the Great War or 'The war to end all wars'. Dull, grey, it matches perfectly with the incoming artillery smoke. Adjust those buttons and prepare to charge."
icon_state = "imperialuniform"
item_state = "imperialuniform"
mob_overlay_icon = 'icons/fallout/onmob/clothes/uniform.dmi'
icon = 'icons/fallout/clothing/uniforms.dmi'

/obj/item/clothing/under/f13/thegreatwaruniforms/britishww1
name = "Old British uniform"
desc = "An old and outdated British uniform. This uniform was used during the Great War, also known as 'World War 1' which was a global conflict consisting of the Triple Entente and the Central Powers. Classy, pristine, and well tailored. Prepare your bayonets and charge with elegance."
icon_state = "britishuniform"
item_state = "britishuniform"
mob_overlay_icon = 'icons/fallout/onmob/clothes/uniform.dmi'
icon = 'icons/fallout/clothing/uniforms.dmi'

/obj/item/clothing/under/f13/thegreatwaruniforms/russianww1
name = "Old Russian uniform"
desc = "An old and outdated Imperial Russian uniform. This uniform was used in both the Great War and the October revolution by the White army, which was Imperial Russia. This uniform is quite comfortable and made of good material. Prepare the flag and steel your nerves. "
icon_state = "ww1russian"
item_state = "ww1russian"
mob_overlay_icon = 'icons/fallout/onmob/clothes/uniform.dmi'
icon = 'icons/fallout/clothing/uniforms.dmi'

/obj/item/clothing/under/f13/thegreatwaruniforms/russianww2
name = "Padded Soviet uniform"
desc = "A padded and well made Soviet uniform. The padding is included to allow extra warmth for the wearer. It saw use in the very cold soviet winters and pairs nicely and warmly with other warm-esq gear like coats, great coats, and furred jackets."
icon_state = "ww2sov"
item_state = "ww2sov"
mob_overlay_icon = 'icons/fallout/onmob/clothes/uniform.dmi'
icon = 'icons/fallout/clothing/uniforms.dmi'

/obj/item/clothing/under/f13/thegreatwaruniforms/kubancossackuniform
name = "Cossack uniform"
desc = "A cossack uniform that resembles the uniforms and garnments used by Kuban Cossacks. Quite comfortable and oh so stylish. Now you can ride on a horse into battle with regal flair, onwards!"
icon_state = "kubanc"
item_state = "kubanc"
mob_overlay_icon = 'icons/fallout/onmob/clothes/uniform.dmi'
icon = 'icons/fallout/clothing/uniforms.dmi'



//sci-fi or futuristic clothing

/obj/item/clothing/under/f13/mechsuits
Expand Down
110 changes: 83 additions & 27 deletions code/modules/projectiles/guns/ballistic/automatic.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2420,6 +2420,31 @@
can_suppress = TRUE
fire_sound = 'sound/f13weapons/assaultrifle_fire.ogg'

/obj/item/gun/ballistic/automatic/aksmol/aldric
name = "Ak74u Custom"
desc = "A customized AK74u assault rifle. Rechambered in 5.45x39 NATO , this assault rifle was the answer for a more lighter assault rifle. This one comes with wood furniture and has no stock, allowing much easier carry at the cost of higher recoil."
icon = 'icons/fallout/objects/guns/ballistic.dmi'
lefthand_file = 'icons/fallout/onmob/weapons/guns_lefthand.dmi'
righthand_file = 'icons/fallout/onmob/weapons/guns_righthand.dmi'
item_state = "ak74utest"
icon_state = "ak74utest"
mag_type = /obj/item/ammo_box/magazine/m556/rifle
init_mag_type = /obj/item/ammo_box/magazine/m556/rifle
weapon_class = WEAPON_CLASS_NORMAL
weapon_weight = GUN_TWO_HAND_ONLY
damage_multiplier = GUN_LESS_DAMAGE_T2
init_recoil = AUTORIFLE_RECOIL(1.5, 1.5)
init_firemodes = list(
/datum/firemode/automatic/rpm150,
/datum/firemode/semi_auto
)
can_flashlight = FALSE
can_bayonet = FALSE
can_scope = TRUE
can_suppress = TRUE
fire_sound = 'sound/f13weapons/assaultrifle_fire.ogg'
autofire_shot_delay = 3

/* * * * * * * * * * *
* Police Assault Rifle
* Baseline 5mm autorifle
Expand Down Expand Up @@ -2550,14 +2575,42 @@
)
can_scope = TRUE
can_suppress = FALSE
can_flashlight = FALSE
can_flashlight = FALSE
fire_sound = 'sound/f13weapons/automaticrifle_BAR.ogg'
autofire_shot_delay = 3


/obj/item/gun/ballistic/automatic/fnfal/ak47/custom
name = "Engraved Zastava M70"
desc = "A custom AK platform weapon. This Zastava M70 is gold plated with faint traces of a black tigerstripe alongside the magazine and reciever. The wood furniture is made of the best and most pristine wood there is. Albeit it hits less and can not take a select few modifications. On the pistol grip is a red star in the middle."
icon_state = "goldak"
item_state = "goldak"
icon = 'icons/fallout/objects/guns/ballistic.dmi'
lefthand_file = 'icons/fallout/onmob/weapons/guns_lefthand.dmi'
righthand_file = 'icons/fallout/onmob/weapons/guns_righthand.dmi'
mag_type = /obj/item/ammo_box/magazine/m308
init_mag_type = /obj/item/ammo_box/magazine/m308
weapon_class = WEAPON_CLASS_RIFLE
weapon_weight = GUN_TWO_HAND_ONLY
damage_multiplier = GUN_LESS_DAMAGE_T3
cock_delay = GUN_COCK_RIFLE_BASE
init_recoil = AUTORIFLE_RECOIL(2.5, 2.5)
init_firemodes = list(
/datum/firemode/automatic/rpm40,
/datum/firemode/semi_auto/slow
)
can_scope = FALSE
can_suppress = TRUE
can_flashlight = FALSE
fire_sound = 'sound/f13weapons/automaticrifle_BAR.ogg'
autofire_shot_delay = 4


/obj/item/gun/ballistic/automatic/fnfal/g3battlerifle
name = "G3M99"
desc = "A battle rifle chambered n 7.62 NATO, this revised battle rifle was used extensively by West Germany and still in use today by wasters, wasteland PMCs, and raiders for being quite reliable. The charging handle needs to be pulled back after emptying a whole magazine. Rechambered for .308"
desc = "A battle rifle chambered in 7.62 NATO, this revised battle rifle was used extensively by West Germany and still in use today by wasters, wasteland PMCs, and raiders for being quite reliable. The charging handle needs to be pulled back after emptying a whole magazine. Rechambered for .308"
icon_state = "g3"
item_state = "slr"
item_state = "g3"
icon = 'icons/fallout/objects/guns/ballistic.dmi'
lefthand_file = 'icons/fallout/onmob/weapons/guns_lefthand.dmi'
righthand_file = 'icons/fallout/onmob/weapons/guns_righthand.dmi'
Expand All @@ -2578,6 +2631,32 @@
can_flashlight = FALSE
fire_sound = 'sound/f13weapons/automaticrifle_BAR.ogg'

/obj/item/gun/ballistic/automatic/fnfal/g3battlerifle/tox
name = "Custom G3 Stjarnarriffill"
desc = "A custom and refined G3 battle rifle. With proper engravings, this G3 has a scene of a moth and feline under a crescent moon on the stock of the battle rifle. Still chambered in 7.62 NATO, it's owner's name, which is a 'Tox Mckit' is engraved onto the reciever's lower end."
icon_state = "g3"
item_state = "g3"
icon = 'icons/fallout/objects/guns/ballistic.dmi'
lefthand_file = 'icons/fallout/onmob/weapons/guns_lefthand.dmi'
righthand_file = 'icons/fallout/onmob/weapons/guns_righthand.dmi'
mag_type = /obj/item/ammo_box/magazine/m308/ext
init_mag_type = /obj/item/ammo_box/magazine/m308/ext
disallowed_mags = /obj/item/ammo_box/magazine/m308
weapon_class = WEAPON_CLASS_RIFLE
weapon_weight = GUN_TWO_HAND_ONLY
damage_multiplier = GUN_LESS_DAMAGE_T3
cock_delay = GUN_COCK_RIFLE_BASE
init_recoil = AUTORIFLE_RECOIL(2, 2)
init_firemodes = list(
/datum/firemode/semi_auto/slower,
/datum/firemode/automatic/rpm150
)
can_scope = TRUE
can_suppress = TRUE
can_flashlight = FALSE
fire_sound = 'sound/f13weapons/automaticrifle_BAR.ogg'
autofire_shot_delay = 3.8



/* * * * * * * * * * *
Expand Down Expand Up @@ -2956,30 +3035,7 @@
can_bayonet = FALSE
can_flashlight = FALSE

/obj/item/gun/ballistic/automatic/fastlmg/custom
name = "AusturrPardusdyr LMG"
desc = "A custom OstStrauss LMG, with the words 'To life, I cherish' enscribed on the reciever of the LMG. The LMG was heavily modified and while it hits less, it certainly is able to conserve ammo much better with its slow firing bursts. A LMG fit for a Latos Agent."
item_state = "mg3"
icon_state = "mg3"
icon = 'icons/fallout/objects/guns/ballistic.dmi'
lefthand_file = 'icons/fallout/onmob/weapons/guns_lefthand.dmi'
righthand_file = 'icons/fallout/onmob/weapons/guns_righthand.dmi'
mag_type = /obj/item/ammo_box/magazine/machinegundrummag
init_mag_type = /obj/item/ammo_box/magazine/machinegundrummag
weapon_class = WEAPON_CLASS_RIFLE
weapon_weight = GUN_TWO_HAND_ONLY
slowdown = GUN_SLOWDOWN_PISTOL_LIGHT * 0.6
damage_multiplier = GUN_LESS_DAMAGE_T2
cock_delay = GUN_COCK_RIFLE_BASE
init_recoil = LMG_RECOIL(1.8, 1.8)
init_firemodes = list(
/datum/firemode/automatic/rpm40
)
autofire_shot_delay = 4
can_scope = FALSE
can_suppress = FALSE
can_bayonet = FALSE
can_flashlight = FALSE


/* * * * * * * * * * *
* Browning M1919 MMG
Expand Down
Loading

0 comments on commit 0a1eb75

Please sign in to comment.