From 2b17a3874eacc41f7854fd5feb687b6bde586d78 Mon Sep 17 00:00:00 2001 From: faustbyte Date: Tue, 15 Sep 2026 16:05:47 -0300 Subject: [PATCH] Add brand logos to a few pentex-related items --- modular_darkpack/modules/clothes/code/head.dm | 3 +++ modular_darkpack/modules/clothes/code/suit.dm | 2 ++ modular_darkpack/modules/clothes/code/under.dm | 12 +++++++++++- modular_darkpack/modules/food/code/drinks.dm | 3 +++ .../modules/clothing/code/endron_gasmask.dm | 2 ++ modular_zapoc/modules/clothing/code/turtleskirt.dm | 1 + 6 files changed, 22 insertions(+), 1 deletion(-) diff --git a/modular_darkpack/modules/clothes/code/head.dm b/modular_darkpack/modules/clothes/code/head.dm index aef4cbb6c57c..4323017e53ea 100644 --- a/modular_darkpack/modules/clothes/code/head.dm +++ b/modular_darkpack/modules/clothes/code/head.dm @@ -343,18 +343,21 @@ desc = "A yellow hardhat. This one has an " + MAIN_EVIL_COMPANY + " logo on it!" icon_state = "pentex_hardhat_yellow" flags_inv = HIDEHAIR + brand = "endron" //APOC note: Endron is the main evil company, so the endron logo gets stuck on this /obj/item/clothing/head/vampire/pentex_whitehardhat name = "\improper " + MAIN_EVIL_COMPANY + " hardhat" desc = "A white hardhat. This one has an " + MAIN_EVIL_COMPANY + " logo on it!" icon_state = "pentex_hardhat_white" flags_inv = HIDEHAIR + brand = "endron" //APOC note: Endron is the main evil company, so the endron logo gets stuck on this /obj/item/clothing/head/vampire/pentex_beret name = "First Team beret" desc = "A black beret with a mysterious golden insigna bearing a spiral." icon_state = "pentex_beret" flags_inv = HIDEHAIR + brand = "pentex" /obj/item/clothing/head/vampire/blackbag name = "black bag" diff --git a/modular_darkpack/modules/clothes/code/suit.dm b/modular_darkpack/modules/clothes/code/suit.dm index ee3a7dea9fcb..86d1f7d10478 100644 --- a/modular_darkpack/modules/clothes/code/suit.dm +++ b/modular_darkpack/modules/clothes/code/suit.dm @@ -627,12 +627,14 @@ desc = "A crisp white labcoat. This one has the " + MAIN_EVIL_COMPANY + " International logo stiched onto the breast!" icon_state = "pentex_closedlabcoat" armor_type = /datum/armor/labcoat + brand = "endron" //APOC note: Endron is the main evil company, so the endron logo gets stuck on this /obj/item/clothing/suit/vampire/pentex_labcoat_alt name = "\improper " + MAIN_EVIL_COMPANY + " labcoat" desc = "A crisp white labcoat. This one has a green trim and the " + MAIN_EVIL_COMPANY + " International logo stiched onto the breast!" icon_state = "pentex_labcoat_alt" armor_type = /datum/armor/labcoat + brand = "endron" //APOC note: Endron is the main evil company, so the endron logo gets stuck on this /obj/item/clothing/suit/vampire/bomber_jacket_classic name = "classic bomber jacket" diff --git a/modular_darkpack/modules/clothes/code/under.dm b/modular_darkpack/modules/clothes/code/under.dm index 149cc36bbfb3..9e98f42a8c58 100644 --- a/modular_darkpack/modules/clothes/code/under.dm +++ b/modular_darkpack/modules/clothes/code/under.dm @@ -223,7 +223,7 @@ /obj/item/clothing/under/vampire/gothic name = "gothic getup" - desc = "Torn jeans and a black sweatshirt. Goth. Apperently." + desc = "Torn jeans and a black sweatshirt. Goth. Apparently." icon_state = "gothic" //PATRICK BATEMAN (High Society) @@ -477,51 +477,61 @@ name = "Ardus Enterprises custodian jumpsuit" desc = "An Ardus Enterprises custodian's uniform." icon_state = "pentex_janitor" + brand = "ardus" /obj/item/clothing/under/vampire/pentex_shortsleeve name = "\improper " + MAIN_EVIL_COMPANY + " polo-shirt" desc = "An " + MAIN_EVIL_COMPANY + " International employee uniform. This one is a nice polo!" icon_state = "pentex_shortsleeve" + brand = "endron" //APOC note: Endron is the main evil company, so the endron logo gets stuck on this /obj/item/clothing/under/vampire/pentex_longleeve name = "\improper " + MAIN_EVIL_COMPANY + " shirt" desc = "An " + MAIN_EVIL_COMPANY + " International employee uniform. This one has sleeves!" icon_state = "pentex_longsleeve" + brand = "endron" //APOC note: Endron is the main evil company, so the endron logo gets stuck on this /obj/item/clothing/under/vampire/pentex_turtleneck name = "\improper " + MAIN_EVIL_COMPANY + " turtleneck" desc = "An " + MAIN_EVIL_COMPANY + " International employee uniform. This one is a nice turtleneck!" icon_state = "pentex_turtleneck" + brand = "endron" //APOC note: Endron is the main evil company, so the endron logo gets stuck on this /obj/item/clothing/under/vampire/pentex_suit name = "\improper " + MAIN_EVIL_COMPANY + " suit" desc = "A nice suit with a green dress-shirt. This one has an " + MAIN_EVIL_COMPANY + " International tag on it!" icon_state = "pentex_suit" + brand = "endron" //APOC note: Endron is the main evil company, so the endron logo gets stuck on this /obj/item/clothing/under/vampire/pentex_suitskirt name = "\improper " + MAIN_EVIL_COMPANY + " suitskirt" desc = "A nice suitskirt with a green dress-shirt. This one has an " + MAIN_EVIL_COMPANY + " International tag on it!" icon_state = "pentex_suitskirt" + brand = "endron" //APOC note: Endron is the main evil company, so the endron logo gets stuck on this /obj/item/clothing/under/vampire/pentex_executive_suit name = "\improper " + MAIN_EVIL_COMPANY + " executive suit" desc = "A white designer suit with a green dress shirt. This one has an " + MAIN_EVIL_COMPANY + " International tag on it!" icon_state = "pentex_executivesuit" + brand = "endron" //APOC note: Endron is the main evil company, so the endron logo gets stuck on this /obj/item/clothing/under/vampire/pentex_executiveskirt name = "\improper " + MAIN_EVIL_COMPANY + " executive suitskirt" desc = "A white designer suitskirt with a green dress shirt. This one has an " + MAIN_EVIL_COMPANY + " International tag on it!" icon_state = "pentex_executiveskirt" + brand = "endron" //APOC note: Endron is the main evil company, so the endron logo gets stuck on this /obj/item/clothing/under/vampire/pentex_executive_suit name = "Endron executive suit" desc = "A white designer suit with a green dress shirt. This one has an Endron International tag on it!" icon_state = "pentex_executivesuit" + brand = "endron" /obj/item/clothing/under/vampire/pentex_executiveskirt name = "Endron executive suitskirt" desc = "A white designer suitskirt with a green dress shirt. This one has an Endron International tag on it!" icon_state = "pentex_executiveskirt" + brand = "endron" /obj/item/clothing/under/vampire/gown_black name = "black gown" diff --git a/modular_darkpack/modules/food/code/drinks.dm b/modular_darkpack/modules/food/code/drinks.dm index 64cefd75bf16..70c7fc1c68ce 100644 --- a/modular_darkpack/modules/food/code/drinks.dm +++ b/modular_darkpack/modules/food/code/drinks.dm @@ -29,6 +29,7 @@ desc = "Blue stripe beer, brought to you by King Breweries and Distilleries!" icon_state = "beer_blue" list_reagents = list(/datum/reagent/consumable/ethanol/beer/light = 25, /datum/reagent/toxin/amatoxin = 5) + brand = "king" // DARKPACK TODO - (Typhon's Beer needs an audit of its handling. This looks ass.) /obj/item/reagent_containers/cup/glass/bottle/beer/vampire/typhon @@ -115,6 +116,7 @@ icon = 'modular_darkpack/modules/food/icons/items.dmi' ONFLOOR_ICON_HELPER('modular_darkpack/modules/food/icons/food_onfloor.dmi') list_reagents = list(/datum/reagent/consumable/space_cola = 20, /datum/reagent/medicine/muscle_stimulant = 5, /datum/reagent/toxin/amatoxin = 5) + brand = "king" /obj/item/reagent_containers/cup/soda_cans/thaw_club name = "thaw club soda" @@ -123,6 +125,7 @@ icon = 'modular_darkpack/modules/food/icons/items.dmi' ONFLOOR_ICON_HELPER('modular_darkpack/modules/food/icons/food_onfloor.dmi') list_reagents = list(/datum/reagent/consumable/monkey_energy = 30) + brand = "king" /obj/item/reagent_containers/condiment/milk name = "milk" diff --git a/modular_zapoc/modules/clothing/code/endron_gasmask.dm b/modular_zapoc/modules/clothing/code/endron_gasmask.dm index b751c1d2b339..e65881cb7219 100644 --- a/modular_zapoc/modules/clothing/code/endron_gasmask.dm +++ b/modular_zapoc/modules/clothing/code/endron_gasmask.dm @@ -1,11 +1,13 @@ /obj/item/clothing/mask/gas/explorer/pentex name = "pentex gas mask" desc = "An intimidating gas mask with a Pentex logo on the filters." + brand = "pentex" // armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 25, RAD = 0, FIRE = 10, ACID = 20, WOUND = 0) /obj/item/clothing/mask/gas/explorer/pentex/endron name = "endron gas mask" desc = "An intimidating gas mask with an Endron logo on the filters." + brand = "endron" /obj/item/clothing/mask/gas/explorer/pentex/yumco name = "yumco! gas mask" diff --git a/modular_zapoc/modules/clothing/code/turtleskirt.dm b/modular_zapoc/modules/clothing/code/turtleskirt.dm index 7ca058995e2b..4e05accabaa1 100644 --- a/modular_zapoc/modules/clothing/code/turtleskirt.dm +++ b/modular_zapoc/modules/clothing/code/turtleskirt.dm @@ -25,3 +25,4 @@ name = EVIL_OIL_COMPANY + " turtleneck skirt" desc = "An " + EVIL_OIL_COMPANY + " employee uniform. This one is a nice turtleneck! Features a fashionable pencil skirt." icon_state = "pentex_turtleneck" + brand = "endron"