Skip to content

Commit

Permalink
conflict 10
Browse files Browse the repository at this point in the history
  • Loading branch information
Baneuus committed Sep 30, 2023
1 parent d35da82 commit ee12236
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions code/modules/clothing/head/helmet.dm
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,9 @@
/obj/item/clothing/head/helmet/vox_scrap
name = "rusted metal helmet"
desc = "A hodgepodge of various pieces of unknown heavy metal scrapped together into a rudimentary vox-shaped helmet."
icon = 'icons/obj/clothing/obj_head.dmi'
item_icons = list(slot_head_str = 'icons/mob/species/vox/onmob_head_vox.dmi')
icon_state = "vox_scrap"
armor = list(
melee = ARMOR_MELEE_VERY_HIGH,
bullet = ARMOR_BALLISTIC_RIFLE,
Expand All @@ -260,9 +263,6 @@
)
item_flags = ITEM_FLAG_THICKMATERIAL
flags_inv = HIDEEARS|BLOCKHEADHAIR
heat_protection = HEAD
max_heat_protection_temperature = HELMET_MAX_HEAT_PROTECTION_TEMPERATURE
icon_state = "vox_scrap"
body_parts_covered = HEAD|FACE
species_restricted = list(SPECIES_VOX)
siemens_coefficient = 1
Expand Down

0 comments on commit ee12236

Please sign in to comment.