From e4f544eb32dfc7c6a46084903068bc106aa2d0a0 Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Sat, 11 Jan 2020 01:20:11 +0100 Subject: [PATCH] Trying to fix FLUFF --- .../loadout/loadout_fluffitems_ch.dm | 77 +++++++++++-------- vorestation.dme | 2 +- 2 files changed, 44 insertions(+), 35 deletions(-) diff --git a/code/modules/client/preference_setup/loadout/loadout_fluffitems_ch.dm b/code/modules/client/preference_setup/loadout/loadout_fluffitems_ch.dm index b9efe526c6..c0e51dc1cf 100644 --- a/code/modules/client/preference_setup/loadout/loadout_fluffitems_ch.dm +++ b/code/modules/client/preference_setup/loadout/loadout_fluffitems_ch.dm @@ -2,77 +2,86 @@ /datum/gear/fluff/medals display_name = "some medal" path = /obj/item/clothing/accessory/medal - description = "some medal, made of bronze" + description = "some medal, Made of bronze" + ckeywhitelist = list("Sharkmare") + character_name = list("Kiri") //////////////////CONDUCT -/datum/gear/fluff/medals/conduct +/datum/gear/fluff/medals/conductnadyr + ckeywhitelist = list("nadyr") + character_name = list("Taaa") path = /obj/item/clothing/accessory/medal/conduct display_name = "distinguished conduct medal" description = "A bronze medal awarded for distinguished conduct. Whilst a great honor, this is most basic award on offer. It is often awarded by a captain to a member of their crew." -/datum/gear/fluff/medals/conduct/nadyr - ckeywhitelist = list("nadyr") - character_name = list("Taaa") - -/datum/gear/fluff/medals/conduct/draycu +/datum/gear/fluff/medals/conductdraycu ckeywhitelist = list("draycu") character_name = list("Vuhbar Groor") + path = /obj/item/clothing/accessory/medal/conduct + display_name = "distinguished conduct medal" + description = "A bronze medal awarded for distinguished conduct. Whilst a great honor, this is most basic award on offer. It is often awarded by a captain to a member of their crew." -/datum/gear/fluff/medals/conduct/lowpowermia +/datum/gear/fluff/medals/conductlowpowermia ckeywhitelist = list("lowpowermia") character_name = list("Mia Sceline") description = "A bronze medal awarded for distinguished conduct. Whilst a great honor, this is most basic award on offer. It is often awarded by a captain to a member of their crew. It has a shitty '=3' carved into it." - -//////////////////SILVER -/datum/gear/fluff/medals/silver - path = /obj/item/clothing/accessory/medal/silver - display_name = "silver medal" + path = /obj/item/clothing/accessory/medal/conduct + display_name = "distinguished conduct medal" //////////////////SILVER VALOR -/datum/gear/fluff/medals/silver/valor +/datum/gear/fluff/medals/silvervalorkazzc + ckeywhitelist = list("kazzc") + character_name = list("Kassc Zeravla") path = /obj/item/clothing/accessory/medal/silver/valor display_name = "medal of valor" description = "A silver medal awarded for acts of exceptional valor." -/datum/gear/fluff/medals/silver/valor/kazzc - ckeywhitelist = list("kazzc") - character_name = list("Kassc Zeravla") - -/datum/gear/fluff/medals/silver/valor/somememeguy +/datum/gear/fluff/medals/silvervalorsomememeguy ckeywhitelist = list("somememeguy") character_name = list("Uboiezb") + path = /obj/item/clothing/accessory/medal/silver/valor + display_name = "medal of valor" + description = "A silver medal awarded for acts of exceptional valor." -/datum/gear/fluff/medals/silver/valor/keithwinters +/datum/gear/fluff/medals/silvervalorkeithwinters ckeywhitelist = list("keithwinters") character_name = list("Keith Winters") + path = /obj/item/clothing/accessory/medal/silver/valor + display_name = "medal of valor" + description = "A silver medal awarded for acts of exceptional valor." -/datum/gear/fluff/medals/silver/valor/nadyr +/datum/gear/fluff/medals/silvervalornadyr ckeywhitelist = list("nadyr") character_name = list("Taaa") - -//////////////////GOLD -/datum/gear/fluff/medals/gold - path = /obj/item/clothing/accessory/medal/gold - display_name = "gold medal" + path = /obj/item/clothing/accessory/medal/silver/valor + display_name = "medal of valor" + description = "A silver medal awarded for acts of exceptional valor." //////////////////GOLD HEROISM -/datum/gear/fluff/medals/gold/heroism +/datum/gear/fluff/medals/nadyr + ckeywhitelist = list("nadyr") + character_name = list("Taaa") path = /obj/item/clothing/accessory/medal/gold/heroism display_name = "medal of exceptional heroism" description = "An extremely rare golden medal awarded only by high ranking officials. To recieve such a medal is the highest honor and as such, very few exist. This medal is almost never awarded to anybody but distinguished veteran staff." -/datum/gear/fluff/medals/gold/heroism/nadyr - ckeywhitelist = list("nadyr") - character_name = list("Taaa") - -/datum/gear/fluff/medals/gold/heroism/erikthedog +/datum/gear/fluff/medals/erikthedog ckeywhitelist = list("erikthedog") character_name = list("Erik Ramadwood") + path = /obj/item/clothing/accessory/medal/gold/heroism + display_name = "medal of exceptional heroism" + description = "An extremely rare golden medal awarded only by high ranking officials. To recieve such a medal is the highest honor and as such, very few exist. This medal is almost never awarded to anybody but distinguished veteran staff." -/datum/gear/fluff/medals/gold/heroism/thefurryfeline +/datum/gear/fluff/medals/thefurryfeline ckeywhitelist = list("thefurryfeline") character_name = list("Samantha Janice Softfur") + path = /obj/item/clothing/accessory/medal/gold/heroism + display_name = "medal of exceptional heroism" + description = "An extremely rare golden medal awarded only by high ranking officials. To recieve such a medal is the highest honor and as such, very few exist. This medal is almost never awarded to anybody but distinguished veteran staff." -/datum/gear/fluff/medals/gold/heroism/sharkmare +/datum/gear/fluff/medals/sharkmare ckeywhitelist = list("Sharkmare") character_name = list("Kiri") + path = /obj/item/clothing/accessory/medal/gold/heroism + display_name = "medal of exceptional heroism" + description = "An extremely rare golden medal awarded only by high ranking officials. To recieve such a medal is the highest honor and as such, very few exist. This medal is almost never awarded to anybody but distinguished veteran staff." diff --git a/vorestation.dme b/vorestation.dme index f736996c6b..f79e25cc22 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -1934,7 +1934,6 @@ #include "code\modules\food\drinkingglass\metaglass.dm" #include "code\modules\food\drinkingglass\shaker.dm" #include "code\modules\food\food\cans.dm" -#include "code\modules\food\food\thecake_ch.dm" #include "code\modules\food\food\condiment.dm" #include "code\modules\food\food\drinks.dm" #include "code\modules\food\food\lunch.dm" @@ -1942,6 +1941,7 @@ #include "code\modules\food\food\snacks.dm" #include "code\modules\food\food\snacks_ch.dm" #include "code\modules\food\food\snacks_vr.dm" +#include "code\modules\food\food\thecake_ch.dm" #include "code\modules\food\food\z_custom_food_vr.dm" #include "code\modules\food\food\drinks\bottle.dm" #include "code\modules\food\food\drinks\cup.dm"