From ed48a21a6f87460a9ed21a52804b22dba30dc94b Mon Sep 17 00:00:00 2001 From: YourPalHolidays <95097796+YourPalHolidays@users.noreply.github.com> Date: Wed, 28 Feb 2024 15:10:37 -0500 Subject: [PATCH] Moved Flags To Vendors --- .../covenant/species/jiralhanae/clothing.dm | 4 ++-- .../species/jiralhanae/jiralhanae_gear.dmi | Bin 20323 -> 20326 bytes .../species/jiralhanae/jiralhanae_outfit.dm | 1 - .../structures_machines/covvendors.dm | 2 ++ 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/code/modules/halo/covenant/species/jiralhanae/clothing.dm b/code/modules/halo/covenant/species/jiralhanae/clothing.dm index 7adfc72b5fb06..801189fbb1f9e 100644 --- a/code/modules/halo/covenant/species/jiralhanae/clothing.dm +++ b/code/modules/halo/covenant/species/jiralhanae/clothing.dm @@ -482,8 +482,8 @@ obj/item/clothing/under/covenant/jiralhanae/blue/rolled name = "Jiralhanae Clan Flag" desc = "A flag denoting a Jiralhanae Clan, wear with pride." icon = JIRALHANAE_ICON_PATH_OBJ - icon_state = "flag" - item_state = "flag" + icon_state = "flag_red" + item_state = "flag_red" sprite_sheets = list("Jiralhanae" = JIRALHANAE_ICON_PATH_MOB) #undef JIRALHANAE_ICON_PATH_MOB diff --git a/code/modules/halo/covenant/species/jiralhanae/jiralhanae_gear.dmi b/code/modules/halo/covenant/species/jiralhanae/jiralhanae_gear.dmi index eaf07aab6af46407c9c78f95f596723bc57b9afd..a25bff2d21b7f7ba4e89fd6de18888807a3733b3 100644 GIT binary patch delta 283 zcmV+$0p$MUo&n~b0kAIu0X&m10ziL^zB_;5H2mVZ92!B+|G~Tau;yoDK~xSX zniM)B&;TQ&07Rz!1u2bH#mHz1k+o?jH%edG%HePZTC0)riq9Dtyrni5M|^*{)n*K! z>DEs%zG{rryzedXE3FGSZ~4XHrj3x)#b#P>x*G|#==^Ya@nlm=r6z6k%lgUONZbZ5 zo@`nQgKHIz0w6kTY0kAIu0XdT}0ziLkeZKp^r(;`w96pbya{qN?SF%o;p?oiQk58=l zmaP|Y@x}^4vKM|?IL|$WaI;}WE3FIRGb=jFH7)Tk(C~}ra%coO{|E2x!VmBZl-v{obKC7(}Z@Rr(K9PxkQR+}+^ zrdz+o_^B~c^S-ylue2`UyyX{%n>IpH7n^Cl>24&{qVvn)$&*bjm728CFY7mRBXJu% zd9rCK46ao;3V`UWk%Jl?8c@N$Aifyq<&J$?%@YFeYmon6Ax*Z78t92m@%}#a8g@zX eDe@2LVcYU>+Rs0*AB8Ik^OOTjx4*M=1M*8PRf-n? diff --git a/code/modules/halo/covenant/species/jiralhanae/jiralhanae_outfit.dm b/code/modules/halo/covenant/species/jiralhanae/jiralhanae_outfit.dm index 78eb8e38ba031..d71dfae2a34d1 100644 --- a/code/modules/halo/covenant/species/jiralhanae/jiralhanae_outfit.dm +++ b/code/modules/halo/covenant/species/jiralhanae/jiralhanae_outfit.dm @@ -116,7 +116,6 @@ head = /obj/item/clothing/head/helmet/jiralhanae/covenant/major suit = /obj/item/clothing/suit/armor/jiralhanae/covenant/major - starting_accessories = list(/obj/item/clothing/accessory/jiralhanae_flag) shoes = /obj/item/clothing/shoes/jiralhanae/covenant/major /decl/hierarchy/outfit/jiralhanae/covenant/major/armed diff --git a/code/modules/halo/covenant/structures_machines/covvendors.dm b/code/modules/halo/covenant/structures_machines/covvendors.dm index 42121899e5da0..8b4e460eaa523 100644 --- 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,