Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Removes some lingering unused files #4613

Closed
wants to merge 3 commits into from
Closed

Removes some lingering unused files #4613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a1279a0
Removes the unmanaged files in root
GremlingSS Mar 10, 2024
6faeff7
Merge branch 'master' of https://github.com/ARF-SS13/coyote-bayou int…
GremlingSS Mar 10, 2024
9f1e8ef
Removes the duplicate warhammer outfits. Woops!
GremlingSS Mar 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5,285 changes: 0 additions & 5,285 deletions arfsuits.dm
View file
Open in desktop

This file was deleted.

Binary file removed armor_medium.dmi
View file
Open in desktop
Binary file not shown.
Binary file removed armored_medium.dmi
View file
Open in desktop
Binary file not shown.
10 changes: 10 additions & 0 deletions code/modules/clothing/head/helmet.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -733,6 +733,16 @@
item_state = "redtaghelm"
// Offer about the same protection as a hardhat.
dog_fashion = null
/obj/item/clothing/head/helmet/nvodst_helm
name = "Futuristic Helmet"
desc = "A jet black full faced helmet that has a red stripe running down the top of it. It seems to have slots on the top of it for antennas."
icon_state = "nvodst_helm"
item_state = "nvodst_helm"
flags_inv = HIDEHAIR|HIDEMASK|HIDEEYES
armor = ARMOR_VALUE_MEDIUM
armor_tokens = list (ARMOR_MODIFIER_UP_ENV_T1)
mob_overlay_icon = 'icons/fallout/onmob/clothes/helmet.dmi'
icon = 'icons/fallout/clothing/helmets.dmi'

/obj/item/clothing/head/helmet/unmchelmet
name = "Standard issue UNMC helmet"
Expand Down
40 changes: 37 additions & 3 deletions code/modules/clothing/suits/arfsuits.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2072,7 +2072,7 @@
icon_state = "scrapheavy"
item_state = "scrapheavy"

/obj/item/clothing/suit/armor/light/leather/lightscoutarmor
/obj/item/clothing/suit/armor/light/leather/lightscoutarmor
name = "light scout armor"
desc = "A makeshift set of pauldrons made of leather and scrap metal. It offers minimal protection, but is pretty light."
armor_tokens = list(ARMOR_MODIFIER_UP_MELEE_T1, ARMOR_MODIFIER_DOWN_FIRE_T1, ARMOR_MODIFIER_DOWN_LASER_T1, ARMOR_MODIFIER_UP_DT_T1)
Expand Down Expand Up @@ -3203,6 +3203,21 @@
mob_overlay_icon = 'icons/fallout/onmob/clothes/armor_medium.dmi'
icon = 'icons/fallout/clothing/armored_medium.dmi'

/obj/item/clothing/suit/armor/medium/nv
name = "Futuristic Armor Plating"
desc = "A set of jet black armor plating that seems to be build to attach to the frame of a synthetic. It feels like these plates weigh a ton and seems to have a triangle with a tip facing downward, with 3 pairs of spikes jutting from the sides toward where the nape would typically be on a normal person. The insides of these plates seem to be absolutely caked in both dried and fresh blood as well."
icon_state = "nvodst"
item_state = "nvodst"
equip_delay_self = 60
equip_delay_other = 60
armor_tier_desc = ARMOR_CLOTHING_MEDIUM
slowdown = ARMOR_SLOWDOWN_MEDIUM * ARMOR_SLOWDOWN_MORE_T1 * ARMOR_SLOWDOWN_GLOBAL_MULT
armor = ARMOR_VALUE_MEDIUM
pocket_storage_component_path = /datum/component/storage/concrete/pockets/jacket
armor_tokens = list(ARMOR_MODIFIER_DOWN_BULLET_T1, ARMOR_MODIFIER_UP_ENV_T4, ARMOR_MODIFIER_UP_DT_T2)
mob_overlay_icon = 'icons/fallout/onmob/clothes/armor_medium.dmi'
icon = 'icons/fallout/clothing/armored_medium.dmi'

/obj/item/clothing/suit/armor/medium/merek
name = "salvaged UNMC armor"
desc = "A set of salvaged UNMC armor. Most of what made this armor completely terrifying to deal with is now gone or repurposed. It feels much lighter and offers much less protection than the usual set of UNMC armor. Personalized by the scavenger who found this."
Expand Down Expand Up @@ -4908,15 +4923,27 @@
icon_state = "arroyoapa"
item_state = "arroyoapa"

/obj/item/clothing/suit/armor/heavy/wolf
name = "Hardened Combat Carapace"
desc = "A unique set of heavy carapace with a skull within a bunker an wings upon the shoulder, underneath the skull. A simple '43rd' Was labeled with a sword stabbing through it. On the chest embrassened was 'Kas-'' the rest was scarred off. Beyond the name 'Relt' on the pectoral. Along the blackened armor, was a bunch of different bits of graffite in chalkwhite..."
icon_state = "wolfsquad"
item_state = "wolfsquad"
icon = 'icons/fallout/clothing/armored_power.dmi'
mob_overlay_icon = 'icons/fallout/onmob/clothes/armor_power.dmi'
armor = ARMOR_VALUE_HEAVY
armor_tokens = list(ARMOR_MODIFIER_DOWN_BULLET_T2, ARMOR_MODIFIER_DOWN_LASER_T2, ARMOR_MODIFIER_UP_ENV_T1)
slowdown = ARMOR_SLOWDOWN_HEAVY* ARMOR_SLOWDOWN_GLOBAL_MULT
mutantrace_variation = STYLE_DIGITIGRADE

/obj/item/clothing/suit/armor/power_armor/fluff/pappavol
name = "Decaying Power Armor"
desc = "Large big and green with hints of rust that cover its decaying metal robotic frame. It looks like it was custom built... roughly put together with shitty welding and crude rivets that hold the green rusty armor together."
icon_state = "pappavolarmor"
item_state = "pappavolarmor"

/obj/item/clothing/suit/armor/power_armor/t45b
name = "Power Armor Exo-Skeleton"
desc = "A set of power armor with the metallic outer workings removed, fit for any form of addition to make a proper set of power armor!"
name = "Refurbished T-45b power armor"
desc = "It's a set of early-model T-45 power armor with a custom air conditioning module and restored servomotors. Bulky, but almost as good as the real thing."
icon_state = "t45bpowerarmor"
item_state = "t45bpowerarmor"
armor = ARMOR_VALUE_SALVAGE
Expand Down Expand Up @@ -4949,13 +4976,15 @@
armor = ARMOR_VALUE_SALVAGE
slowdown = ARMOR_SLOWDOWN_REPA * ARMOR_SLOWDOWN_GLOBAL_MULT
salvaged_type = /obj/item/clothing/suit/armor/heavy/salvaged_pa/t45b/hotrod
armor_tokens = list(ARMOR_MODIFIER_UP_FIRE_T3, ARMOR_MODIFIER_DOWN_MELEE_T2, ARMOR_MODIFIER_UP_LASER_T3, )

/obj/item/clothing/suit/armor/power_armor/t45d
name = "T-45d power armor"
desc = "Originally developed and manufactured for the United States Army by American defense contractor West Tek, the T-45d power armor was the first version of power armor to be successfully deployed in battle."
icon_state = "t45dpowerarmor"
item_state = "t45dpowerarmor"
salvaged_type = /obj/item/clothing/suit/armor/heavy/salvaged_pa/t45d
armor_tokens = list(ARMOR_MODIFIER_UP_DT_T1)

/obj/item/clothing/suit/armor/power_armor/t45d/knightcaptain
name = "Head-Knight's T-45d Power Armour"
Expand All @@ -4976,6 +5005,7 @@
item_state = "t51bpowerarmor"
salvage_loot = list(/obj/item/stack/crafting/armor_plate = 25)
salvaged_type = /obj/item/clothing/suit/armor/heavy/salvaged_pa/t51b
armor_tokens = list(ARMOR_MODIFIER_UP_LASER_T1, ARMOR_MODIFIER_UP_DT_T1)

/obj/item/clothing/suit/armor/power_armor/t51b/pony
name = "colorful T-51b power armor"
Expand All @@ -4992,6 +5022,7 @@
desc = "The pinnacle of pre-war technology. This suit of power armor provides substantial protection to the wearer. It's plates have been chemially treated to be stronger."
icon_state = "t51green"
item_state = "t51green"
armor_tokens = list(ARMOR_MODIFIER_UP_MELEE_T1, ARMOR_MODIFIER_UP_BULLET_T1, ARMOR_MODIFIER_UP_LASER_T1, ARMOR_MODIFIER_UP_DT_T2)


/obj/item/clothing/suit/armor/power_armor/t51b/bos
Expand All @@ -5005,12 +5036,14 @@
desc = "Developed by Garrahan Mining Co. in collaboration with West Tek, the Excavator-class power armor was designed to protect miners from rockfalls and airborne contaminants while increasing the speed at which they could work. "
icon_state = "excavator"
item_state = "excavator"
armor_tokens = list(ARMOR_MODIFIER_UP_MELEE_T2, ARMOR_MODIFIER_DOWN_BULLET_T3, ARMOR_MODIFIER_DOWN_LASER_T3, ARMOR_MODIFIER_UP_ENV_T3, ARMOR_MODIFIER_DOWN_DT_T1)

/obj/item/clothing/suit/armor/power_armor/advanced
name = "advanced power armor"
desc = "An advanced suit of armor typically used by the Enclave.<br>It is composed of lightweight metal alloys, reinforced with ceramic castings at key stress points.<br>Additionally, like the T-51b power armor, it includes a recycling system that can convert human waste into drinkable water, and an air conditioning system for its user's comfort."
icon_state = "advpowerarmor1"
item_state = "advpowerarmor1"
armor_tokens = list(ARMOR_MODIFIER_UP_MELEE_T2, ARMOR_MODIFIER_UP_BULLET_T2, ARMOR_MODIFIER_UP_LASER_T2, ARMOR_MODIFIER_UP_DT_T2)

/obj/item/clothing/suit/armor/power_armor/hellfire // Event only - Deathsquad tier
name = "Hellfire power armor"
Expand All @@ -5030,6 +5063,7 @@
icon_state = "advanced"
item_state = "advanced"
salvaged_type = /obj/item/clothing/suit/armor/heavy/salvaged_pa/x02 // Oh the misery
armor_tokens = list(ARMOR_MODIFIER_UP_MELEE_T3, ARMOR_MODIFIER_UP_BULLET_T3, ARMOR_MODIFIER_UP_LASER_T3, ARMOR_MODIFIER_UP_DT_T3)

/obj/item/clothing/suit/toggle/armor
// body_parts_covered = CHEST|GROIN
Expand Down
Loading
Loading