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.

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

Sangheili Secondary Armor Sprites #3537

Merged
merged 23 commits into from
Mar 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 6 additions & 2 deletions code/modules/halo/covenant/jobs/sangheili.dm
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@
faction_whitelist = "Covenant"
whitelisted_species = list(/datum/species/sangheili)
alt_titles = list(\
"Sangheili Ranger Ultra" = /decl/hierarchy/outfit/sangheili/eva/ultra)
"Sangheili Ranger Ultra" = /decl/hierarchy/outfit/sangheili/eva/ultra,
"Sangheili Ceremonial Ultra" = /decl/hierarchy/outfit/sangheili/reach/ultra)
access = list(access_covenant, access_covenant_command, access_covenant_slipspace, access_covenant_cargo)
pop_balance_mult = 2.5

Expand Down Expand Up @@ -56,7 +57,8 @@
faction_whitelist = "Covenant"
whitelisted_species = list(/datum/species/sangheili)
alt_titles = list(\
"Sangheili Ranger Major" = /decl/hierarchy/outfit/sangheili/eva/major)
"Sangheili Ranger Major" = /decl/hierarchy/outfit/sangheili/eva/major,
"Ceremonial Sangheili Major" = /decl/hierarchy/outfit/sangheili/reach/major)
access = list(access_covenant, access_covenant_command, access_covenant_slipspace, access_covenant_cargo)
pop_balance_mult = 2

Expand Down Expand Up @@ -88,6 +90,8 @@
poplock_divisor = 12
faction_whitelist = "Covenant"
whitelisted_species = list(/datum/species/sangheili)
alt_titles = list(\
"Ceremonial Special Operations Sangheili" = /decl/hierarchy/outfit/sangheili/reach/specops)
pop_balance_mult = 2

radio_speech_size = RADIO_SPEECH_SPECIALIST
Expand Down
Binary file not shown.
79 changes: 78 additions & 1 deletion code/modules/halo/covenant/species/sangheili/clothing.dm
Original file line number Diff line number Diff line change
Expand Up @@ -541,4 +541,81 @@
totalshields = 240
item_state = "ranger_chest_ultra"

#undef SANGHEILI_ARMOUR_ICON
/// REACH CEREMONIAL ///

/obj/item/clothing/under/covenant/sangheili/reach
name = "\improper Ceremonial Sangheili Body-suit"
desc = "A sealed, airtight bodysuit. Meant to be worn underneath combat harnesses. Oooooh you're wearing a turtle neck!!"
icon_state = "r_sangheili_suit"

/obj/item/clothing/head/helmet/sangheili/specops/reach
name = "Ceremonial Sangheili Helmet (Spec-Ops)"
desc = "Head armour, to be used with the Sangheili Combat Harness. This one is in a ceremonial pattern."
icon_state = "r_specops_helm_obj"
item_state = "r_specops_helm"

/obj/item/clothing/suit/armor/special/combatharness/specops/reach
name = "Ceremonial Sangheili Combat Harness (Spec-Ops)"
icon_state = "r_specops_chest_obj"
item_state = "r_specops_chest"

/obj/item/clothing/gloves/thick/sangheili/specops/infiltrator/reach
name = "Ceremonial Sanghelli Combat Gauntlets (Spec-Ops)"
desc = "Hand armour, to be used with the Sangheili Combat Harness. This one is in a ceremonial pattern."
icon_state = "r_specops_gloves_obj"
item_state = "r_specops_gloves"

/obj/item/clothing/shoes/sangheili/specops/reach
name = "Ceremonial Sanghelli Leg Armour (Spec-Ops)"
desc = "Leg armour, to be used with the Sangheili Combat Harness. This one is in a ceremonial pattern."
icon_state = "r_specops_legs_obj"
item_state = "r_specops_legs"
stepsound = 'code/modules/halo/sounds/walk_sounds/generic_walk.ogg'

/obj/item/clothing/head/helmet/sangheili/ultra/reach
name = "Ceremonial Sangheili Helmet (Ultra)"
desc = "Head armour, to be used with the Sangheili Combat Harness. This one is in a ceremonial pattern."
icon_state = "r_ultra_helm_obj"
item_state = "r_ultra_helm"

/obj/item/clothing/suit/armor/special/combatharness/ultra/reach
name = "Ceremonial Sangheili Combat Harness (Ultra)"
icon_state = "r_ultra_chest_obj"
item_state = "r_ultra_chest"

/obj/item/clothing/gloves/thick/sangheili/ultra/reach
name = "Ceremonial Sanghelli Combat Gauntlets (Ultra)"
desc = "Hand armour, to be used with the Sangheili Combat Harness. This one is in a ceremonial pattern."
icon_state = "r_ultra_gloves_obj"
item_state = "r_ultra_gloves"

/obj/item/clothing/shoes/sangheili/ultra/reach
name = "Ceremonial Sanghelli Leg Armour (Ultra)"
desc = "Leg armour, to be used with the Sangheili Combat Harness. This one is in a ceremonial pattern."
icon_state = "r_ultra_legs_obj"
item_state = "r_ultra_legs"

/obj/item/clothing/head/helmet/sangheili/major/reach
name = "Ceremonial Sangheili Helmet (Officer)"
desc = "Head armour, to be used with the Sangheili Combat Harness. This one is in a ceremonial pattern."
icon_state = "r_major_helm_obj"
item_state = "r_major_helm"

/obj/item/clothing/suit/armor/special/combatharness/major/reach
name = "Ceremonial Sangheili Combat Harness (Officer)"
icon_state = "r_major_chest_obj"
item_state = "r_major_chest"

/obj/item/clothing/shoes/sangheili/major/reach
name = "Ceremonial Sanghelli Leg Armour (Officer)"
desc = "Leg armour, to be used with the Sangheili Combat Harness. This one is in a ceremonial pattern."
icon_state = "r_major_legs_obj"
item_state = "r_major_legs"

/obj/item/clothing/gloves/thick/sangheili/major/reach
name = "Ceremonial Sanghelli Combat Gauntlets (Officer)"
desc = "Hand armour, to be used with the Sangheili Combat Harness. This one is in a ceremonial pattern."
icon_state = "r_major_gloves_obj"
item_state = "r_major_gloves"

#undef SANGHEILI_ARMOUR_ICON
Original file line number Diff line number Diff line change
Expand Up @@ -249,4 +249,64 @@

back = /obj/item/weapon/gun/energy/plasmarifle
belt = /obj/item/weapon/gun/energy/plasmarifle
l_pocket = /obj/item/weapon/grenade/plasma
l_pocket = /obj/item/weapon/grenade/plasma

/// REACH CEREMONIAL OUTFITS ///

/decl/hierarchy/outfit/sangheili/reach
name = "Ceremonial Sangheili"

uniform = /obj/item/clothing/under/covenant/sangheili/reach
l_ear = /obj/item/device/radio/headset/covenant

/decl/hierarchy/outfit/sangheili/reach/ultra
name = "Ceremonial Sangheili (Ultra)"

suit = /obj/item/clothing/suit/armor/special/combatharness/ultra/reach
suit_store = null
back = null
belt = null
l_hand = /obj/item/language_learner/unggoy_to_common
r_hand = /obj/item/weapon/melee/energy/elite_sword
gloves = /obj/item/clothing/gloves/thick/sangheili/ultra/reach
shoes = /obj/item/clothing/shoes/sangheili/ultra/reach
head = /obj/item/clothing/head/helmet/sangheili/ultra/reach
l_pocket = null
r_pocket = null
//
id_type = /obj/item/weapon/card/id/elite_ultra
id_slot = slot_wear_id

/decl/hierarchy/outfit/sangheili/reach/specops
name = "Ceremonial Sangheili (Spec-Ops)"

suit = /obj/item/clothing/suit/armor/special/combatharness/specops/reach
suit_store = null
back = null
belt = /obj/item/weapon/gun/projectile/needler/stealth
gloves = /obj/item/clothing/gloves/thick/sangheili/specops/infiltrator/reach
shoes = /obj/item/clothing/shoes/sangheili/specops/reach
head = /obj/item/clothing/head/helmet/sangheili/specops/reach
l_pocket = null
r_pocket = null
l_hand = /obj/item/weapon/gun/energy/plasmapistol/stealth
r_hand = /obj/item/language_learner/unggoy_to_common
//
id_type = /obj/item/weapon/card/id/elite_specops
id_slot = slot_wear_id

/decl/hierarchy/outfit/sangheili/reach/major
name = "Ceremonial Sangheili (Officer)"

suit = /obj/item/clothing/suit/armor/special/combatharness/major/reach
suit_store = null
back = null
belt = null
l_hand = /obj/item/language_learner/unggoy_to_common
gloves = /obj/item/clothing/gloves/thick/sangheili/major/reach
shoes = /obj/item/clothing/shoes/sangheili/major/reach
head = /obj/item/clothing/head/helmet/sangheili/major/reach
l_pocket = null
//
id_type = /obj/item/weapon/card/id/elite_major
id_slot = slot_wear_id
Loading