Company Logos

code/__DEFINES/~darkpack/branding.dm

@@ -6,21 +6,22 @@
 
 #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"
 #define EVIL_NUCLEAR_COMPANY "Atlas International" // Subsidiary of Endron
 #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"
@@ -42,7 +43,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"
@@ -83,13 +84,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"

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"

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)
 	. = ..()

modular_darkpack/master_files/code/game/objects/objs.dm

@@ -0,0 +1,9 @@
+/obj
+	// 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
+
+
+/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])

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/obj/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("<br>This item is <span class='[our_brand.name_span ? our_brand.name_span : "info"]'>branded</span>. [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]<br>" : ""]Brought to you by <span class='[our_brand.name_span ? our_brand.name_span : "info"]'>[our_brand.full_name].</span>")
+
+	if(our_brand.slogan)
+		examine_list += span_notice("<I>\"[our_brand.slogan]\"</I>")
+
+/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
+

modular_darkpack/modules/company_logos/code/pentex.dm

@@ -0,0 +1,210 @@
+/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
+
+/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

modular_darkpack/modules/company_logos/readme.md

@@ -0,0 +1,10 @@
+https://github.com/DarkPack13/SecondCity/pull/491
+
+## \<COMPANY LOGOS>
+
+Module ID: COMPANY_LOGOS
+
+### Credits:
+
+dwinters99
+Drulikar