Merge pull request #3550 from YourPalHolidays/alpha

Jiralhanae Honour Guard
HaloSpaceStation · Mar 5, 2024 · 9ba5d68 · 9ba5d68
2 parents a4411a6 + f88c623
commit 9ba5d68
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 3 deletions.
diff --git a/code/modules/halo/covenant/items/cards.dm b/code/modules/halo/covenant/items/cards.dm
@@ -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 *****/
 

diff --git a/code/modules/halo/covenant/species/jiralhanae/clothing.dm b/code/modules/halo/covenant/species/jiralhanae/clothing.dm
@@ -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 */
 
 
@@ -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 */
 
 
@@ -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

diff --git a/code/modules/halo/covenant/species/jiralhanae/jiralhanae_gear.dmi b/code/modules/halo/covenant/species/jiralhanae/jiralhanae_gear.dmi
diff --git a/code/modules/halo/covenant/species/jiralhanae/jiralhanae_obj.dmi b/code/modules/halo/covenant/species/jiralhanae/jiralhanae_obj.dmi
diff --git a/code/modules/halo/covenant/species/jiralhanae/jiralhanae_outfit.dm b/code/modules/halo/covenant/species/jiralhanae/jiralhanae_outfit.dm
@@ -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
@@ -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