diff --git a/code/__DEFINES/~darkpack/branding.dm b/code/__DEFINES/~darkpack/branding.dm index 774626bc4970..4abe1c6289dd 100644 --- a/code/__DEFINES/~darkpack/branding.dm +++ b/code/__DEFINES/~darkpack/branding.dm @@ -5,14 +5,14 @@ #define SEPT_NAME "Sept of the Western Eye" -#define EVIL_COMPANY "Pentex" +#define EVIL_COMPANY "Pentex Group" #define MAIN_EVIL_COMPANY EVIL_OIL_COMPANY // Only effects Pentex job slots // Treated as subsidary of EVIL_COMPANY /* MAJOR COMPANIES - Currently or at one time held the Top 21 Company title */ #define EVIL_TRASH_COMPANY "Ardus Enterprises" -#define EVIL_TOY_COMPANY "Avalon Incorporated." +#define EVIL_TOY_COMPANY "Avalon Incorporated" #define EVIL_CIGARETTE_COMPANY "Circinus Brands" #define EVIL_INVESTMENT_COMPANY "Consolidex Worldwide" #define EVIL_OIL_COMPANY "Endron International" @@ -20,6 +20,7 @@ #define EVIL_MINING_COMPANY "Harold and Harold Mining, Incorporated" #define EVIL_PAPER_COMPANY "Good House International" #define EVIL_FISHING_COMPANY "Hallahan Fishing Company" +#define EVIL_HANDGUN_COMPANY "Herculean Firearms Incorporated" #define EVIL_GROCERY_COMPANY "Herrick's" #define EVIL_LIQUOR_COMPANY "King Breweries and Distilleries" #define EVIL_PHARMA_COMPANY "Magadon, Incorporated" @@ -41,7 +42,7 @@ #define EVIL_EGYPTIAN_OIL_COMPANY "EGPC" /* HAROLD AND HAROLD SUBSIDIARIES */ -#define EVIL_EGYPTIAN_MINING_COMPANY "Kaulet Mining" +#define EVIL_EGYPTIAN_MINING_COMPANY "Kauket Mining" /* KING BREWERIES SUBSIDIARIES */ #define EVIL_WATERWAY_COMPANY "AquaClear Foundation" @@ -82,13 +83,12 @@ #define EVIL_COSMETICS_COMPANY_3 "Pangloss Cosmetics" // Subsidiary of Siren Cosmetics #define EVIL_WEAPON_COMPANY "Full Force Solutions" #define EVIL_PR_COMPANY "Gaia Research Company" -#define EVIL_HANDGUN_COMPANY "Herculean Firearms Incorporated" #define EVIL_CONSTRUCTION_COMPANY "Hi-Quality Builders" #define EVIL_LAW_COMPANY "Meyers, Feinstein and Hargrett" #define EVIL_TECH_COMPANY "NikNak Computing" #define EVIL_GAMING_COMPANY "Deep Dive Games" // Subsidiary of NikNak #define EVIL_NEWS_COMPANY "RED Network" -#define EVIL_CONTSTRUCTION_COMPANY_2 "Safe Haven Construction" +#define EVIL_CONSTRUCTION_COMPANY_2 "Safe Haven Construction" #define EVIL_INTEL_COMPANY "Shade, Inc." #define EVIL_HORROR_COMPANY "Slaughterhouse Video" #define EVIL_CONSULTING_COMPANY "Southeastern Tech Management" diff --git a/code/__DEFINES/~darkpack/colors.dm b/code/__DEFINES/~darkpack/colors.dm index ba63b538ad1b..ec2b32ba0e7c 100644 --- a/code/__DEFINES/~darkpack/colors.dm +++ b/code/__DEFINES/~darkpack/colors.dm @@ -1 +1,22 @@ -#define COLOR_ENDRON_GREEN "#015334" +#define COLOR_CORP_PENTEX "#3B2033" + +#define COLOR_CORP_ARDUS "#9BADB7" +#define COLOR_CORP_AVALON "#6556ED" +#define COLOR_CORP_CIRCINUS "#FFBF82" +#define COLOR_CORP_CONSOLIDEX "#DD28FF" +#define COLOR_CORP_ENDRON "#015334" +#define COLOR_CORP_HAROLD_HAROLD "#92483B" +#define COLOR_CORP_GOOD_HOUSE "#B297BB" +#define COLOR_CORP_HALLAHAN "#460DD1" +#define COLOR_CORP_HERCULEAN "#FF1010" +#define COLOR_CORP_HERRICKS "#9009BB" +#define COLOR_CORP_KING "#CDAF58" +#define COLOR_CORP_MAGADON "#45F7FF" +#define COLOR_CORP_NASTRUM "#FF7DA2" +#define COLOR_CORP_OMNI_TV "#ED795E" +#define COLOR_CORP_OTOLLEYS "#8FEDC5" +#define COLOR_CORP_BLACK_DOG "#E3EBFF" +#define COLOR_CORP_RAINBOW_INC "#FFB6EE" +#define COLOR_CORP_TELLUS "#66FF28" +#define COLOR_CORP_VESUVIUS "#E7E8C7" +#define COLOR_CORP_YOUNG_SMITH "#A5BB97" diff --git a/code/__HELPERS/icons.dm b/code/__HELPERS/icons.dm index 2f2f4f2d2381..7b2793a7bc84 100644 --- a/code/__HELPERS/icons.dm +++ b/code/__HELPERS/icons.dm @@ -566,7 +566,8 @@ world if(no_anim) //Clean up repeated frames - var/icon/cleaned = new /icon() + // Done this way otherwise Width() and Height() would always be 0 for this icon + var/icon/cleaned = icon('icons/effects/effects.dmi', "nothing") cleaned.Insert(flat, "", SOUTH, 1, 0) return cleaned else diff --git a/code/game/objects/items/skub.dm b/code/game/objects/items/skub.dm index 12e6da344d0b..eeb8bbac65df 100644 --- a/code/game/objects/items/skub.dm +++ b/code/game/objects/items/skub.dm @@ -6,6 +6,7 @@ w_class = WEIGHT_CLASS_BULKY attack_verb_continuous = list("skubs") attack_verb_simple = list("skub") + brand = "badcode" // DARKPACK EDIT ADD - company_logos - Proof of concept. I kinda like it. Leave it? /obj/item/skub/Initialize(mapload) . = ..() diff --git a/modular_darkpack/master_files/code/game/atom/_atom.dm b/modular_darkpack/master_files/code/game/atom/_atom.dm new file mode 100644 index 000000000000..00401b598b41 --- /dev/null +++ b/modular_darkpack/master_files/code/game/atom/_atom.dm @@ -0,0 +1,3 @@ +/atom + // DARKPACK Module - company_logos - If matching a /datum/brand's manufacturer, append a logo to the examine text. Element only added by default on /obj/ + var/brand diff --git a/modular_darkpack/master_files/code/game/objects/objs.dm b/modular_darkpack/master_files/code/game/objects/objs.dm new file mode 100644 index 000000000000..ec7c2fb38a57 --- /dev/null +++ b/modular_darkpack/master_files/code/game/objects/objs.dm @@ -0,0 +1,4 @@ +/obj/Initialize(mapload) + . = ..() + if(brand) // DARKPACK module - company_logos - If we don't have a brand, disregard. + AddElement(/datum/element/corp_label, GLOB.all_brandnames[brand]) diff --git a/modular_darkpack/modules/company_logos/code/company_logos.dm b/modular_darkpack/modules/company_logos/code/company_logos.dm new file mode 100644 index 000000000000..ebf31d7791a7 --- /dev/null +++ b/modular_darkpack/modules/company_logos/code/company_logos.dm @@ -0,0 +1,71 @@ +GLOBAL_LIST_INIT(all_brands, init_subtypes_w_path_keys(/datum/brand, list())) +GLOBAL_LIST_INIT(all_brandnames, brand_list_by_name()) + +/proc/brand_list_by_name() + var/list/brand_list = GLOB.all_brands + + for(var/path in brand_list) + var/datum/brand/this_brand = brand_list[path] + brand_list[this_brand.manufacturer] = this_brand + return brand_list + +/datum/element/corp_label + var/datum/brand/our_brand = /datum/brand + element_flags = ELEMENT_BESPOKE + argument_hash_start_idx = 1 + +/datum/element/corp_label/Attach(datum/target, datum/brand/my_brand) + . = ..() + if(!isatom(target)) + return ELEMENT_INCOMPATIBLE + + var/atom/product = target + + if(!product.brand) + return ELEMENT_INCOMPATIBLE + + our_brand = my_brand + + if(isnull(my_brand)) + our_brand = /datum/brand + + RegisterSignal(target, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(target, COMSIG_ATOM_EXAMINE_MORE, PROC_REF(on_examine_more)) + +/datum/element/corp_label/Detach(datum/target) + UnregisterSignal(target, list(COMSIG_ATOM_EXAMINE)) + return ..() + +/datum/element/corp_label/proc/on_examine(datum/source, mob/user, list/examine_list) + SIGNAL_HANDLER + examine_list += span_notice("
This item is branded.. [EXAMINE_HINT("Look closer")] for more information.") + +/datum/element/corp_label/proc/on_examine_more(datum/source, mob/user, list/examine_list) + SIGNAL_HANDLER + var/logo + if(our_brand.render_logo) + logo = "[icon2html(our_brand.logo_icon, user, our_brand.manufacturer, extra_classes = "corplogo")]" + + examine_list += span_info("[logo ? "[logo]
" : ""]Brought to you by [our_brand.full_name].") + + if(our_brand.slogan) + examine_list += span_notice("\"[our_brand.slogan]\"") + +/datum/brand + abstract_type = /datum/brand + + // Used to index the brand and reference the icon_state + var/manufacturer = "badcode" + // The full, plain-text name of the company. + var/full_name = "Bad Code Inc." + // Company slogan. Displayed alongside the logo in most cases. + var/slogan = "Bad Code Inc.: Telling America's Coders they screwed up since 1970." + // Formatting applied to the name in item descriptions + var/name_span = "hypnophrase" + // The icon file we're grabbing our icon_state from. Default dimensions in this file are 300x110. + var/logo_icon = 'modular_darkpack/modules/company_logos/icons/corp_logos.dmi' + // If FALSE, skip rendering the logo in examine text. + var/render_logo = TRUE + // Company color used for coloring certain items that change depending on brand + var/company_color = COLOR_ADMIN_PINK + diff --git a/modular_darkpack/modules/company_logos/code/generic_products.dm b/modular_darkpack/modules/company_logos/code/generic_products.dm new file mode 100644 index 000000000000..f7e81d73b7bd --- /dev/null +++ b/modular_darkpack/modules/company_logos/code/generic_products.dm @@ -0,0 +1,97 @@ +// Basically example items for the different brands but can be used as set-dressing + +/obj/item/product + name = "product" + desc = "You feel an overwhelming urge to consume it." + icon = 'modular_darkpack/modules/company_logos/icons/generic_product.dmi' + brand = "badcode" + abstract_type = /obj/item/product + +/obj/item/product/Initialize(mapload) + + var/datum/brand/parent_brand = GLOB.all_brandnames[brand] + if(isnull(parent_brand)) + parent_brand = /datum/brand + + name = "\improper" + parent_brand.full_name + " " + name + icon_state = brand + + if(!isnull(parent_brand)) + color = parent_brand.company_color + + . = ..() + +/obj/item/product/pentex + brand = "pentex" + +/obj/item/product/pentex/ardus + brand = "ardus" + +/obj/item/product/pentex/avalon + brand = "avalon" + +/obj/item/product/pentex/circinus + brand = "circinus" + +/obj/item/product/pentex/consolidex + brand = "consolidex" + +/obj/item/product/pentex/endron + brand = "endron" + +/obj/item/product/pentex/endron/atlas + brand = "atlas" + +/obj/item/product/pentex/harold_and_harold + brand = "harold_and_harold" + +/obj/item/product/pentex/good_house + brand = "good_house" + +/obj/item/product/pentex/hallahan + brand = "hallahan" + +/obj/item/product/pentex/herculean + brand = "herculean" + +/obj/item/product/pentex/herricks + brand = "herricks" + +/obj/item/product/pentex/king + brand = "king" + +/obj/item/product/pentex/magadon + brand = "magadon" + +/obj/item/product/pentex/magadon/aesop + brand = "aesop" + +/obj/item/product/pentex/magadon/autumn + brand = "autumn" + +/obj/item/product/pentex/nastrum + brand = "nastrum" + +/obj/item/product/pentex/omni + brand = "omni" + +/obj/item/product/pentex/otolleys + brand = "otolleys" + +/obj/item/product/pentex/black_dog + brand = "black_dog" + +/obj/item/product/pentex/rainbow + brand = "rainbow" + +/obj/item/product/pentex/tellus + brand = "tellus" + +/obj/item/product/pentex/tellus/sunburst + brand = "sunburst" + +/obj/item/product/pentex/vesuvius + brand = "vesuvius" + +/obj/item/product/pentex/young_and_smith + brand = "young_and_smith" diff --git a/modular_darkpack/modules/company_logos/code/pentex.dm b/modular_darkpack/modules/company_logos/code/pentex.dm new file mode 100644 index 000000000000..530c2bdb16c5 --- /dev/null +++ b/modular_darkpack/modules/company_logos/code/pentex.dm @@ -0,0 +1,829 @@ +/datum/brand/pentex + manufacturer = "pentex" + full_name = EVIL_COMPANY + slogan = "Pentex: Making All The Really Tough Decisions For You!" + name_span = "corp_label_pentex" + company_color = COLOR_CORP_PENTEX + +// TOP 21 - Companies that are or were at one time in the top 21 +/datum/brand/pentex/ardus + manufacturer = "ardus" + full_name = EVIL_TRASH_COMPANY + slogan = "Keeping America's wilderness clean!" + name_span = "corp_label_ardus" + company_color = COLOR_CORP_ARDUS + +/datum/brand/pentex/avalon + manufacturer = "avalon" + full_name = EVIL_TOY_COMPANY + slogan = "Blast off to Fun!" + name_span = "corp_label_avalon" + company_color = COLOR_CORP_AVALON + +/datum/brand/pentex/circinus + manufacturer = "circinus" + full_name = EVIL_CIGARETTE_COMPANY + slogan = "The best taste in the tent." + name_span = "corp_label_circinus" + company_color = COLOR_CORP_CIRCINUS + +/datum/brand/pentex/consolidex + manufacturer = "consolidex" + full_name = EVIL_INVESTMENT_COMPANY + slogan = "Portfolio simplified." + name_span = "corp_label_consolidex" + company_color = COLOR_CORP_CONSOLIDEX + +/datum/brand/pentex/endron + manufacturer = "endron" + full_name = EVIL_OIL_COMPANY + slogan = "For a greener tomorrow!" + name_span = "corp_label_endron" + company_color = COLOR_CORP_ENDRON + +/datum/brand/pentex/endron/atlas + manufacturer = "atlas" + full_name = EVIL_NUCLEAR_COMPANY + slogan = "Atlas: Providers for Our Future." + render_logo = FALSE + +/datum/brand/pentex/harold_and_harold + manufacturer = "harold_and_harold" + full_name = EVIL_MINING_COMPANY + slogan = "Finding what makes the world work, underground." + name_span = "corp_label_harold_harold" + company_color = COLOR_CORP_HAROLD_HAROLD + +/datum/brand/pentex/good_house + manufacturer = "good_house" + full_name = EVIL_PAPER_COMPANY + slogan = "Sustainable stationary for a sustainable future." + name_span = "corp_label_good_house" + company_color = COLOR_CORP_GOOD_HOUSE + +/datum/brand/pentex/hallahan + manufacturer = "hallahan" + full_name = EVIL_FISHING_COMPANY + slogan = "Bounty of the sea straight to your plate." + name_span = "corp_label_hallahan" + company_color = COLOR_CORP_HALLAHAN + +/datum/brand/pentex/herculean + manufacturer = "herculean" + full_name = EVIL_HANDGUN_COMPANY + slogan = "No labour too great for a Herculean." + name_span = "corp_label_herculean" + company_color = COLOR_CORP_HERCULEAN + +/datum/brand/pentex/herricks + manufacturer = "herricks" + full_name = EVIL_GROCERY_COMPANY + slogan = "A full pantry without costing a full wallet." + name_span = "corp_label_herricks" + company_color = COLOR_CORP_HERRICKS + +/datum/brand/pentex/king + manufacturer = "king" + full_name = EVIL_LIQUOR_COMPANY + slogan = "Nobody is better at brewing than the King." + name_span = "corp_label_king" + company_color = COLOR_CORP_KING + +/datum/brand/pentex/magadon + manufacturer = "magadon" + full_name = EVIL_PHARMA_COMPANY + slogan = "Magadon: building a better you." + name_span = "corp_label_magadon" + company_color = COLOR_CORP_MAGADON + +/datum/brand/pentex/magadon/aesop + manufacturer = "aesop" + full_name = EVIL_COSMETICS_COMPANY + slogan = "Humane testing for Human needs." + render_logo = FALSE + +/datum/brand/pentex/magadon/autumn + manufacturer = "autumn" + full_name = EVIL_HOSPITAL_COMPANY + slogan = "Let our family care for your family." + render_logo = FALSE + +/datum/brand/pentex/nastrum + manufacturer = "nastrum" + full_name = EVIL_AVIATION_COMPANY + slogan = "Safety in efficiency." + name_span = "corp_label_nastrum" + company_color = COLOR_CORP_NASTRUM + +/datum/brand/pentex/omni + manufacturer = "omni" + full_name = EVIL_TELEVISION_COMPANY + slogan = "Omni: Entertainment at your fingertips." + name_span = "corp_label_omni_tv" + company_color = COLOR_CORP_OMNI_TV +#warn O'TOLLEY'S LOGO NEEDED +/datum/brand/pentex/otolleys + manufacturer = "otolleys" + full_name = EVIL_FAST_FOOD_COMPANY + slogan = "The family place." + name_span = "corp_label_otolleys" + company_color = COLOR_CORP_OTOLLEYS + +/datum/brand/pentex/black_dog + manufacturer = "black_dog" + full_name = EVIL_TTRPG_COMPANY + slogan = "Bring some Shadow to your table." + name_span = "corp_label_black_dog" + company_color = COLOR_CORP_BLACK_DOG + +/datum/brand/pentex/rainbow + manufacturer = "rainbow" + full_name = EVIL_PLASTIC_COMPANY + slogan = "Materials for the whole spectrum of products." + name_span = "corp_label_rainbow" + company_color = COLOR_CORP_RAINBOW_INC + +/datum/brand/pentex/tellus + manufacturer = "tellus" + full_name = EVIL_COMPUTER_COMPANY + slogan = "Tellus: Virtual worlds you could fall into." + name_span = "corp_label_tellus" + company_color = COLOR_CORP_TELLUS + +/datum/brand/pentex/tellus/sunburst + manufacturer = "sunburst" + full_name = EVIL_COMPUTER_COMPANY_2 + slogan = "Computer parts should be sustainable. At Sunburst, they are." + render_logo = FALSE + +/datum/brand/pentex/vesuvius + manufacturer = "vesuvius" + full_name = EVIL_PUBLISHING_COMPANY + slogan = "Nobody tells a story like Vesuvius." + name_span = "corp_label_vesuvius" + company_color = COLOR_CORP_VESUVIUS + +/datum/brand/pentex/young_and_smith + manufacturer = "young_and_smith" + full_name = EVIL_FOOD_COMPANY + slogan = "Make your grocery trips simpler. Ask for Young and Smith." + name_span = "corp_label_young_smith" + company_color = COLOR_CORP_YOUNG_SMITH + +// EVERTHING ELSE - Pentex subsidiares that are not and have never been in the top 21 +/datum/brand/pentex/endron/easton + manufacturer = "easton" + full_name = EVIL_ENGINE_COMPANY + slogan = "Let Easton Exploratory be your guide on the search for the world's energy." + render_logo = FALSE + +/datum/brand/pentex/endron/falcon_motors + manufacturer = "falcon_motors" + full_name = EVIL_CAR_COMPANY + slogan = "The smoothest ride is on the wings of a Falcon." + render_logo = FALSE + +/datum/brand/pentex/endron/egpc // Is this the most niche subsidiary? Probably. + manufacturer = "egpc" + full_name = EVIL_EGYPTIAN_OIL_COMPANY + render_logo = FALSE + +/datum/brand/pentex/harold_and_harold/kauket // Nevermind. It's probably this one. + manufacturer = "kauket" + full_name = EVIL_EGYPTIAN_MINING_COMPANY + render_logo = FALSE + +/datum/brand/pentex/king/aquaclear + manufacturer = "aquaclear" + full_name = EVIL_WATERWAY_COMPANY + slogan = "Keeping the world flowing." + render_logo = FALSE + +/datum/brand/pentex/king/dragon_valley + manufacturer = "dragon_valley" + full_name = EVIL_WINE_COMPANY + slogan = "Raid the Dragon's Horde for a night you'll never forget." + render_logo = FALSE + +/datum/brand/pentex/king/king // Confusing, but meaningful distinction. The actual breweries that make the booze. + manufacturer = "king2" + full_name = EVIL_BEER_COMPANY + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + +/datum/brand/pentex/ + manufacturer = "" + full_name = EVIL__COMPANY + slogan = "" + render_logo = FALSE + diff --git a/modular_darkpack/modules/company_logos/icons/corp_logos.dmi b/modular_darkpack/modules/company_logos/icons/corp_logos.dmi new file mode 100644 index 000000000000..dec99e6e737d Binary files /dev/null and b/modular_darkpack/modules/company_logos/icons/corp_logos.dmi differ diff --git a/modular_darkpack/modules/company_logos/icons/generic_product.dmi b/modular_darkpack/modules/company_logos/icons/generic_product.dmi new file mode 100644 index 000000000000..20977f3c607a Binary files /dev/null and b/modular_darkpack/modules/company_logos/icons/generic_product.dmi differ diff --git a/modular_darkpack/modules/ert/code/items/first_team.dm b/modular_darkpack/modules/ert/code/items/first_team.dm index f48bc483bc03..6db3421e5cce 100644 --- a/modular_darkpack/modules/ert/code/items/first_team.dm +++ b/modular_darkpack/modules/ert/code/items/first_team.dm @@ -19,12 +19,11 @@ inhand_icon_state = null gender = PLURAL ONFLOOR_ICON_HELPER('modular_darkpack/modules/ert/icons/onfloor.dmi') - + brand = "pentex" /obj/item/clothing/shoes/vampire/darkpack_ert/firstteam name = "\improper First team boots" desc = "Pitch-black boots with hard, industrial laces." - icon_state = "ftboots" armor_type = /datum/armor/shoes_jackboots //------------GLOVES------------ @@ -35,12 +34,11 @@ ONFLOOR_ICON_HELPER('modular_darkpack/modules/ert/icons/onfloor.dmi') icon_state = "ftgloves" undyeable = TRUE - + brand = "pentex" /obj/item/clothing/gloves/vampire/darkpack_ert/firstteam name = "\improper First Team gloves" desc = "Provides protection from the good, the bad and the ugly." - icon_state = "ftgloves" body_parts_covered = HANDS armor_type = /datum/armor/gloves_combat @@ -52,11 +50,11 @@ inhand_icon_state = null worn_icon = 'modular_darkpack/modules/ert/icons/worn.dmi' ONFLOOR_ICON_HELPER('modular_darkpack/modules/ert/icons/onfloor.dmi') + brand = "pentex" /obj/item/clothing/head/vampire/darkpack_ert/firstteam_helmet name = "\improper First Team helmet" desc = "A black helmet with two, green-glowing eye-pieces that seem to stare through your soul." - icon_state = "fthelmet" armor_type = /datum/armor/first_team flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEHAIR visor_flags_inv = HIDEFACE|HIDESNOUT @@ -66,7 +64,7 @@ //------------ARMOR------------ /obj/item/clothing/suit/vampire/darkpack_ert - icon_state = "ftuni" + icon_state = "ftarmor" icon = 'modular_darkpack/modules/ert/icons/clothing.dmi' worn_icon = 'modular_darkpack/modules/ert/icons/worn.dmi' ONFLOOR_ICON_HELPER('modular_darkpack/modules/ert/icons/onfloor.dmi') @@ -79,6 +77,7 @@ max_heat_protection_temperature = ARMOR_MAX_TEMP_PROTECT max_integrity = 250 resistance_flags = NONE + brand = "pentex" /obj/item/clothing/suit/vampire/darkpack_ert/Initialize() . = ..() @@ -88,7 +87,6 @@ /obj/item/clothing/suit/vampire/darkpack_ert/firstteam_armor name = "\improper First Team Armoured Vest" desc = "A strong looking, armoured-vest with a large '1' engraved onto the breast." - icon_state = "ftarmor" inhand_icon_state = null armor_type = /datum/armor/first_team body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS @@ -108,7 +106,7 @@ icon = 'modular_darkpack/modules/ert/icons/clothing.dmi' worn_icon = 'modular_darkpack/modules/ert/icons/worn.dmi' ONFLOOR_ICON_HELPER('modular_darkpack/modules/ert/icons/onfloor.dmi') - + brand = "pentex" /obj/item/clothing/under/vampire/darkpack_ert/Initialize() . = ..() @@ -117,13 +115,14 @@ /obj/item/clothing/under/vampire/darkpack_ert/firstteam_uniform name = "First Team uniform" desc = "A completely blacked out uniform with a large '1' symbol sewn onto the shoulder-pad." - icon_state = "ftuni" armor_type = /datum/armor/clothing_under/security_head_of_security + brand = "pentex" //------------Glasses------------ /obj/item/clothing/glasses/night/thermal vision_flags = SEE_MOBS +// brand = "mars" // TODO: implement the rest of the non-top 21 pentex subsids //------------Weapons------------/obj/item/ammo_casing/vampire/c12gvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv /obj/item/ammo_box/darkpack/c556/bale //DONT EVER PUT THIS IN A MAP @@ -179,6 +178,7 @@ ONFLOOR_ICON_HELPER('modular_darkpack/modules/ert/icons/onfloor.dmi') icon_state = "f12" base_icon_state = "f12" +// brand = "fullforce" // TODO: implement the rest of the non-top 21 pentex subsids /obj/projectile/bullet/darkpack/f12g name = "12g explosive slug" @@ -186,6 +186,7 @@ armour_penetration = 50 exposed_wound_bonus = 10 wound_bonus = 5 +// brand = "fullforce" // TODO: implement the rest of the non-top 21 pentex subsids /obj/projectile/bullet/darkpack/f12g/on_hit(atom/target, blocked = 0, pierce_hit) ..() @@ -199,6 +200,7 @@ icon_state = "12box_frag" ammo_type = /obj/item/ammo_casing/vampire/c12g/f12g max_ammo = 40 +// brand = "fullforce" // TODO: implement the rest of the non-top 21 pentex subsids /obj/item/ammo_box/magazine/darkpack/px66f name = "\improper PX66F magazine (5.56mm)" @@ -212,6 +214,7 @@ caliber = CALIBER_556NATO max_ammo = 30 multiple_sprites = AMMO_BOX_FULL_EMPTY +// brand = "fullforce" // TODO: implement the rest of the non-top 21 pentex subsids /obj/item/ammo_box/magazine/darkpack/px249f name = "\improper PX249F box magazine (5.56mm)" @@ -225,6 +228,7 @@ caliber = CALIBER_556NATO max_ammo = 200 multiple_sprites = AMMO_BOX_FULL_EMPTY +// brand = "fullforce" // TODO: implement the rest of the non-top 21 pentex subsids /obj/item/ammo_box/magazine/internal/px12r name = "shotgun internal magazine" @@ -243,14 +247,17 @@ caliber = CALIBER_45 max_ammo = 12 multiple_sprites = AMMO_BOX_FULL_EMPTY + brand = "herculean" /obj/item/ammo_box/magazine/darkpack/mk23/silver name = "automatic pistol magazine (.45 ACP Silver)" ammo_type = /obj/item/ammo_casing/vampire/c45acp/silver + brand = "herculean" /obj/item/ammo_box/magazine/darkpack/mk23/hp name = "automatic pistol magazine (.45 ACP HP)" ammo_type = /obj/item/ammo_casing/vampire/c45acp/HP + brand = "herculean" /obj/item/gun/ballistic/automatic/pistol/darkpack/mk23_socom name = "\improper Mark 23 SOCOM Pistol" @@ -273,6 +280,7 @@ can_suppress = FALSE can_unsuppress = FALSE fire_sound = 'modular_darkpack/modules/weapons/sounds/glock.ogg' //Doesnt matter when it's always using the supressed SFX + brand = "herculean" /obj/item/gun/ballistic/automatic/darkpack/px66f //DO NOT DISTRIBUTE IN MAPPING name = "\improper PX66F Rifle" @@ -297,6 +305,7 @@ can_suppress = FALSE fire_sound = 'modular_darkpack/modules/ert/sounds/silenced_rifle.ogg' masquerade_violating = TRUE +// brand = "fullforce" // TODO: implement the rest of the non-top 21 pentex subsids /obj/item/gun/ballistic/automatic/darkpack/px66f/Initialize() . = ..() @@ -325,7 +334,7 @@ rack_sound = 'modular_darkpack/modules/ert/sounds/cycling.ogg' inhand_x_dimension = 32 inhand_y_dimension = 32 - +// brand = "fullforce" // TODO: implement the rest of the non-top 21 pentex subsids /obj/item/gun/ballistic/automatic/l6_saw/darkpack name = "\improper PX249F Light Machine Gun" @@ -349,6 +358,7 @@ spread = 6 fire_sound = 'modular_darkpack/modules/ert/sounds/m249fire.ogg' rack_sound = 'modular_darkpack/modules/ert/sounds/m249rack.ogg' +// brand = "fullforce" // TODO: implement the rest of the non-top 21 pentex subsids /obj/item/gun/ballistic/automatic/l6_saw/darkpack/update_icon_state() . = ..() diff --git a/modular_darkpack/modules/jobs/code/_departments.dm b/modular_darkpack/modules/jobs/code/_departments.dm index 8e7ff562f174..bc42706a0805 100644 --- a/modular_darkpack/modules/jobs/code/_departments.dm +++ b/modular_darkpack/modules/jobs/code/_departments.dm @@ -128,4 +128,4 @@ department_experience_type = EXP_TYPE_SPIRAL display_order = 1 label_class = "pentex" - ui_color = COLOR_ENDRON_GREEN + ui_color = COLOR_CORP_ENDRON diff --git a/tgstation.dme b/tgstation.dme index bed052847136..6e092abff7ac 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -6946,7 +6946,9 @@ #include "modular_darkpack\master_files\code\datums\quirks\_quirk.dm" #include "modular_darkpack\master_files\code\datums\station_traits\_station_trait.dm" #include "modular_darkpack\master_files\code\game\area\areas.dm" +#include "modular_darkpack\master_files\code\game\atom\_atom.dm" #include "modular_darkpack\master_files\code\game\objects\items.dm" +#include "modular_darkpack\master_files\code\game\objects\objs.dm" #include "modular_darkpack\master_files\code\game\objects\items\trash.dm" #include "modular_darkpack\master_files\code\game\objects\items\weaponry.dm" #include "modular_darkpack\master_files\code\game\objects\items\devices\radio\radio.dm" @@ -7091,6 +7093,9 @@ #include "modular_darkpack\modules\clothes\code\neck.dm" #include "modular_darkpack\modules\clothes\code\suit.dm" #include "modular_darkpack\modules\clothes\code\under.dm" +#include "modular_darkpack\modules\company_logos\code\company_logos.dm" +#include "modular_darkpack\modules\company_logos\code\generic_products.dm" +#include "modular_darkpack\modules\company_logos\code\pentex.dm" #include "modular_darkpack\modules\curtains\code\curtains.dm" #include "modular_darkpack\modules\dancing\code\dancing.dm" #include "modular_darkpack\modules\decor\code\bench.dm" diff --git a/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss b/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss index 745a88345dd3..0cddca3c14ec 100644 --- a/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss +++ b/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss @@ -1299,6 +1299,142 @@ $border-width-px: $border-width * 1px; color: #b09448; } +.boxed_message .icon { + width: 1.5em; + height: 1.5em; + margin: 0; + padding: 0; + + &.corplogo { + width: 300px !important; + height: 110px !important; + } +} + +.corp_label_pentex { + color: hsl(317.78, 29.67%, 17.84%); + text-shadow: 0 0 8px #3b2033; + font-weight: bold; +} + +.corp_label_ardus { + color: hsl(201.43, 16.28%, 66.27%); + text-shadow: 0 0 8px #9badb7; + font-weight: bold; +} + +.corp_label_avalon { + color: hsl(245.96, 80.75%, 63.33%); + text-shadow: 0 0 8px #6556ed; + font-weight: bold; +} + +.corp_label_circinus { + color: hsl(29.28, 100%, 75.49%); + text-shadow: 0 0 8px #ffbf82; + font-weight: bold; +} + +.corp_label_consolidex { + color: hsl(290.51, 100%, 57.84%); + text-shadow: 0 0 8px #dd28ff; + font-weight: bold; +} + +.corp_label_endron { + color: hsl(157.32, 97.62%, 16.47%); + text-shadow: 0 0 8px #015334; + font-weight: bold; +} + +.corp_label_harold_harold { + color: hsl(8.97, 42.44%, 40.2%); + text-shadow: 0 0 8px #92483b; + font-weight: bold; +} + +.corp_label_good_house { + color: hsl(285, 20.93%, 66.27%); + text-shadow: 0 0 8px #b297bb; + font-weight: bold; +} + +.corp_label_hallahan { + color: hsl(257.45, 88.29%, 43.53%); + text-shadow: 0 0 8px #460dd1; + font-weight: bold; +} + +.corp_label_herculean { + color: hsl(0, 100%, 53.14%); + text-shadow: 0 0 8px #ff1010; + font-weight: bold; +} + +.corp_label_herricks { + color: hsl(285.51, 90.82%, 38.43%); + text-shadow: 0 0 8px #9009bb; + font-weight: bold; +} + +.corp_label_king { + color: hsl(44.62, 53.92%, 57.45%); + text-shadow: 0 0 8px #cdaf58; + font-weight: bold; +} + +.corp_label_megadon { + color: hsl(182.58, 100%, 63.53%); + text-shadow: 0 0 8px #45f7ff; + font-weight: bold; +} + +.corp_label_nastrum { + color: hsl(342.92, 100%, 74.51%); + text-shadow: 0 0 8px #ff7da2; + font-weight: bold; +} + +.corp_label_omni_tv { + color: hsl(11.33, 79.89%, 64.9%); + text-shadow: 0 0 8px #ed795e; + font-weight: bold; +} + +.corp_label_otolleys { + color: hsl(154.47, 72.31%, 74.51%); + text-shadow: 0 0 8px #8fedc5; + font-weight: bold; +} + +.corp_label_black_dog { + color: hsl(222.86, 100%, 94.51%); + text-shadow: 0 0 8px #e3ebff; + font-weight: bold; +} + +.corp_label_rainbow_inc { + color: hsl(313.97, 100%, 85.69%); + text-shadow: 0 0 8px #ffb6ee; + font-weight: bold; +} + +.corp_label_tellus { + color: hsl(102.7, 100%, 57.84%); + text-shadow: 0 0 8px #66ff28; + font-weight: bold; +} + +.corp_label_vesuvius { + color: hsl(61.82, 41.77%, 84.51%); + text-shadow: 0 0 8px #e7e8c7; + font-weight: bold; +} + +.corp_label_young_smith { + color: hsl(96.67, 20.93%, 66.27%); + text-shadow: 0 0 8px #a5bb97; + font-weight: bold; .subtle { color: #abc6ec; } diff --git a/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss b/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss index 90e1d23de412..58d09603ab55 100644 --- a/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss +++ b/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss @@ -1282,6 +1282,142 @@ $border-width-px: $border-width * 1px; font-weight: bold; } +.boxed_message .icon { + width: 1.5em; + height: 1.5em; + margin: 0; + padding: 0; + + &.corplogo { + width: 300px !important; + height: 110px !important; + } +} + +.corp_label_pentex { + color: hsl(317.78, 29.67%, 17.84%); + text-shadow: 0 0 8px #3b2033; + font-weight: bold; +} + +.corp_label_ardus { + color: hsl(201.43, 16.28%, 66.27%); + text-shadow: 0 0 8px #9badb7; + font-weight: bold; +} + +.corp_label_avalon { + color: hsl(245.96, 80.75%, 63.33%); + text-shadow: 0 0 8px #6556ed; + font-weight: bold; +} + +.corp_label_circinus { + color: hsl(29.28, 100%, 75.49%); + text-shadow: 0 0 8px #ffbf82; + font-weight: bold; +} + +.corp_label_consolidex { + color: hsl(290.51, 100%, 57.84%); + text-shadow: 0 0 8px #dd28ff; + font-weight: bold; +} + +.corp_label_endron { + color: hsl(157.32, 97.62%, 16.47%); + text-shadow: 0 0 8px #015334; + font-weight: bold; +} + +.corp_label_harold_harold { + color: hsl(8.97, 42.44%, 40.2%); + text-shadow: 0 0 8px #92483b; + font-weight: bold; +} + +.corp_label_good_house { + color: hsl(285, 20.93%, 66.27%); + text-shadow: 0 0 8px #b297bb; + font-weight: bold; +} + +.corp_label_hallahan { + color: hsl(257.45, 88.29%, 43.53%); + text-shadow: 0 0 8px #460dd1; + font-weight: bold; +} + +.corp_label_herculean { + color: hsl(0, 100%, 53.14%); + text-shadow: 0 0 8px #ff1010; + font-weight: bold; +} + +.corp_label_herricks { + color: hsl(285.51, 90.82%, 38.43%); + text-shadow: 0 0 8px #9009bb; + font-weight: bold; +} + +.corp_label_king { + color: hsl(44.62, 53.92%, 57.45%); + text-shadow: 0 0 8px #cdaf58; + font-weight: bold; +} + +.corp_label_megadon { + color: hsl(182.58, 100%, 63.53%); + text-shadow: 0 0 8px #45f7ff; + font-weight: bold; +} + +.corp_label_nastrum { + color: hsl(342.92, 100%, 74.51%); + text-shadow: 0 0 8px #ff7da2; + font-weight: bold; +} + +.corp_label_omni_tv { + color: hsl(11.33, 79.89%, 64.9%); + text-shadow: 0 0 8px #ed795e; + font-weight: bold; +} + +.corp_label_otolleys { + color: hsl(154.47, 72.31%, 74.51%); + text-shadow: 0 0 8px #8fedc5; + font-weight: bold; +} + +.corp_label_black_dog { + color: hsl(222.86, 100%, 94.51%); + text-shadow: 0 0 8px #e3ebff; + font-weight: bold; +} + +.corp_label_rainbow_inc { + color: hsl(313.97, 100%, 85.69%); + text-shadow: 0 0 8px #ffb6ee; + font-weight: bold; +} + +.corp_label_tellus { + color: hsl(102.7, 100%, 57.84%); + text-shadow: 0 0 8px #66ff28; + font-weight: bold; +} + +.corp_label_vesuvius { + color: hsl(61.82, 41.77%, 84.51%); + text-shadow: 0 0 8px #e7e8c7; + font-weight: bold; +} + +.corp_label_young_smith { + color: hsl(96.67, 20.93%, 66.27%); + text-shadow: 0 0 8px #a5bb97; + font-weight: bold; .subtle { color: #000099; }