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

Sprites changes for old donator kit #4702

Merged
merged 5 commits into from
Oct 27, 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
26 changes: 14 additions & 12 deletions code/modules/cm_marines/Donator_Items.dm
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,9 @@
/obj/item/storage/backpack/marine/fluff
xeno_types = null

/obj/item/storage/backpack/marine/satchel/fluff
xeno_types = null

/obj/item/clothing/gloves/marine/fluff //MARINE GLOVES TEMPLATE
name = "ITEM NAME"
desc = "ITEM DESCRIPTION. DONOR ITEM" //Add UNIQUE if Unique
Expand Down Expand Up @@ -211,10 +214,10 @@
item_state = "armor_reflec"

/obj/item/clothing/suit/storage/marine/fluff/sas_juggernaut //CKEY=sasoperative (UNIQUE)
name = "Juggernaut Armor"
name = "juggernaut armor"
desc = "Some fancy looking armor. DONOR ITEM"
icon_state = "rig-syndi"
item_state = "syndie_hardsuit"
icon_state = "skinnerarmor"
item_state = "skinnerarmor"

/obj/item/clothing/suit/storage/marine/fluff/penguin //CKEY=tophatpenguin
name = "Trenchcoat"
Expand Down Expand Up @@ -589,8 +592,8 @@
flags_inv_hide = HIDEEARS|HIDEALLHAIR

/obj/item/clothing/head/helmet/marine/fluff/sas_juggernaut //CKEY=sasoperative (UNIQUE)
name = "Juggernaut Helmet"
icon_state = "rig0-syndi"
name = "juggernaut helmet"
icon_state = "skinnerhelmet"
desc = "A red helmet, for pairing with JuggerNaut Armor. DONOR ITEM"

/obj/item/clothing/head/helmet/marine/fluff/tristan //CKEY=tristan63
Expand All @@ -613,13 +616,6 @@
flags_inventory = BLOCKSHARPOBJ
flags_inv_hide = HIDEEARS|HIDEMASK|HIDEEYES|HIDEALLHAIR

/obj/item/clothing/head/helmet/marine/fluff/sas_juggernaut_alt //CKEY=sasoperative (UNIQUE)
name = "Juggernaut Helmet"
icon_state = "ncrhelmet"
desc = "A red helmet, for pairing with JuggerNaut Armor. DONOR ITEM"
flags_inventory = BLOCKSHARPOBJ
flags_inv_hide = HIDEEARS|HIDEMASK|HIDEEYES|HIDEALLHAIR

/obj/item/clothing/head/helmet/marine/fluff/sadokist //CKEY=sadokist
name = "Tanya's Beret"
desc = "A bright red beret, owned by Tanya Edenia."
Expand Down Expand Up @@ -1366,6 +1362,12 @@
icon_state = "securitypack"
item_state = "securitypack"

/obj/item/storage/backpack/marine/satchel/fluff/sas_juggernaut //CKEY=sasoperative (UNIQUE)
name = "tactical radiopack"
desc = "A Radio backpack for use with the Juggernaut armor. DONOR ITEM"
icon_state = "skinnerpack"
item_state = "skinnerpack"

/obj/item/clothing/glasses/fluff/alexwarhammer
name = "Black Jack's Dank Shades"
desc = "+20 Badass points. Donor item"
Expand Down
2 changes: 1 addition & 1 deletion code/modules/cm_marines/Donator_Kits.dm
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,7 @@
donor_key = "sasoperative"
kit_variant = "Juggernaut"
donor_gear = list(
/obj/item/clothing/head/helmet/marine/fluff/sas_juggernaut_alt,
/obj/item/storage/backpack/marine/satchel/fluff/sas_juggernaut,
/obj/item/clothing/head/helmet/marine/fluff/sas_juggernaut,
/obj/item/clothing/suit/storage/marine/fluff/sas_juggernaut,
)
Expand Down
Binary file modified icons/mob/humans/onmob/back.dmi
Binary file not shown.
Binary file modified icons/mob/humans/onmob/head_0.dmi
Binary file not shown.
Binary file modified icons/mob/humans/onmob/suit_0.dmi
Binary file not shown.
Binary file modified icons/obj/items/clothing/backpacks.dmi
Binary file not shown.
Binary file modified icons/obj/items/clothing/hats.dmi
Binary file not shown.
Binary file modified icons/obj/items/clothing/suits.dmi
Binary file not shown.