Skip to content

Commit

Permalink
Soft covers are now soft covers, don't use them as helmets
Browse files Browse the repository at this point in the history
  • Loading branch information
AmoryBlaine committed Aug 20, 2024
1 parent f93c61a commit 28c4764
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 16 deletions.
21 changes: 11 additions & 10 deletions code/modules/clothing/head/helmet.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1149,18 +1149,17 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
)
siemens_coefficient = 2
flags_armor_protection = BODY_FLAG_HEAD
armor_melee = CLOTHING_ARMOR_MEDIUMHIGH
armor_bullet = CLOTHING_ARMOR_MEDIUMHIGH
armor_laser = CLOTHING_ARMOR_LOW
armor_energy = CLOTHING_ARMOR_LOW
armor_bomb = CLOTHING_ARMOR_LOW
armor_bio = CLOTHING_ARMOR_MEDIUM
armor_rad = CLOTHING_ARMOR_LOW
armor_internaldamage = CLOTHING_ARMOR_MEDIUM
armor_melee = CLOTHING_ARMOR_VERYLOW
armor_bullet = CLOTHING_ARMOR_NONE
armor_laser = CLOTHING_ARMOR_NONE
armor_energy = CLOTHING_ARMOR_NONE
armor_bomb = CLOTHING_ARMOR_NONE
armor_bio = CLOTHING_ARMOR_NONE
armor_rad = CLOTHING_ARMOR_NONE
armor_internaldamage = CLOTHING_ARMOR_NONE
flags_cold_protection = BODY_FLAG_HEAD
min_cold_protection_temperature = ICE_PLANET_MIN_COLD_PROT
flags_inventory = BLOCKSHARPOBJ
flags_inv_hide = HIDEEARS
flags_inventory = null

/obj/item/clothing/head/uppcap/boonie
name = "\improper UL3 UPP hat"
Expand Down Expand Up @@ -1199,6 +1198,7 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
item_state = "upp_ushanka"
var/tied = FALSE
var/original_state = "upp_ushanka"
flags_inv_hide = HIDEEARS

/obj/item/clothing/head/uppcap/ushanka/verb/flaps_up()
set name = "Tie Up/Down"
Expand Down Expand Up @@ -1226,6 +1226,7 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
icon_state = "upp_ushanka_civi"
item_state = "upp_ushanka_civi"
original_state = "upp_ushanka_civi"
flags_inv_hide = HIDEEARS

/obj/item/clothing/head/helmet/marine/veteran/van_bandolier
name = "pith helmet"
Expand Down
10 changes: 4 additions & 6 deletions code/modules/gear_presets/upp.dm
Original file line number Diff line number Diff line change
Expand Up @@ -231,19 +231,15 @@
flags = EQUIPMENT_PRESET_EXTRA
access = list(ACCESS_UPP_GENERAL, ACCESS_UPP_MACHINEGUN)
assignment = "Machinegunner"
rank = JOB_SQUAD_SMARTGUN_UPP
paygrade = "UE4"
role_comm_title = "MG"
languages = list(LANGUAGE_RUSSIAN, LANGUAGE_CHINESE)
faction_group = list(FACTION_UPP)
faction = FACTION_UPP

/datum/equipment_preset/upp/machinegunner/load_gear(mob/living/carbon/human/new_human)
//back
new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/upp, WEAR_BACK)
new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp, WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp, WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/roller/bedroll, WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/drinks/flask/canteen, WEAR_IN_BACK)

//face
new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP, WEAR_L_EAR)
//head
Expand Down Expand Up @@ -278,6 +274,8 @@
paygrade = "UE5"
access = list(ACCESS_UPP_GENERAL, ACCESS_UPP_TLPREP)
languages = list(LANGUAGE_RUSSIAN, LANGUAGE_CHINESE)
assignment = JOB_SQUAD_TEAM_LEADER
rank = JOB_SQUAD_TEAM_LEADER
faction_group = list(FACTION_UPP)
faction = FACTION_UPP
role_comm_title = "SQSGT"
Expand Down
Binary file modified icons/mob/humans/onmob/helmet_garb.dmi
Binary file not shown.

0 comments on commit 28c4764

Please sign in to comment.