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

Donator Gear Update #3421

Merged
merged 2 commits into from
Jul 29, 2023
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
28 changes: 28 additions & 0 deletions code/modules/halo/clothing/donor_covenant.dm
Original file line number Diff line number Diff line change
Expand Up @@ -728,4 +728,32 @@
gloves = /obj/item/clothing/gloves/thick/sangheili/zagarnt
shoes = /obj/item/clothing/shoes/sangheili/zagarnt

/////Lord_Inquisitor_Plasmaman

/obj/item/clothing/head/helmet/jiralhanae/covenant/lord_inquisitor
icon = JIRALHANAE_ICON_PATH_MOB
icon_state = "helm_deion"
name = "Jiralhanae Berserker Helmet"

/obj/item/clothing/suit/armor/jiralhanae/covenant/lord_inquisitor
icon = JIRALHANAE_ICON_PATH_MOB
icon_state = "armour_deion"
name = "Jiralhanae Berserker Armor"

/obj/item/clothing/shoes/jiralhanae/covenant/lord_inquisitor
icon = JIRALHANAE_ICON_PATH_MOB
icon_state = "feet_deion"
name = "Jiralhanae Berserker Greaves"

/obj/item/weapon/storage/box/large/donator/lord_inquisitor
startswith = list(/obj/item/clothing/head/helmet/jiralhanae/covenant/lord_inquisitor,
/obj/item/clothing/suit/armor/jiralhanae/covenant/lord_inquisitor,
/obj/item/clothing/shoes/jiralhanae/covenant/lord_inquisitor
)
can_hold = list(/obj/item/clothing/head/helmet/jiralhanae/covenant/lord_inquisitor,
/obj/item/clothing/suit/armor/jiralhanae/covenant/lord_inquisitor,
/obj/item/clothing/shoes/jiralhanae/covenant/lord_inquisitor
)


#undef JIRALHANAE_ICON_PATH_OBJ
50 changes: 50 additions & 0 deletions code/modules/halo/clothing/donor_innie.dm
Original file line number Diff line number Diff line change
Expand Up @@ -346,5 +346,55 @@ obj/item/clothing/suit/armor/special/soe/pantas
head = /obj/item/clothing/head/helmet/urfc/socks
suit = /obj/item/clothing/suit/armor/special/urfc/socks

////////TheMojaveWanderer\\\\\\\\

//Insurrectionist

/obj/item/clothing/head/helmet/innie/light/mojave
name = "Brimmed Cowboy Hat"
desc = "A flat brimmed cowboy hat, worn to protect its wearer from a desert's scorching sun."
icon = 'code/modules/halo/clothing/urf_commando.dmi'
icon_override = 'code/modules/halo/clothing/urf_commando.dmi'
icon_state = "reno_helmet_obj"
item_state = "reno_helmet_worn"

/obj/item/clothing/suit/storage/innie/light/mojave
name = "Mojave Duster"
desc = "It's a standard insurrectionist vest cut down and placed under a tan duster."
icon = 'code/modules/halo/clothing/urf_commando.dmi'
icon_override = 'code/modules/halo/clothing/urf_commando.dmi'
icon_state = "reno_armor_obj"
item_state = "reno_armor_worn"

/obj/item/weapon/gun/projectile/m392_dmr/mojave
name = "M392B Liberator"
desc = "An incredibly worn but well maintained unique variant of the M392, fitted with a custom stock."
icon_state = "mojave-m392"
item_state = "mojave-m392"
wielded_item_state = "mojave-m392-wielded"
item_icons = list(
slot_l_hand_str = 'code/modules/halo/weapons/icons/Weapon_Inhands_left.dmi',
slot_r_hand_str = 'code/modules/halo/weapons/icons/Weapon_Inhands_right.dmi',
slot_back_str = 'code/modules/halo/weapons/icons/Back_Weapons.dmi',
slot_s_store_str = 'code/modules/halo/weapons/icons/Armor_Weapons.dmi',
)

/obj/item/weapon/gun/projectile/m392_dmr/mojave/update_icon()
. = ..()
if(ammo_magazine)
icon_state = "mojave-m392"
else
icon_state = "mojave-m392-unloaded"

/obj/item/weapon/storage/box/large/donator/mojave
startswith = list(/obj/item/clothing/head/helmet/innie/light/mojave,
/obj/item/clothing/suit/storage/innie/light/mojave,
/obj/item/weapon/gun/projectile/m392_dmr/mojave
)
can_hold = list(/obj/item/clothing/head/helmet/innie/light/mojave,
/obj/item/clothing/suit/storage/innie/light/mojave,
/obj/item/weapon/gun/projectile/m392_dmr/mojave
)

#undef URF_HAND
#undef URF_OVERRIDE
25 changes: 25 additions & 0 deletions code/modules/halo/clothing/donor_unsc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1973,6 +1973,31 @@ obj/item/clothing/head/helmet/odst/donator/roadcone_orange
/obj/item/clothing/suit/armor/special/spartan/mkvii
)

///////////Pneumothorax/////////

//Spartan

/obj/item/clothing/head/helmet/spartan/pneumothorax
name = "Mark IV CQB Helmet"
desc = "A blue battle-worn MJOLNIR MKIV powered helmet."
icon_state = "husky_helm_obj"
item_state = "husky_helm_worn"

/obj/item/clothing/suit/armor/special/spartan/pneumothorax
name = "Mark IV CQB Armor"
desc = "A set of blue battle-worn MJOLNIR MKIV powered armor."
icon_state = "husky_obj"
item_state = "husky_worn"

/obj/item/weapon/storage/box/large/donator/pneumothorax
startswith = list(\
/obj/item/clothing/head/helmet/spartan/pneumothorax,
/obj/item/clothing/suit/armor/special/spartan/pneumothorax
)
can_hold = list(\
/obj/item/clothing/head/helmet/spartan/pneumothorax,
/obj/item/clothing/suit/armor/special/spartan/pneumothorax
)

#undef ODST_OVERRIDE
#undef ITEM_INHAND
Expand Down
Binary file modified code/modules/halo/clothing/spartan_armour.dmi
Binary file not shown.
Binary file modified code/modules/halo/clothing/urf_commando.dmi
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified code/modules/halo/covenant/species/lekgolo/hunters.dmi
Binary file not shown.
Binary file modified code/modules/halo/weapons/icons/Armor_Weapons.dmi
Binary file not shown.
Binary file modified code/modules/halo/weapons/icons/Back_Weapons.dmi
Binary file not shown.
Binary file modified code/modules/halo/weapons/icons/Weapon Sprites.dmi
Binary file not shown.
Binary file modified code/modules/halo/weapons/icons/Weapon_Inhands_left.dmi
Binary file not shown.
Binary file modified code/modules/halo/weapons/icons/Weapon_Inhands_right.dmi
Binary file not shown.
Loading