From 0a98f39972990dc733a514af3a68eb397203b81d Mon Sep 17 00:00:00 2001 From: Repede Date: Sat, 30 Dec 2023 15:18:24 -0500 Subject: [PATCH] Event medals refactor --- .../loadout/event_fluffitems_yw.dm | 13 +++++ .../loadout/loadout_fluffitems_yw.dm | 52 ------------------- .../under/accessories/accessory_yw.dm | 7 --- vorestation.dme | 1 + 4 files changed, 14 insertions(+), 59 deletions(-) create mode 100644 code/modules/client/preference_setup/loadout/event_fluffitems_yw.dm diff --git a/code/modules/client/preference_setup/loadout/event_fluffitems_yw.dm b/code/modules/client/preference_setup/loadout/event_fluffitems_yw.dm new file mode 100644 index 00000000000..2ffed153113 --- /dev/null +++ b/code/modules/client/preference_setup/loadout/event_fluffitems_yw.dm @@ -0,0 +1,13 @@ +/obj/item/clothing/accessory/medal/silver/achievement + name = "Medal of Achievement" + desc = "A silver medal awarded to corporate members who have achieved a corporate goal successfully." + +/obj/item/clothing/accessory/medal/silver/achievement/twoshuttlesevent + desc = "A silver medal awarded to corporate members who have achieved a corporate goal successfully. - This one was awarded for bringing two damaged shuttles back to Cryogaia for rescue and salvage." + +/datum/gear/fluff/event_medal_twoshuttles + path = /obj/item/clothing/accessory/medal/silver/achievement/twoshuttlesevent + display_name = "Medal of Achievement" + description = "A silver medal awarded to corporate members who have achieved a corporate goal successfully. - This one was awarded for bringing two damaged shuttles back to Cryogaia for rescue and salvage." + ckeywhitelist = list("snakewitharocketlauncher", "blackangelsace", "bielbr12312332", "hidingdan", "montessquio", "tinncatt") + character_name = list("Dakula", "Art Echard", "Dustin Altmann", "Sierra Ellis", "Elise Maschenny", "Kurkivor Snowstrider") diff --git a/code/modules/client/preference_setup/loadout/loadout_fluffitems_yw.dm b/code/modules/client/preference_setup/loadout/loadout_fluffitems_yw.dm index 0192de0683f..58215dea6e4 100644 --- a/code/modules/client/preference_setup/loadout/loadout_fluffitems_yw.dm +++ b/code/modules/client/preference_setup/loadout/loadout_fluffitems_yw.dm @@ -152,23 +152,6 @@ ckeywhitelist = list("blackangelsace") character_name = list("Nicodemus Jarvis") -//Art Echard -/datum/gear/fluff/art_medal1 - path = /obj/item/clothing/accessory/medal/silver/achievement/twoshuttlesevent - display_name = "Medal of Achievement" - description = "A silver medal awarded to corporate members who have achieved a corporate goal successfully. - This one was awarded for bringing two damaged shuttles back to Cryogaia for rescue and salvage." - ckeywhitelist = list("blackangelsace") - character_name = list("Art Echard") - -//Bielbr12312332 -//Dustin Altmann -/datum/gear/fluff/dustin_medal1 - path = /obj/item/clothing/accessory/medal/silver/achievement/twoshuttlesevent - display_name = "Medal of Achievement" - description = "A silver medal awarded to corporate members who have achieved a corporate goal successfully. - This one was awarded for bringing two damaged shuttles back to Cryogaia for rescue and salvage." - ckeywhitelist = list("bielbr12312332") - character_name = list("Dustin Altmann") - //benl8561 //M.I.S.S.Y /datum/gear/fluff/missy_skirt @@ -594,15 +577,6 @@ character_name = list("Harpsong") allowed_roles = list("Security Officer") -//Hiding_Dan -//Sierra Ellis -/datum/gear/fluff/sierra_medal1 - path = /obj/item/clothing/accessory/medal/silver/achievement/twoshuttlesevent - display_name = "Medal of Achievement" - description = "A silver medal awarded to corporate members who have achieved a corporate goal successfully. - This one was awarded for bringing two damaged shuttles back to Cryogaia for rescue and salvage." - ckeywhitelist = list("hidingdan") - character_name = list("Sierra Ellis") - // I CKEYS //izac112 @@ -845,15 +819,6 @@ ckeywhitelist = list("mocatheporg1") character_name = list("Mocha") -//Montessquio -//Elise Maschenny -/datum/gear/fluff/elise_medal1 - path = /obj/item/clothing/accessory/medal/silver/achievement/twoshuttlesevent - display_name = "Medal of Achievement" - description = "A silver medal awarded to corporate members who have achieved a corporate goal successfully. - This one was awarded for bringing two damaged shuttles back to Cryogaia for rescue and salvage." - ckeywhitelist = list("montessquio") - character_name = list("Elise Maschenny") - // N CKEYS //NESgamer190 /datum/gear/fluff/lucy_flask @@ -973,14 +938,6 @@ ckeywhitelist = list("snakewitharocketlauncher") character_name = list("Alex Wolf") -//Dakula -/datum/gear/fluff/dakula_medal1 - path = /obj/item/clothing/accessory/medal/silver/achievement/twoshuttlesevent - display_name = "Medal of Achievement" - description = "A silver medal awarded to corporate members who have achieved a corporate goal successfully. - This one was awarded for bringing two damaged shuttles back to Cryogaia for rescue and salvage." - ckeywhitelist = list("snakewitharocketlauncher") - character_name = list("Dakula") - //splintergp //Aroozee Daarvoleast-Clark /datum/gear/fluff/aroozee_cloak @@ -1008,15 +965,6 @@ // T CKEYS -//TinnCatt -//Kurkivor Snowstrider -/datum/gear/fluff/kurkivor_medal1 - path = /obj/item/clothing/accessory/medal/silver/achievement/twoshuttlesevent - display_name = "Medal of Achievement" - description = "A silver medal awarded to corporate members who have achieved a corporate goal successfully. - This one was awarded for bringing two damaged shuttles back to Cryogaia for rescue and salvage." - ckeywhitelist = list("tinncatt") - character_name = list("Kurkivor Snowstrider") - // U CKEYS // V CKEYS diff --git a/code/modules/clothing/under/accessories/accessory_yw.dm b/code/modules/clothing/under/accessories/accessory_yw.dm index 5cb16d799ef..230177e99d8 100644 --- a/code/modules/clothing/under/accessories/accessory_yw.dm +++ b/code/modules/clothing/under/accessories/accessory_yw.dm @@ -12,10 +12,3 @@ /obj/item/clothing/accessory/poncho/cloak/fluff/dropped() //makes the fluff cloaks not kek when used by a teshari icon_override = 'icons/vore/custom_onmob_yw.dmi' - -/obj/item/clothing/accessory/medal/silver/achievement - name = "Medal of Achievement" - desc = "A silver medal awarded to corporate members who have achieved a corporate goal successfully." - -/obj/item/clothing/accessory/medal/silver/achievement/twoshuttlesevent - desc = "A silver medal awarded to corporate members who have achieved a corporate goal successfully. - This one was awarded for bringing two damaged shuttles back to Cryogaia for rescue and salvage." diff --git a/vorestation.dme b/vorestation.dme index 11f5998c475..364f03732ff 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -1997,6 +1997,7 @@ #include "code\modules\client\preference_setup\global\03_pai.dm" #include "code\modules\client\preference_setup\global\04_ooc.dm" #include "code\modules\client\preference_setup\global\setting_datums.dm" +#include "code\modules\client\preference_setup\loadout\event_fluffitems_yw.dm" #include "code\modules\client\preference_setup\loadout\gear_tweaks.dm" #include "code\modules\client\preference_setup\loadout\gear_tweaks_vr.dm" #include "code\modules\client\preference_setup\loadout\loadout.dm"