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

Pred buff #6603

Closed
wants to merge 5 commits into from
Closed

Pred buff #6603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7f1dedc
synth formal wear
s5nt May 12, 2024
4d6c7bd
Merge branch 'master' of https://github.com/v7-c/cmss13
s5nt May 26, 2024
d77afa9
Merge branch 'master' of https://github.com/v7-c/cmss13
s5nt Jun 10, 2024
e2995d9
Merge branch 'cmss13-devs:master' into master
s5nt Jun 21, 2024
4208bba
buffs
s5nt Jul 1, 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
46 changes: 23 additions & 23 deletions code/modules/cm_preds/yaut_items.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,14 +99,14 @@
name = "clan armor"
desc = "A suit of armor with light padding. It looks old, yet functional."

armor_melee = CLOTHING_ARMOR_MEDIUMLOW
armor_bullet = CLOTHING_ARMOR_MEDIUMHIGH
armor_laser = CLOTHING_ARMOR_MEDIUMHIGH
armor_energy = CLOTHING_ARMOR_MEDIUMHIGH
armor_bomb = CLOTHING_ARMOR_HIGH
armor_bio = CLOTHING_ARMOR_MEDIUMHIGH
armor_rad = CLOTHING_ARMOR_MEDIUMHIGH
armor_internaldamage = CLOTHING_ARMOR_MEDIUMHIGH
armor_melee = CLOTHING_ARMOR_HIGH
armor_bullet = CLOTHING_ARMOR_VERYHIGHPLUS
armor_laser = CLOTHING_ARMOR_HIGHPLUS
armor_energy = CLOTHING_ARMOR_HIGHPLUS
armor_bomb = CLOTHING_ARMOR_ULTRAHIGH
armor_bio = CLOTHING_ARMOR_VERYHIGHPLUS
armor_rad = CLOTHING_ARMOR_VERYHIGHPLUS
armor_internaldamage = CLOTHING_ARMOR_VERYHIGHPLUS


/obj/item/clothing/suit/armor/yautja/hunter/full
Expand All @@ -115,14 +115,14 @@
icon_state = "fullarmor_ebony"
flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS|BODY_FLAG_HEAD|BODY_FLAG_LEGS
flags_item = ITEM_PREDATOR
armor_melee = CLOTHING_ARMOR_HIGH
armor_bullet = CLOTHING_ARMOR_HIGH
armor_laser = CLOTHING_ARMOR_HIGH
armor_energy = CLOTHING_ARMOR_HIGH
armor_bomb = CLOTHING_ARMOR_HIGHPLUS
armor_bio = CLOTHING_ARMOR_HIGH
armor_rad = CLOTHING_ARMOR_HIGH
armor_internaldamage = CLOTHING_ARMOR_HIGH
armor_melee = CLOTHING_ARMOR_GIGAHIGH
armor_bullet = CLOTHING_ARMOR_GIGAHIGH
armor_laser = CLOTHING_ARMOR_GIGAHIGH
armor_energy = CLOTHING_ARMOR_GIGAHIGH
armor_bomb = CLOTHING_ARMOR_GIGAHIGH
armor_bio = CLOTHING_ARMOR_GIGAHIGH
armor_rad = CLOTHING_ARMOR_GIGAHIGH
armor_internaldamage = CLOTHING_ARMOR_GIGAHIGH
slowdown = 1
var/speed_timer = 0
item_state_slots = list(WEAR_JACKET = "fullarmor")
Expand All @@ -134,7 +134,7 @@
/obj/item/storage/backpack/yautja,
/obj/item/weapon/twohanded/yautja,
)
fire_intensity_resistance = 20
fire_intensity_resistance = 30

/obj/item/clothing/suit/armor/yautja/hunter/full/Initialize(mapload, armor_number, armor_material = "ebony")
. = ..(mapload, 0)
Expand Down Expand Up @@ -176,7 +176,7 @@
/obj/item/clothing/yautja_cape/ceremonial
name = PRED_YAUTJA_CEREMONIAL_CAPE
icon_state = "ceremonialcape"
clan_rank_required = CLAN_RANK_ELDER_INT
clan_rank_required = CLAN_RANK_ELITE_INT

/obj/item/clothing/yautja_cape/third
name = PRED_YAUTJA_THIRD_CAPE
Expand Down Expand Up @@ -223,11 +223,11 @@
)


armor_melee = CLOTHING_ARMOR_MEDIUMLOW
armor_bullet = CLOTHING_ARMOR_MEDIUMHIGH
armor_melee = CLOTHING_ARMOR_MEDIUM
armor_bullet = CLOTHING_ARMOR_HIGHPLUS
armor_laser = CLOTHING_ARMOR_MEDIUM
armor_energy = CLOTHING_ARMOR_MEDIUM
armor_bomb = CLOTHING_ARMOR_MEDIUMHIGH
armor_energy = CLOTHING_ARMOR_MEDIUMHIGH
armor_bomb = CLOTHING_ARMOR_HIGHPLUS
armor_bio = CLOTHING_ARMOR_MEDIUM
armor_rad = CLOTHING_ARMOR_MEDIUM
armor_internaldamage = CLOTHING_ARMOR_MEDIUM
Expand All @@ -251,7 +251,7 @@
desc = "A pair of armored, perfectly balanced boots. Perfect for running through the jungle."

armor_melee = CLOTHING_ARMOR_MEDIUMHIGH
armor_bullet = CLOTHING_ARMOR_HIGH
armor_bullet = CLOTHING_ARMOR_HIGHPLUS
armor_laser = CLOTHING_ARMOR_MEDIUMHIGH
armor_energy = CLOTHING_ARMOR_MEDIUMHIGH
armor_bomb = CLOTHING_ARMOR_HIGH
Expand Down
10 changes: 5 additions & 5 deletions code/modules/cm_preds/yaut_mask.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
item_state = "helmet"
item_state_slots = list(WEAR_FACE = "pred_mask1_ebony")

armor_melee = CLOTHING_ARMOR_MEDIUM
armor_bullet = CLOTHING_ARMOR_MEDIUMHIGH
armor_laser = CLOTHING_ARMOR_MEDIUM
armor_energy = CLOTHING_ARMOR_MEDIUM
armor_bomb = CLOTHING_ARMOR_MEDIUMHIGH
armor_melee = CLOTHING_ARMOR_MEDIUMHIGH
armor_bullet = CLOTHING_ARMOR_VERYHIGH
armor_laser = CLOTHING_ARMOR_MEDIUMHIGH
armor_energy = CLOTHING_ARMOR_MEDIUMHIGH
armor_bomb = CLOTHING_ARMOR_VERYHIGH
armor_bio = CLOTHING_ARMOR_MEDIUM
armor_rad = CLOTHING_ARMOR_MEDIUM
armor_internaldamage = CLOTHING_ARMOR_MEDIUM
Expand Down
Loading