Skip to content

Commit

Permalink
Merge pull request Darkrp-community#506 from Optimism333/helmet_fix
Browse files Browse the repository at this point in the history
  • Loading branch information
Stutternov authored Aug 12, 2024
2 parents 17200c2 + 66048c1 commit d3accfc
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 1 deletion.
2 changes: 2 additions & 0 deletions code/game/objects/items/religion.dm
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,8 @@
armor = list("melee" = 60, "bullet" = 60, "laser" = 60, "energy" = 50, "bomb" = 70, "bio" = 50, "rad" = 50, "fire" = 60, "acid" = 60) //religion protects you from disease and radiation, honk.
worn_x_dimension = 64
worn_y_dimension = 64
bloody_icon = 'icons/effects/blood64x64.dmi'
bloody_icon_state = "helmetblood_big"

/obj/item/clothing/head/helmet/plate/crusader/prophet/red
icon_state = "prophet-red"
Expand Down
22 changes: 21 additions & 1 deletion code/modules/clothing/rogueclothes/hats.dm
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,8 @@
flags_inv = HIDEFACE|HIDEFACIALHAIR|HIDEHAIR
dynamic_hair_suffix = ""
resistance_flags = FIRE_PROOF // Made of metal
bloody_icon = 'icons/effects/blood64x64.dmi'
bloody_icon_state = "helmetblood_big"

/obj/item/clothing/head/roguetown/priestmask
name = "solar visage"
Expand Down Expand Up @@ -345,6 +347,8 @@
sellprice = 77
worn_x_dimension = 64
worn_y_dimension = 64
bloody_icon = 'icons/effects/blood64x64.dmi'
bloody_icon_state = "helmetblood_big"

/obj/item/clothing/head/roguetown/reqhat
name = "serpent crown"
Expand Down Expand Up @@ -431,6 +435,8 @@
worn_x_dimension = 64
worn_y_dimension = 64
will_cover = HEAD|HAIR
bloody_icon = 'icons/effects/blood64x64.dmi'
bloody_icon_state = "helmetblood_big"

/obj/item/clothing/head/roguetown/helmet/kettle
name = "kettle helmet"
Expand Down Expand Up @@ -751,6 +757,8 @@
worn_x_dimension = 64
worn_y_dimension = 64
resistance_flags = FLAMMABLE
bloody_icon = 'icons/effects/blood64x64.dmi'
bloody_icon_state = "helmetblood_big"

/obj/item/clothing/head/roguetown/wizhat/gen
icon_state = "wizardhatgen"
Expand Down Expand Up @@ -829,6 +837,7 @@
resistance_flags = FIRE_PROOF // These are all metallic
prevent_crits = list(BCLASS_CUT, BCLASS_CHOP, BCLASS_BLUNT, BCLASS_STAB, BCLASS_TWIST, BCLASS_BITE)
anvilrepair = /datum/skill/craft/armorsmithing
blocksound = PLATEHIT

/obj/item/clothing/head/roguetown/rare/elfplate
icon_state = "elfhead"
Expand All @@ -839,6 +848,8 @@
body_parts_covered = HEAD|HAIR|NOSE
allowed_race = list("elf", "half-elf", "dark elf")
armor_class = ARMOR_CLASS_MEDIUM
bloody_icon = 'icons/effects/blood32x64.dmi'
bloody_icon_state = "helmetblood_big"

/obj/item/clothing/head/roguetown/rare/elfplate/welfplate
name = "elvish plate helmet"
Expand All @@ -859,6 +870,8 @@
flags_inv = HIDEEARS
experimental_onhip = FALSE
allowed_race = list("dwarf")
bloody_icon = 'icons/effects/blood32x64.dmi'
bloody_icon_state = "helmetblood_big"

/obj/item/clothing/head/roguetown/rare/grenzelplate
icon_state = "human_swordhead"
Expand All @@ -871,6 +884,8 @@
body_parts_covered = HEAD|EARS|HAIR
flags_inv = HIDEEARS
allowed_race = list("human")
bloody_icon = 'icons/effects/blood32x64.dmi'
bloody_icon_state = "helmetblood_big"

/obj/item/clothing/head/roguetown/rare/zybanplate
icon_state = "human_spearhead"
Expand All @@ -884,6 +899,8 @@
body_parts_covered = HEAD|EARS|HAIR
flags_inv = HIDEEARS
allowed_race = list("human")
bloody_icon = 'icons/effects/blood32x64.dmi'
bloody_icon_state = "helmetblood_big"

/obj/item/clothing/head/roguetown/helmet/sallet/zybantine
name = "zybantine kulah khud"
Expand All @@ -892,6 +909,8 @@
desc = "Known as devil masks amongst the Western Kingdoms, these serve part decorative headpiece, part protective helmet."
worn_x_dimension = 64
worn_y_dimension = 64
bloody_icon = 'icons/effects/blood64x64.dmi'
bloody_icon_state = "helmetblood_big"

/obj/item/clothing/head/roguetown/roguehood/feld
name = "feldsher's hood"
Expand All @@ -916,6 +935,8 @@
worn_x_dimension = 64
worn_y_dimension = 64
body_parts_covered = HEAD|EARS|HAIR|NOSE|EYES
bloody_icon = 'icons/effects/blood64x64.dmi'
bloody_icon_state = "helmetblood_big"

/obj/item/clothing/head/roguetown/crown/circlet
name = "golden circlet"
Expand Down Expand Up @@ -982,6 +1003,5 @@
body_parts_covered = HEAD|EARS|HAIR
flags_inv = HIDEEARS
allowed_race = list("aasimar")
blocksound = PLATEHIT
bloody_icon = 'icons/effects/blood64x64.dmi'
bloody_icon_state = "helmetblood_big"
Binary file added icons/effects/blood32x64.dmi
Binary file not shown.

0 comments on commit d3accfc

Please sign in to comment.