Skip to content

Commit

Permalink
calling it here for today. next steps are to revise all the helmets a…
Browse files Browse the repository at this point in the history
…nd add some regular hats or hard hats, etc.

also revise weapons
  • Loading branch information
KoishiVibe committed Aug 22, 2024
1 parent fb4b43c commit b86b050
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 5 deletions.
21 changes: 19 additions & 2 deletions code/modules/clothing/head/helmet.dm
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,10 @@
desc = "A scarred riot helmet covered in cobwebs. It still protects your ears."
icon_state = "old_riot"

/obj/item/clothing/head/helmet/riot/salvaged
/obj/item/clothing/head/helmet/riot/mook
name = "riot helmet"
desc = "Scavenged riot helmet. It's been heavily battered, but it should still provide some class of protection."
icon_state = "riot"
icon_state = "old_riot"
armor_melee = CLOTHING_ARMOR_NONE
armor_bullet = CLOTHING_ARMOR_NONE
armor_laser = CLOTHING_ARMOR_NONE
Expand Down Expand Up @@ -1480,3 +1480,20 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
armor_internaldamage = CLOTHING_ARMOR_LOW

#undef HELMET_GARB_RELAY_ICON_STATE

//=============================//MOOKS\\=================================\\
//=======================================================================\\
/obj/item/clothing/head/helmet/mook
name = "dented helmet"
desc = "On the other side, there's a divot into the armored fabric that looks to have been fixed by a hammer."
armor_melee = CLOTHING_ARMOR_NONE
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_inv_hide = HIDEEARS|HIDEEYES|HIDETOPHAIR

5 changes: 2 additions & 3 deletions code/modules/gear_presets/_select_equipment.dm
Original file line number Diff line number Diff line change
Expand Up @@ -419,10 +419,9 @@ GLOBAL_LIST_EMPTY(personal_closets)
/datum/equipment_preset/proc/spawn_rebel_helmet(mob/living/carbon/human/new_human)
if(!istype(new_human)) return
var/helmetpath = pick(
/obj/item/clothing/head/helmet/riot/salvaged,
/obj/item/clothing/head/helmet/riot/mook,
/obj/item/clothing/head/CMB/mook
/obj/item/clothing/head/helmet,
/obj/item/clothing/head/helmet/skullcap,
/obj/item/clothing/head/helmet/mook,
/obj/item/clothing/head/helmet/swat,
/obj/item/clothing/head/hardhat,
/obj/item/clothing/head/welding,
Expand Down

0 comments on commit b86b050

Please sign in to comment.