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

Changes old donator kit sprites. #6887

Merged
merged 6 commits into from
Aug 21, 2024
Merged
Show file tree
Hide file tree
Changes from 3 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
69 changes: 20 additions & 49 deletions code/modules/cm_marines/Donator_Items.dm
Original file line number Diff line number Diff line change
Expand Up @@ -244,11 +244,12 @@
icon_state = "tristan_armor"
item_state = "tristan_armor"

/obj/item/clothing/suit/storage/marine/fluff/sas_legion //CKEY=sasoperative (UNIQUE)
name = "Legion Armor"
desc = "This armor was custom-made to resemble the small growing Legion within the galaxy started by one man slowly making its way to becoming a larger Corporation. DONOR ITEM."
item_state = "ncrjacket"
icon_state = "ncrjacket"
/obj/item/clothing/suit/storage/marine/light/fluff/sas_legion //CKEY=sasoperative (UNIQUE)
name = "M3 Ranger Armor"
desc = "A set of M3 Pattern Ranger Armor, There probably are not many of these laying around. DONOR ITEM."
flags_atom = FPRINT|CONDUCT|NO_NAME_OVERRIDE
icon_state = "rangerarmor"
item_state = "rangerarmor"

/obj/item/clothing/suit/storage/marine/fluff/feodrich //CKEY=feodrich (UNIQUE)
name = "Doom Armor"
Expand Down Expand Up @@ -470,18 +471,6 @@
icon_state = "medicae_armor_u"
item_state = "medicae_armor_u"

/obj/item/clothing/suit/storage/marine/fluff/Sanctum_heavy
name = "Sanctum Founder Armor"
desc = "Personal Armor of the Founder of Sanctum Team. It looks more like a Exosuit. Unique DONOR ITEM" //Add UNIQUE if Unique
icon_state = "Sanctum_Heavy_u"
item_state = "Sanctum_Heavy_u"

/obj/item/clothing/suit/storage/marine/fluff/Sanctum_medium
name = "Sanctum Standard Armor"
desc = "The Standard Issue Armor for Sanctum Operatives Unique DONOR ITEM"
icon_state = "Sanctum_Medium_u"
item_state = "Sanctum_Medium_u"

/obj/item/clothing/suit/storage/marine/fluff/dudewithatude
name = "Rainbow Coat"
desc = "Powered by the magic of FRIENDSHIP. (Can be toggled opened or closed) UNIQUE DONOR ITEM"
Expand Down Expand Up @@ -656,6 +645,13 @@
icon_state = "hecuhelm_u"
desc = "A combat helmet, bearing the scars of many battles. UNIQUE DONOR ITEM"

/obj/item/clothing/head/helmet/marine/fluff/sas_legion //CKEY=sasoperative (UNIQUE)
name = "M3 Ranger Helmet"
desc = "A M3 Ranger helmet, probably not many of these laying around. DONOR ITEM"
flags_atom = FPRINT|CONDUCT|NO_NAME_OVERRIDE
icon_state = "rangerhelmet"
item_state = "rangerhelmet"

/obj/item/clothing/head/helmet/marine/fluff/officialjake
name = "Timothy's Beret"
desc = "A fancy red beret owned by Timothy Seidner. DONOR ITEM"
Expand Down Expand Up @@ -912,14 +908,6 @@
flags_inventory = BLOCKSHARPOBJ
flags_inv_hide = HIDEEARS|HIDEMASK|HIDEEYES|HIDEALLHAIR

/obj/item/clothing/head/helmet/marine/fluff/Sanctum_helmet
name = "Sanctum Combat Helmet"
desc = " The Standard Issue helmet of Sanctum Team. DONOR ITEM" //Add UNIQUE if Unique
icon_state = "Sanctum_Helm_u"
item_state = "Sanctum_Helm_u"
flags_inventory = BLOCKSHARPOBJ
flags_inv_hide = HIDEEARS|HIDEMASK|HIDEEYES|HIDEALLHAIR

/obj/item/clothing/head/helmet/marine/fluff/dingledangle
name = "Rusty's Cap"
desc = "A little old and shabby. The color has slightly faded over time. DONOR ITEM"
Expand Down Expand Up @@ -998,13 +986,6 @@
worn_state = "camojump"
flags_jumpsuit = FALSE

/obj/item/clothing/under/marine/fluff/sas_legion //CKEY=sasoperative (UNIQUE)
name = "Legion Suit"
desc = "This armor was custom-made to resemble the small growing Legion within the galaxy started by one man slowly making its way to becoming a larger Corporation. DONOR ITEM."
icon_state = "ncr_uni"
worn_state = "ncr_uni"
flags_jumpsuit = FALSE

/obj/item/clothing/under/marine/fluff/feodrich //CKEY=feodrich (UNIQUE)
name = "Doom Uniform"
desc = "A uniform, of a famous Earth warrior... Donor Item"
Expand Down Expand Up @@ -1207,13 +1188,6 @@
worn_state = "medicae_jumpsuit_u"
flags_jumpsuit = FALSE

/obj/item/clothing/under/marine/fluff/sanctum_uniform //NO USER
name = "Sanctum Fatigues"
desc = "Fatigues with Kevlar fibers for a bit more protection than most clothing. UNIQUE DONOR ITEM"
icon_state = "Sanctum_u"
worn_state = "Sanctum_u"
flags_jumpsuit = FALSE

/obj/item/clothing/under/marine/fluff/sailordave //CKEY=sailordave
name = "Eden USCM uniform"
desc = "An older model USCM uniform. UNIQUE DONOR ITEM"
Expand Down Expand Up @@ -1244,16 +1218,6 @@
item_state = "revanmask"
icon_state = "revanmask"


/obj/item/clothing/mask/fluff/sas_legion //CKEY=sasoperative (UNIQUE)
name = "Legion Mask"
desc = "This armor was custom-made to resemble the small growing Legion within the galaxy started by one man slowly making its way to becoming a larger Corporation. DONOR ITEM."
icon_override = 'icons/mob/humans/onmob/mask.dmi'
item_state = "officer_mask"
icon_state = "officer_mask"
flags_inventory = COVERMOUTH|ALLOWREBREATH
flags_inv_hide = HIDEEARS|HIDEFACE|HIDEALLHAIR

/obj/item/clothing/mask/fluff/totalanarchy //CKEY=totalanarchy
name = "PMC Mask"
desc = "A white colored PMC Mask. DONOR ITEM."
Expand Down Expand Up @@ -1373,6 +1337,13 @@
item_state = "securitypack"
has_gamemode_skin = FALSE //same sprite for all gamemodes.

/obj/item/storage/backpack/marine/satchel/fluff/sas_legion //CKEY=sasoperative (UNIQUE)
name = "M3 Armored Pack"
desc = "Plenty of pouches and pockets. DONOR ITEM"
flags_atom = FPRINT|CONDUCT|NO_NAME_OVERRIDE
icon_state = "skinnerrangerpack"
item_state = "skinnerrangerpack"

/obj/item/clothing/glasses/fluff/alexwarhammer
name = "Black Jack's Dank Shades"
desc = "+20 Badass points. Donor item"
Expand Down
6 changes: 3 additions & 3 deletions code/modules/cm_marines/Donator_Kits.dm
Original file line number Diff line number Diff line change
Expand Up @@ -436,9 +436,9 @@
donor_key = "sasoperative"
kit_variant = "Legion"
donor_gear = list(
/obj/item/clothing/suit/storage/marine/fluff/sas_legion,
/obj/item/clothing/under/marine/fluff/sas_legion,
/obj/item/clothing/mask/fluff/sas_legion,
/obj/item/clothing/suit/storage/marine/light/fluff/sas_legion,
/obj/item/clothing/head/helmet/marine/fluff/sas_legion,
/obj/item/storage/backpack/marine/satchel/fluff/sas_legion,
)

/obj/item/storage/box/donator_kit/seloc_aferah
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/mob/humans/onmob/uniform_1.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/donor/HEAD.dmi
Binary file not shown.
Binary file modified icons/obj/items/clothing/donor/SUITS.dmi
Binary file not shown.
Binary file removed icons/obj/items/clothing/donor/Sanctum Uniforms.dmi
Binary file not shown.
Binary file modified icons/obj/items/clothing/donor/UNIFORM.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.
Binary file modified icons/obj/items/clothing/uniforms.dmi
Binary file not shown.
Loading