Merge pull request #3546 from YourPalHolidays/alpha

Cargo Shadow Sprite & Jiralhanae Flag Accessory
HaloSpaceStation · Feb 29, 2024 · f1cd92f · f1cd92f
2 parents 4b9a28e + ed48a21
commit f1cd92f
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 0 deletions.
diff --git a/code/modules/halo/covenant/species/jiralhanae/clothing.dm b/code/modules/halo/covenant/species/jiralhanae/clothing.dm
@@ -476,5 +476,15 @@ obj/item/clothing/under/covenant/jiralhanae/blue/rolled
 	..()
 	slowdown_per_slot[slot_shoes] += 0.02 // Movement speed malus due to the armor's weight.
 
+// FLAG //
+
+/obj/item/clothing/accessory/jiralhanae_flag
+	name = "Jiralhanae Clan Flag"
+	desc =  "A flag denoting a Jiralhanae Clan, wear with pride."
+	icon = JIRALHANAE_ICON_PATH_OBJ
+	icon_state = "flag_red"
+	item_state = "flag_red"
+	sprite_sheets = list("Jiralhanae" = JIRALHANAE_ICON_PATH_MOB)
+
 #undef JIRALHANAE_ICON_PATH_MOB
 #undef JIRALHANAE_ICON_PATH_OBJ
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/structures_machines/covvendors.dm b/code/modules/halo/covenant/structures_machines/covvendors.dm
@@ -241,6 +241,7 @@
 		/obj/item/clothing/under/covenant/jiralhanae/blue/ = 0,
 		/obj/item/clothing/under/covenant/jiralhanae/red/ = 0,
 		/obj/item/clothing/under/covenant/jiralhanae/straps = 0,
+		/obj/item/clothing/accessory/jiralhanae_flag = 0,
 		/obj/item/flight_item/covenant_pack = 0,
 		/obj/item/dumb_ai_chip/cov = 0,
 		/obj/item/device/flashlight/covenant = 0,
@@ -265,6 +266,7 @@
 		/obj/item/weapon/tank/air/covenant = 10,
 		/obj/item/weapon/pickaxe/plasma_drill = 1,
 		/obj/item/flight_item/covenant_pack = 1,
+		/obj/item/clothing/accessory/jiralhanae_flag = 1,
 		/obj/item/dumb_ai_chip/cov = 2,
 		/obj/item/device/flashlight/covenant = 3,
 		/obj/item/stack/barbedwire/covenant/fifteen = 5,

diff --git a/code/modules/halo/vehicles/types/shadow.dmi b/code/modules/halo/vehicles/types/shadow.dmi