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

Jiralhanae Honour Guard #3550

Merged
merged 1 commit into from
Mar 5, 2024
Merged

Jiralhanae Honour Guard #3550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion code/modules/halo/covenant/items/cards.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,10 @@
icon = 'code/modules/halo/covenant/items/Cards.dmi'
icon_state = "bruteguard_id"


/obj/item/weapon/card/id/brute_guard
name = "Jiralhanae Honour Guard identification card"
icon = 'code/modules/halo/covenant/items/Cards.dmi'
icon_state = "sangguard_id"

/***** PROPHET *****/

Expand Down
22 changes: 22 additions & 0 deletions code/modules/halo/covenant/species/jiralhanae/clothing.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,15 @@ obj/item/clothing/under/covenant/jiralhanae/blue/rolled
armor_thickness_max = 28
integrated_hud = /obj/item/clothing/glasses/hud/tactical/covenant/medic

/obj/item/clothing/head/helmet/jiralhanae/covenant/honour_guard
name = "Jiralhanae Helm (Honour Guard)"
desc = "What was once a Sangheili Honour Guard helmet has now been refitted for Jiralhanae use, It is a mark of importance and leadership."
icon = JIRALHANAE_ICON_PATH_OBJ
icon_state = "honourguard_helm"
armor_thickness = 25
armor_thickness_max = 25


/* ARMOUR */


Expand Down Expand Up @@ -262,6 +271,14 @@ obj/item/clothing/under/covenant/jiralhanae/blue/rolled
..()
pocket_curr = new/obj/item/weapon/storage/internal/pockets(src,2,ITEM_SIZE_SMALL,null,ARMOUR_POCKET_CANHOLD)

/obj/item/clothing/suit/armor/jiralhanae/covenant/honour_guard
name = "Jiralhanae Armour (Honour Guard)"
desc = "A suit of refitted Sangheili Honour Guard armor, now capable of being worn by Jiralhanae."
icon = JIRALHANAE_ICON_PATH_OBJ
icon_state = "honourguard_chest"
armor_thickness = 28
armor_thickness_max = 28

/* SHOES */


Expand Down Expand Up @@ -320,6 +337,11 @@ obj/item/clothing/under/covenant/jiralhanae/blue/rolled
body_parts_covered = LEGS|FEET
matter = list("nanolaminate" = 1)

/obj/item/clothing/shoes/jiralhanae/covenant/honour_guard
name = "Jiralhanae Greaves (Honour Guard)"
icon = JIRALHANAE_ICON_PATH_OBJ
icon_state = "honourguard_feet"

/* FLAGS */

/obj/item/clothing/jiralhanae_flag_boulder
Expand Down
Binary file modified code/modules/halo/covenant/species/jiralhanae/jiralhanae_gear.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified code/modules/halo/covenant/species/jiralhanae/jiralhanae_obj.dmi
View file
Open in desktop
Binary file not shown.
19 changes: 17 additions & 2 deletions code/modules/halo/covenant/species/jiralhanae/jiralhanae_outfit.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,23 @@
belt = /obj/item/weapon/storage/belt/covenant_ammo/loadedspawn_mauler
suit_store = /obj/item/weapon/gun/projectile/mauler
l_pocket = /obj/item/weapon/grenade/frag/spike

/decl/hierarchy/outfit/jiralhanae/covenant/honour_guard
name = "Covenant Jiralhanae Honour Guard"
suit = /obj/item/clothing/suit/armor/jiralhanae/covenant/honour_guard
suit_store = null
back = /obj/item/weapon/melee/energy/elite_sword/honour_staff
l_hand = /obj/item/language_learner/unggoy_to_common
r_hand = null
gloves = null
shoes = /obj/item/clothing/shoes/jiralhanae/covenant/honour_guard
head = /obj/item/clothing/head/helmet/jiralhanae/covenant/honour_guard
l_pocket = null
r_pocket = null
//
id_type = /obj/item/weapon/card/id/brute_guard
id_slot = slot_wear_id

/* Ram Clan Jiralhanae */

/decl/hierarchy/outfit/jiralhanae_ramclan
Expand Down Expand Up @@ -193,8 +210,6 @@
suit = /obj/item/clothing/suit/armor/jiralhanae/chieftain_ram
shoes = /obj/item/clothing/shoes/jiralhanae



/* Boulder Clan Jiralhanae */

/decl/hierarchy/outfit/jiralhanae_boulderclan
Expand Down
Loading