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"
@@ -82,7 +83,6 @@
 #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"

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