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 #3460

Merged
merged 4 commits into from
Aug 11, 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
32 changes: 31 additions & 1 deletion code/modules/halo/clothing/donor_covenant.dm
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
#define JIRALHANAE_ICON_PATH_MOB 'code/modules/halo/covenant/species/jiralhanae/jiralhanae_gear.dmi'
#define GRUNT_GEAR_ICON 'code/modules/halo/covenant/species/unggoy/grunt_gear.dmi'

////////Boltersam\\\\\\\\

//JIRALHANAE
#define JIRALHANAE_ICON_PATH_MOB 'code/modules/halo/covenant/species/jiralhanae/jiralhanae_gear.dmi'

/obj/item/clothing/head/helmet/jiralhanae/covenant/boltersam
icon_state = "bolter_helm"
Expand Down Expand Up @@ -821,4 +823,32 @@
/obj/item/clothing/gloves/thick/sangheili/minor/timmy
)

///////Ilikesaying\\\\\\\\

//Unggoy (MINOR)

/obj/item/clothing/suit/armor/special/unggoy_combat_harness/ilikesaying
name = "Magical Grunt Armor"
desc = "Worn by those who wish to punish heretics with the power of love!"
icon = GRUNT_GEAR_ICON
icon_override = GRUNT_GEAR_ICON
icon_state = "grif_minor_combatharness"

/obj/item/weapon/gun/energy/plasmapistol/ilikesaying
name = "Magical Plasma Pistol"
desc = "In the name of the Covenant, I'll punish you!"
icon_state = "Grif Plasma Pistol"

/obj/item/weapon/storage/box/large/donator/ilikesaying/unggoy_minor
startswith = list(/obj/item/clothing/suit/armor/special/unggoy_combat_harness/ilikesaying,
/obj/item/weapon/gun/energy/plasmapistol/ilikesaying,
/obj/item/weapon/gun/energy/plasmapistol/ilikesaying
)
can_hold = list(/obj/item/clothing/suit/armor/special/unggoy_combat_harness/ilikesaying,
/obj/item/weapon/gun/energy/plasmapistol/ilikesaying,
/obj/item/weapon/gun/energy/plasmapistol/ilikesaying
)

#undef JIRALHANAE_ICON_PATH_OBJ
#undef GRUNT_GEAR_ICON

21 changes: 19 additions & 2 deletions code/modules/halo/clothing/donor_innie.dm
Original file line number Diff line number Diff line change
Expand Up @@ -386,14 +386,31 @@ obj/item/clothing/suit/armor/special/soe/pantas
else
icon_state = "mojave-m392-unloaded"

/obj/item/weapon/gun/projectile/shotgun/pump/m90_ts/mojave
name = "The Boomstick"
desc = "An ancient pattern of shotgun, while worn and old, you can tell its owner takes good care of it."
icon_state = "mojave-shotgun"
item_state = "mojave-shotgun"
fire_sound = 'code/modules/halo/sounds/Mojave_Shotgun_Fire.ogg'
reload_sound = 'code/modules/halo/sounds/Mojave_Shotgun_Reload.ogg'
wielded_item_state = "mojave-shotgun-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/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
/obj/item/weapon/gun/projectile/m392_dmr/mojave,
/obj/item/weapon/gun/projectile/shotgun/pump/m90_ts/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
/obj/item/weapon/gun/projectile/m392_dmr/mojave,
/obj/item/weapon/gun/projectile/shotgun/pump/m90_ts/mojave
)

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

//ODST

/obj/item/clothing/head/helmet/odst/donator/pneumothorax
name = "S-1/ONI Recon Helmet"
desc = "A modified Mjolnir MK5 Recon helmet designed for use by ODST's. It has a dull orange visor and appears to be similar in strength to the standard ODST Helmets."
item_state = "husky-helmet-worn"
icon_state = "husky-helmet-obj"
item_state_novisr = "husky-helmet-transparent-worn"
icon_state_novisr = "husky-helmet-transparent-obj"

/obj/item/clothing/suit/armor/special/odst/donator/pneumothorax
name = " S-1/ONI Recon BDU"
desc = "A set of Recon BDUs equipped with trauma plates protecting vital areas. Unlike traditional Helljumper BDUs, this one seems lighter in nature, missing the iconic pauldrons. This armor seems well-worn."
item_state = "husky-armor-worn"
icon_state = "husky-armor-obj"

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

///////////TempleOSDavis/////////

//Spartan
Expand Down
Binary file modified code/modules/halo/clothing/odst.dmi
Binary file not shown.
Binary file modified code/modules/halo/clothing/odst_items.dmi
Binary file not shown.
Binary file modified code/modules/halo/covenant/species/unggoy/grunt_gear.dmi
Binary file not shown.
Binary file not shown.
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/Covenant 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