Company Logos

code/__DEFINES/~darkpack/branding.dm

@@ -5,21 +5,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"
@@ -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"

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/__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

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/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

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])

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("<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/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"