diff --git a/code/__DEFINES/clothing.dm b/code/__DEFINES/clothing.dm index d52b5af8ef8..fe868b476fc 100644 --- a/code/__DEFINES/clothing.dm +++ b/code/__DEFINES/clothing.dm @@ -72,4 +72,8 @@ #define FBACKPACK "Frontier Backpack" #define FSATCHEL "Frontier Satchel" #define FMESSENGER "Frontier Messenger Bag" +// +#define TPACKWAIST "Waistpack" +#define TPACKBELT "Beltpack" +#define TPACKCHEST "Chest pack" // BUBBER EDIT END diff --git a/code/_globalvars/lists/clothing.dm b/code/_globalvars/lists/clothing.dm index 22d0ffc661a..5ebee1fcaa4 100644 --- a/code/_globalvars/lists/clothing.dm +++ b/code/_globalvars/lists/clothing.dm @@ -8,9 +8,14 @@ GLOBAL_LIST_INIT(backpacklist, list( GSATCHEL, GMESSENGER, LSATCHEL, - FBACKPACK, // BUBBER EDIT BEGIN + // BUBBER EDIT BEGIN + FBACKPACK, FSATCHEL, - FMESSENGER, // BUBBER EDIT END + FMESSENGER, + TPACKWAIST, + TPACKBELT, + TPACKCHEST, + // BUBBER EDIT END )) diff --git a/code/modules/client/preferences/clothing.dm b/code/modules/client/preferences/clothing.dm index 9a4a15097d1..b6ba7efcc24 100644 --- a/code/modules/client/preferences/clothing.dm +++ b/code/modules/client/preferences/clothing.dm @@ -31,9 +31,14 @@ DSATCHEL, DDUFFELBAG, DMESSENGER, + //BUBBER EDIT BEGIN FBACKPACK, FSATCHEL, FMESSENGER, + TPACKWAIST, + TPACKBELT, + TPACKCHEST, + //BUBBER EDIT END ) /datum/preference/choiced/backpack/create_default_value() @@ -51,12 +56,19 @@ return /obj/item/storage/backpack/duffelbag if (GMESSENGER) return /obj/item/storage/backpack/messenger + //BUBBER EDIT BEGIN if (FBACKPACK) return /obj/item/storage/backpack/industrial/frontier_colonist if (FSATCHEL) return /obj/item/storage/backpack/industrial/frontier_colonist/satchel if (FMESSENGER) return /obj/item/storage/backpack/industrial/frontier_colonist/messenger + if (TPACKWAIST) + return /obj/item/storage/backpack/waist_pack + if (TPACKBELT) + return /obj/item/storage/backpack/storage_belt + if (TPACKCHEST) + return /obj/item/storage/backpack/chest_pack // In a perfect world, these would be your department's backpack. // However, this doesn't factor in assistants, or no high slot, and would diff --git a/code/modules/jobs/job_types/_job.dm b/code/modules/jobs/job_types/_job.dm index a2ef15aa14c..21c81e9d711 100644 --- a/code/modules/jobs/job_types/_job.dm +++ b/code/modules/jobs/job_types/_job.dm @@ -393,12 +393,20 @@ back = /obj/item/storage/backpack/satchel/leather //Leather Satchel if(GMESSENGER) back = /obj/item/storage/backpack/messenger //Grey messenger bag + //BUBBER EDIT BEGIN if(FBACKPACK) back = /obj/item/storage/backpack/industrial/frontier_colonist if(FSATCHEL) back = /obj/item/storage/backpack/industrial/frontier_colonist/satchel if(FMESSENGER) back = /obj/item/storage/backpack/industrial/frontier_colonist/messenger + if(TPACKWAIST) + back = /obj/item/storage/backpack/waist_pack + if(TPACKBELT) + back = /obj/item/storage/backpack/storage_belt + if(TPACKCHEST) + back = /obj/item/storage/backpack/chest_pack + //BUBBER EDIT END if(DSATCHEL) back = satchel //Department satchel if(DMESSENGER) diff --git a/html/changelogs/AutoChangeLog-bubber-pr-5346.yml b/html/changelogs/AutoChangeLog-bubber-pr-5346.yml new file mode 100644 index 00000000000..54d0284b45b --- /dev/null +++ b/html/changelogs/AutoChangeLog-bubber-pr-5346.yml @@ -0,0 +1,4 @@ +author: "BurgerBB" +delete-after: True +changes: + - bugfix: "Prevents hypno lipsticks from randomly spawning in common containers." \ No newline at end of file diff --git a/html/changelogs/bubber_archive/2026-03.yml b/html/changelogs/bubber_archive/2026-03.yml index 5447aebad72..539966b6769 100644 --- a/html/changelogs/bubber_archive/2026-03.yml +++ b/html/changelogs/bubber_archive/2026-03.yml @@ -88,3 +88,9 @@ - bugfix: Icewalkers can now use custom characters again. - bugfix: Certain real-world figures have once again been spotted in select bitrunning domains. +2026-03-16: + MrGloopy: + - rscadd: Front pack, waist pack and belt pack for selection in character preferences, + found under the regular bag selection. Despite the names, still equipped on + your back. + - image: Supporting sprites for the new roundstart bags diff --git a/modular_skyrat/master_files/icons/mob/clothing/species/teshari/back.dmi b/modular_skyrat/master_files/icons/mob/clothing/species/teshari/back.dmi index 3c049a590f7..82399db565a 100644 Binary files a/modular_skyrat/master_files/icons/mob/clothing/species/teshari/back.dmi and b/modular_skyrat/master_files/icons/mob/clothing/species/teshari/back.dmi differ diff --git a/modular_zubbers/code/game/Items/lipstick.dm b/modular_zubbers/code/game/Items/lipstick.dm index 268a6adef86..d227dc0b781 100644 --- a/modular_zubbers/code/game/Items/lipstick.dm +++ b/modular_zubbers/code/game/Items/lipstick.dm @@ -5,4 +5,4 @@ base_icon_state = "slipstick" lipstick_color = COLOR_SYNDIE_RED lipstick_trait = TRAIT_HYPNO_KISS - + random_spawn = FALSE diff --git a/modular_zubbers/code/modules/tiny_packs/tinypacks.dm b/modular_zubbers/code/modules/tiny_packs/tinypacks.dm new file mode 100644 index 00000000000..1a02c247de7 --- /dev/null +++ b/modular_zubbers/code/modules/tiny_packs/tinypacks.dm @@ -0,0 +1,32 @@ +/obj/item/storage/backpack/storage_belt + name = "storage belt" + desc = "A small belt coated from front to back in pouches." + icon_state = "tinypakb" + inhand_icon_state = "messenger" + icon = 'modular_zubbers/icons/mob/clothing/clothing_icon/tinypack.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/back/backpack.dmi' + worn_icon_teshari = 'modular_skyrat/master_files/icons/mob/clothing/species/teshari/back.dmi' + lefthand_file = 'icons/mob/inhands/equipment/backpack_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/backpack_righthand.dmi' + +/obj/item/storage/backpack/waist_pack + name = "waist pack" + desc = "A small, waist-mounted pack for storing stuff. Also things. Perhaps even knick-knacks." + icon_state = "tinypaka" + inhand_icon_state = "messenger" + icon = 'modular_zubbers/icons/mob/clothing/clothing_icon/tinypack.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/back/backpack.dmi' + worn_icon_teshari = 'modular_skyrat/master_files/icons/mob/clothing/species/teshari/back.dmi' + lefthand_file = 'icons/mob/inhands/equipment/backpack_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/backpack_righthand.dmi' + +/obj/item/storage/backpack/chest_pack + name = "chest pack" + desc = "Like a fannypack, but for your chest!" + icon_state = "tinypakc" + inhand_icon_state = "messenger" + icon = 'modular_zubbers/icons/mob/clothing/clothing_icon/tinypack.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/back/backpack.dmi' + worn_icon_teshari = 'modular_skyrat/master_files/icons/mob/clothing/species/teshari/back.dmi' + lefthand_file = 'icons/mob/inhands/equipment/backpack_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/backpack_righthand.dmi' diff --git a/modular_zubbers/icons/mob/clothing/back/backpack.dmi b/modular_zubbers/icons/mob/clothing/back/backpack.dmi index 4545d3cf9c3..bbfbdd2608f 100644 Binary files a/modular_zubbers/icons/mob/clothing/back/backpack.dmi and b/modular_zubbers/icons/mob/clothing/back/backpack.dmi differ diff --git a/modular_zubbers/icons/mob/clothing/clothing_icon/tinypack.dmi b/modular_zubbers/icons/mob/clothing/clothing_icon/tinypack.dmi new file mode 100644 index 00000000000..b347b9cd035 Binary files /dev/null and b/modular_zubbers/icons/mob/clothing/clothing_icon/tinypack.dmi differ diff --git a/tgstation.dme b/tgstation.dme index 32b105ddcb1..7ce24875fcd 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -9968,6 +9968,8 @@ #include "modular_zubbers\code\modules\tarkon\code\clothing\backpack.dm" #include "modular_zubbers\code\modules\tarkon\code\misc-fluff\research.dm" #include "modular_zubbers\code\modules\taur_mechanics\serpentine_taur.dm" +#include "modular_zubbers\code\modules\tgui_input\color.dm" +#include "modular_zubbers\code\modules\tiny_packs\tinypacks.dm" #include "modular_zubbers\code\modules\title_screen\code\title_screen_subsystem.dm" #include "modular_zubbers\code\modules\uplink\one_shot_emag.dm" #include "modular_zubbers\code\modules\uplink\uplink_devices.dm"