diff --git a/code/_globalvars/lists/ambience.dm b/code/_globalvars/lists/ambience.dm index 6cc984adf1c22..ed3409da94090 100644 --- a/code/_globalvars/lists/ambience.dm +++ b/code/_globalvars/lists/ambience.dm @@ -89,6 +89,7 @@ GLOBAL_LIST_INIT(icemoon_ambience,list( 'sound/ambience/icemoon/ambiicesting3.ogg', 'sound/ambience/icemoon/ambiicesting4.ogg', 'sound/ambience/icemoon/ambiicesting5.ogg', + 'modular_zubbers/sound/ambiance/bangle-freezer.ogg', // Bubber Edit - Credit: Bangle )) GLOBAL_LIST_INIT(medical_ambience,list( diff --git a/code/modules/antagonists/heretic/knowledge/starting_lore.dm b/code/modules/antagonists/heretic/knowledge/starting_lore.dm index 2b5186bb55019..06d7af0742635 100644 --- a/code/modules/antagonists/heretic/knowledge/starting_lore.dm +++ b/code/modules/antagonists/heretic/knowledge/starting_lore.dm @@ -187,7 +187,7 @@ GLOBAL_LIST_INIT(heretic_start_knowledge, initialize_starting_knowledge()) return FALSE if(!new_heart.useable) return FALSE - if(new_heart.organ_flags & (ORGAN_ROBOTIC|ORGAN_FAILING)) + if(new_heart.organ_flags & (ORGAN_FAILING)) //BUBBERSTATION EDIT return FALSE return TRUE diff --git a/code/modules/mob/dead/new_player/login.dm b/code/modules/mob/dead/new_player/login.dm index b84beddea39b2..440292b7a4f56 100644 --- a/code/modules/mob/dead/new_player/login.dm +++ b/code/modules/mob/dead/new_player/login.dm @@ -34,7 +34,7 @@ //SKYRAT EDIT ADDITION var/soft_player_cap = CONFIG_GET(number/player_soft_cap) - if(TGS_CLIENT_COUNT >= soft_player_cap) + if(soft_player_cap && TGS_CLIENT_COUNT >= soft_player_cap) INVOKE_ASYNC(src, PROC_REF(connect_to_second_server)) //SKYRAT EDIT END diff --git a/html/changelogs/archive/2025-01.yml b/html/changelogs/archive/2025-01.yml index 5bdbfcc7d5a81..15fa3a2f3dbf9 100644 --- a/html/changelogs/archive/2025-01.yml +++ b/html/changelogs/archive/2025-01.yml @@ -200,3 +200,15 @@ - bugfix: Subtler will now filter out clientless mobs prototypemeat: - balance: Buffed Razor Claws and their upgraded variants, happy killing +2025-01-14: + Arturlang: + - rscdel: no more wizard armor in wizdrobe, sorry, + KazooBard: + - qol: Heretic Synths also start with a living heart + MosleyTheMalO: + - bugfix: makes the softcap config disableable again + StrangeWeirdKitten, Bangle: + - rscadd: Adds another ambiance track to Icebox called Freezer, by Bangle. + Tonadas: + - rscadd: Added new Galactic Federation Jacket + - rscadd: Added Galactic Federation Jacket to character creator. diff --git a/modular_skyrat/master_files/icons/donator/mob/clothing/uniform_digi.dmi b/modular_skyrat/master_files/icons/donator/mob/clothing/uniform_digi.dmi index 4a38b4b891a14..3d6bf6dbf7632 100644 Binary files a/modular_skyrat/master_files/icons/donator/mob/clothing/uniform_digi.dmi and b/modular_skyrat/master_files/icons/donator/mob/clothing/uniform_digi.dmi differ diff --git a/modular_skyrat/modules/customization/modules/clothing/~donator/donator_clothing.dm b/modular_skyrat/modules/customization/modules/clothing/~donator/donator_clothing.dm index 9514972f95189..c80e3db066f7c 100644 --- a/modular_skyrat/modules/customization/modules/clothing/~donator/donator_clothing.dm +++ b/modular_skyrat/modules/customization/modules/clothing/~donator/donator_clothing.dm @@ -1296,7 +1296,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/contraband/korpstech, 32) icon = 'modular_skyrat/master_files/icons/donator/obj/clothing/uniform.dmi' icon_state = "hosaltred" worn_icon = 'modular_skyrat/master_files/icons/donator/mob/clothing/uniform.dmi' - worn_icon_digi = null + worn_icon_digi = 'modular_skyrat/master_files/icons/donator/mob/clothing/uniform_digi.dmi' /obj/item/clothing/glasses/hud/security/sunglasses/gars/giga/roselia name = "red-tinted giga HUD gar glasses" diff --git a/modular_zubbers/code/modules/clothing/suits/jacket.dm b/modular_zubbers/code/modules/clothing/suits/jacket.dm index 8960110b214f0..1497b3bd0d477 100644 --- a/modular_zubbers/code/modules/clothing/suits/jacket.dm +++ b/modular_zubbers/code/modules/clothing/suits/jacket.dm @@ -67,6 +67,7 @@ greyscale_config = /datum/greyscale_config/henchmen greyscale_config_worn = /datum/greyscale_config/henchmen/worn flags_1 = IS_PLAYER_COLORABLE_1 + /obj/item/clothing/suit/jacket/henchmen_coat/Initialize(mapload) . = ..() AddComponent(/datum/component/toggle_icon) @@ -129,13 +130,21 @@ /obj/item/clothing/suit/jacket/tailcoat/syndicate/fake armor_type = /datum/armor/none -/obj/item/clothing/suit/wizrobe/magician //Not really a robe but it's MAGIC +/obj/item/clothing/suit/jacket/tailcoat/magician name = "magician's tailcoat" - desc = "A magnificent, gold-lined tailcoat that seems to radiate power." - worn_icon = 'modular_zubbers/icons/mob/clothing/suits/jacket.dmi' - worn_icon_digi = 'modular_zubbers/icons/mob/clothing/suits/jacket_digi.dmi' - icon = 'modular_zubbers/icons/obj/clothing/suits/jacket.dmi' + desc = "A magnificent, gold-lined tailcoat." icon_state = "tailcoat_wiz" + greyscale_config = null + greyscale_config_worn = null + greyscale_colors = null + +/obj/item/clothing/suit/wizrobe/magician //Not really a robe but it's MAGIC + name = /obj/item/clothing/suit/jacket/tailcoat/magician::name + desc = "A magnificent, gold-lined tailcoat that seems to radiate power." + worn_icon = /obj/item/clothing/suit/jacket/tailcoat/magician::worn_icon + worn_icon_digi = /obj/item/clothing/suit/jacket/tailcoat/magician::worn_icon_digi + icon = /obj/item/clothing/suit/jacket/tailcoat/magician::icon + icon_state = /obj/item/clothing/suit/jacket/tailcoat/magician::icon_state inhand_icon_state = null flags_inv = null @@ -621,3 +630,14 @@ /obj/item/clothing/suit/toggle/jacket/sec/medical name = "medical praetorian jacket" desc = "This stylish jacket is perfect for those impromptu fashion shows on the scene of an emergency. Now, you can be the brightest beacon of style while administering medical treatment! Because, after all, why save lives if you can't look fabulous while doing it?" + +//Lore Jackets + +//Galactic Federation SPRITES BY Tonadas of Bubberstation +/obj/item/clothing/suit/jacket/galfed + name = "Galactic Federation jacket" + desc = "A jacket worn by members of the Galactic Federation. It's a bit worn, but it's still in good condition." + icon = 'modular_zubbers/icons/obj/clothing/jacket.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/suits/jacket.dmi' + icon_state = "galfed" + body_parts_covered = CHEST|ARMS|GROIN diff --git a/modular_zubbers/code/modules/loadout/categories/suit.dm b/modular_zubbers/code/modules/loadout/categories/suit.dm index caa8319dad18d..8bb2fb201db63 100644 --- a/modular_zubbers/code/modules/loadout/categories/suit.dm +++ b/modular_zubbers/code/modules/loadout/categories/suit.dm @@ -58,3 +58,9 @@ /datum/loadout_item/suit/flight //Donor item for ironknight060 name = "MA-1 flight jacket" item_path = /obj/item/clothing/suit/jacket/flight + +// Lore Jackets + +/datum/loadout_item/suit/galfed_jacket + name = "Galactic Federation Jacket" + item_path = /obj/item/clothing/suit/jacket/galfed diff --git a/modular_zubbers/code/modules/vending/wardrobe.dm b/modular_zubbers/code/modules/vending/wardrobe.dm index 0c69a896e8cec..abc69d3e0b0a3 100644 --- a/modular_zubbers/code/modules/vending/wardrobe.dm +++ b/modular_zubbers/code/modules/vending/wardrobe.dm @@ -37,7 +37,7 @@ /obj/item/clothing/suit/jacket/tailcoat = 6, /obj/item/clothing/neck/tie/bunnytie/magician = 6, /obj/item/clothing/under/costume/playbunny/magician = 6, - /obj/item/clothing/suit/wizrobe/magician = 6, + /obj/item/clothing/suit/jacket/tailcoat/magician = 6, /obj/item/clothing/head/playbunnyears/british = 6, /obj/item/clothing/neck/tie/bunnytie/blue = 6, /obj/item/clothing/under/costume/playbunny/british = 6, diff --git a/modular_zubbers/icons/mob/clothing/suits/jacket.dmi b/modular_zubbers/icons/mob/clothing/suits/jacket.dmi index 8e836b21268c4..cd86b5f9a4228 100644 Binary files a/modular_zubbers/icons/mob/clothing/suits/jacket.dmi and b/modular_zubbers/icons/mob/clothing/suits/jacket.dmi differ diff --git a/modular_zubbers/icons/obj/clothing/jacket.dmi b/modular_zubbers/icons/obj/clothing/jacket.dmi index 329bb8b0b55ad..f9d233ca39bfa 100644 Binary files a/modular_zubbers/icons/obj/clothing/jacket.dmi and b/modular_zubbers/icons/obj/clothing/jacket.dmi differ diff --git a/modular_zubbers/icons/obj/clothing/suits/jacket.dmi b/modular_zubbers/icons/obj/clothing/suits/jacket.dmi index e4c8ff772e592..dbddcc4b9db12 100644 Binary files a/modular_zubbers/icons/obj/clothing/suits/jacket.dmi and b/modular_zubbers/icons/obj/clothing/suits/jacket.dmi differ diff --git a/modular_zubbers/sound/ambiance/bangle-freezer.ogg b/modular_zubbers/sound/ambiance/bangle-freezer.ogg new file mode 100644 index 0000000000000..359ab342e9a52 Binary files /dev/null and b/modular_zubbers/sound/ambiance/bangle-freezer.ogg differ