From dc48df96be33078fc1929e807793bfe9fb623b79 Mon Sep 17 00:00:00 2001 From: Thedragmeme <81540056+Draggeru@users.noreply.github.com> Date: Thu, 14 Nov 2024 10:42:40 -0600 Subject: [PATCH 1/2] Adds donor items for thedragmeme (#4574) * Update TGS DMAPI * Donate deeze nuts * Update modular_nova/modules/customization/modules/clothing/~donator/donator_clothing.dm Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com> * I need an adult * I HATE IT HERE --------- Co-authored-by: novasector-ci[bot] <181600888+novasector-ci[bot]@users.noreply.github.com> Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com> --- .../clothing/~donator/donator_clothing.dm | 37 +++++ .../donator/personal/donator_personal.dm | 146 ++++++++++++++++++ 2 files changed, 183 insertions(+) diff --git a/modular_nova/modules/customization/modules/clothing/~donator/donator_clothing.dm b/modular_nova/modules/customization/modules/clothing/~donator/donator_clothing.dm index 6723c01f081..b91af7d5c82 100644 --- a/modular_nova/modules/customization/modules/clothing/~donator/donator_clothing.dm +++ b/modular_nova/modules/customization/modules/clothing/~donator/donator_clothing.dm @@ -219,6 +219,43 @@ var/mob/wearer = loc wearer.update_body() +<<<<<<< HEAD +======= +//Donation reward for Thedragmeme +//Have I reached suspiciously wealthy furry status yet? /j +/obj/item/clothing/under/sweater_dress + name = "virgin killer sweater" + desc = "A meticulously knitted sweater that shows off ALL the right places. This is BARELY considered work attire." + worn_icon = 'modular_nova/master_files/icons/donator/mob/clothing/suit.dmi' + icon = 'modular_nova/master_files/icons/donator/obj/clothing/suits.dmi' + lefthand_file = 'modular_nova/master_files/icons/donator/mob/inhands/donator_left.dmi' + righthand_file = 'modular_nova/master_files/icons/donator/mob/inhands/donator_right.dmi' + icon_state = "virginslayer" + inhand_icon_state = "virginslayer" + +/obj/item/clothing/suit/jacket/bomber_donor + name = "old hoodie" + desc = "A somewhat well worn jacket, appears to be way too big considering who owns it." + icon = 'modular_nova/master_files/icons/donator/obj/clothing/suits.dmi' + worn_icon = 'modular_nova/master_files/icons/donator/mob/clothing/suit.dmi' + lefthand_file = 'modular_nova/master_files/icons/donator/mob/inhands/donator_left.dmi' + righthand_file = 'modular_nova/master_files/icons/donator/mob/inhands/donator_right.dmi' + icon_state = "bomber" + inhand_icon_state = "bomber" + +//Donation reward for Thedragmeme, gift for ActualVanguard +/obj/item/clothing/neck/padded/security + name = "vanguard cloak" + desc = "A meticulously handcrafted cloak that is lined with subtle pockets filled with feathers and down. Oddly enough, you always feel comfortable regardless of the weather. Even odder, there is an ever so faint scent of wet rock on the interior of the cloak." + icon_state = "paddedsec" + inhand_icon_state = "paddedsec" + hood_type = /obj/item/clothing/head/hooded/padded/security + +/obj/item/clothing/head/hooded/padded/security + name = "vanguard cloak hood" + icon_state = "paddedsechood" + +>>>>>>> 72a226822c2 (Adds donor items for thedragmeme (#4574)) /obj/item/clothing/head/hooded/padded name = "feathered serenity hood" icon_state = "paddedhood" diff --git a/modular_nova/modules/loadouts/loadout_items/donator/personal/donator_personal.dm b/modular_nova/modules/loadouts/loadout_items/donator/personal/donator_personal.dm index 022890c535c..54d75aa34dd 100644 --- a/modular_nova/modules/loadouts/loadout_items/donator/personal/donator_personal.dm +++ b/modular_nova/modules/loadouts/loadout_items/donator/personal/donator_personal.dm @@ -3,6 +3,152 @@ item_path = /obj/item/canvas/drawingtablet donator_only = TRUE +<<<<<<< HEAD +======= +/datum/loadout_item/pocket_items/stellar_bouquet + name = "Stellar Bouquet" + item_path = /obj/item/bouquet/stellar + ckeywhitelist = list("thedragmeme") + +/datum/loadout_item/under/jumpsuit/paddedunder + name = "Feathered Serenity Suit" + item_path = /obj/item/clothing/under/padded + ckeywhitelist = list("thedragmeme") + +/datum/loadout_item/under/jumpsuit/sweater_dress + name = "Virgin Killer Sweater" + item_path = /obj/item/clothing/under/sweater_dress + ckeywhitelist = list("thedragmeme") + +/datum/loadout_item/suit/bomber_donor + name = "Old Hoodie" + item_path = /obj/item/clothing/suit/jacket/bomber_donor + ckeywhitelist = list("thedragmeme") + +/datum/loadout_item/under/jumpsuit/paddedunder/alt + name = "Feathered Serenity Dress" + item_path = /obj/item/clothing/under/padded/alt + ckeywhitelist = list("snailomi") + +/datum/loadout_item/neck/padded + name = "Feathered Serenity Cloak" + item_path = /obj/item/clothing/neck/padded + ckeywhitelist = list("thedragmeme", "SomeNetwork") + +/datum/loadout_item/neck/padded/alt + name = "Feathered Serenity Cloak" + item_path = /obj/item/clothing/neck/padded/alt + ckeywhitelist = list("snailomi") + +/datum/loadout_item/neck/padded/security + name = "Vanguard Cloak" + item_path = /obj/item/clothing/neck/padded/security + ckeywhitelist = list("actualvanguard") + +/datum/loadout_item/gloves/padded + name = "Serenity Gloves" + item_path = /obj/item/clothing/gloves/padded + ckeywhitelist = list("thedragmeme", "snailomi") + +/datum/loadout_item/shoes/padded + name = "Serenity Boots" + item_path = /obj/item/clothing/shoes/jackboots/padded + ckeywhitelist = list("thedragmeme") + +/datum/loadout_item/under/jumpsuit/long_skirtleneck + name = "Tacticool Skirtleneck (Long)" + item_path = /obj/item/clothing/under/syndicate/tacticool/skirt/long + ckeywhitelist = list("HollandaiseSauce", "Latinfishy", "Tf4") + +/datum/loadout_item/suit/ryddid + name = "The Ryddid" + item_path = /obj/item/clothing/suit/jacket/ryddid + ckeywhitelist = list("grunnyyy") + +/datum/loadout_item/under/jumpsuit/draculass + name = "Draculass Dress" + item_path = /obj/item/clothing/under/costume/draculass + ckeywhitelist = list("grunnyyy", "joe_duhan") + +/datum/loadout_item/neck/grunnyyycloak + name = "Black and Red cloak" + item_path = /obj/item/clothing/neck/cloak/grunnyyy + ckeywhitelist = list("grunnyyy") + +/datum/loadout_item/gloves/hypnoring_coffee + name = "Hypnodemon's Ring" + item_path = /obj/item/clothing/gloves/ring/hypno/coffeepot + ckeywhitelist = list("coffeepot") + +/datum/loadout_item/gloves/hypnoring_bippy + name = "Hypnodemon's Ring" + item_path = /obj/item/clothing/gloves/ring/hypno/bippys + ckeywhitelist = list("bippys") + +/datum/loadout_item/shoes/rax_armadyne_boots + name = "Tactical Boots" + item_path = /obj/item/clothing/shoes/combat/rax + ckeywhitelist = list("raxraus") + +/datum/loadout_item/suit/rax_peacekeeper_jacket + name = "Peacekeeper jacket" + item_path = /obj/item/clothing/suit/armor/vest/warden/rax + ckeywhitelist = list("raxraus") + restricted_roles = list(JOB_BLUESHIELD, JOB_HEAD_OF_SECURITY, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_DETECTIVE, JOB_CORRECTIONS_OFFICER) + +/datum/loadout_item/under/jumpsuit/rax_banded_uniform + name = "Banded Uniform" + item_path = /obj/item/clothing/under/rank/security/rax + ckeywhitelist = list("raxraus") + restricted_roles = list(JOB_BLUESHIELD, JOB_HEAD_OF_SECURITY, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_DETECTIVE, JOB_CORRECTIONS_OFFICER) + +/datum/loadout_item/head/goldengoggles + name = "Steampunk Goggles" + item_path = /obj/item/clothing/glasses/welding/steampunk_goggles + ckeywhitelist = list("goldenalpharex") + +/datum/loadout_item/under/jumpsuit/plasmaman_jax + name = "XuraCorp Biohazard Underfitting" + item_path = /obj/item/clothing/under/plasmaman/jax2 + ckeywhitelist = list("candlejax") + restricted_roles = list(JOB_RESEARCH_DIRECTOR, JOB_SCIENTIST, JOB_SCIENCE_GUARD, JOB_VIROLOGIST, JOB_GENETICIST) + +/datum/loadout_item/mask/cmcp_mask + name = "CMCP Mask" + item_path = /obj/item/clothing/mask/gas/CMCP_mask + ckeywhitelist = list("candlejax") + +/datum/loadout_item/head/anahelm + name = "Azulean's Enviro-Helmet" + item_path = /obj/item/clothing/head/helmet/space/plasmaman/candlejax2 + ckeywhitelist = list("candlejax") + +/datum/loadout_item/under/jumpsuit/emissionsuit + name = "Emission's Suit" + item_path = /obj/item/clothing/under/plasmaman/candlejax + ckeywhitelist = list("candlejax") + +/datum/loadout_item/mask/divemask_koru + name = "S.O.K.O. Gaiter" + item_path = /obj/item/clothing/mask/gas/signalis_gaiter + ckeywhitelist = list("koruu", "foxyandiknowit", "candlejax", "shyelf", "opportunerover22") + +/datum/loadout_item/under/jumpsuit/divesuit_koru + name = "S.O.K.O. Bodysuit" + item_path = /obj/item/clothing/under/bodysuit_koruu + ckeywhitelist = list("koruu", "foxyandiknowit", "candlejax", "shyelf", "opportunerover22") + +/datum/loadout_item/under/jumpsuit/anasuit + name = "Azulean's Enviro-Suit" + item_path = /obj/item/clothing/under/plasmaman/candlejax2 + ckeywhitelist = list("candlejax") + +/datum/loadout_item/mask/composite_filtration + name = "Composite Filtration Mask" + item_path = /obj/item/clothing/mask/gas/psycho_malice + ckeywhitelist = list("snakebittenn", "chillylobster", "candlejax", "theooz", "alvcyktor") + +>>>>>>> 72a226822c2 (Adds donor items for thedragmeme (#4574)) /datum/loadout_item/suit/jacket abstract_type = /datum/loadout_item/suit/jacket From ba9c8005f73b52e5346eada9e596e57db4aa6e4b Mon Sep 17 00:00:00 2001 From: StealsThePRs Date: Thu, 14 Nov 2024 19:42:48 +0300 Subject: [PATCH 2/2] [MIRROR] Adds donor items for thedragmeme