Merge remote-tracking branch 'upstream' into trurl

_maps/cyberiad.json

@@ -3,6 +3,8 @@
 	"map_name": "Cyberiad",
 	"map_path": "map_files/Cyberiad",
 	"map_file": "Cyberiad.dmm",
+	"fluff_name": "ИСН Кибериада",
+	"welcome_sound_override": "modular_bandastation/aesthetics_sounds/sound/welcome_sounds/welcome_cyberiad.ogg",
 	"shuttles": {
 		"cargo": "cargo_box",
 		"ferry": "ferry_fancy",
@@ -22,6 +24,9 @@
 		"Cook": {
 			"additional_cqc_areas": ["/area/station/service/bar", "/area/station/commons/lounge", "/area/station/service/kitchen"]
 		},
+		"Captain": {
+			"no_charter": 1
+		},
 		"Nanotrasen Representative": {
             "spawn_positions": 1
         },

_maps/map_files/Cyberiad/Cyberiad.dmm

@@ -3980,10 +3980,6 @@
 /obj/machinery/door/firedoor,
 /turf/open/floor/plating,
 /area/station/maintenance/ghetto/port/aft)
-"aZS" = (
-/obj/machinery/biogenerator,
-/turf/open/floor/iron/dark,
-/area/station/service/hydroponics)
 "baa" = (
 /obj/machinery/electrolyzer,
 /obj/effect/decal/cleanable/dirt,
@@ -6641,7 +6637,7 @@
 	},
 /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden,
 /turf/open/floor/iron,
-/area/station/maintenance/aft)
+/area/station/science/xenobiology)
 "bKj" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -17019,19 +17015,6 @@
 /obj/machinery/status_display/evac/directional/east,
 /turf/open/floor/iron,
 /area/station/hallway/primary/central/aft)
-"ems" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/machinery/door/airlock/maintenance,
-/obj/effect/mapping_helpers/airlock/autoname,
-/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
-/obj/effect/mapping_helpers/airlock/unres{
-	dir = 1
-	},
-/obj/machinery/door/firedoor,
-/turf/open/floor/plating,
-/area/station/maintenance/department/security/ghetto/north)
 "emu" = (
 /obj/structure/table,
 /obj/item/storage/toolbox/mechanical{
@@ -18710,12 +18693,12 @@
 "eLd" = (
 /obj/machinery/door/airlock/maintenance,
 /obj/effect/mapping_helpers/airlock/autoname,
-/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
 /obj/effect/mapping_helpers/airlock/unres{
 	dir = 1
 	},
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan,
+/obj/effect/mapping_helpers/airlock/access/any/science/maintenance,
 /turf/open/floor/plating,
 /area/station/maintenance/starboard/aft)
 "eLE" = (
@@ -21548,10 +21531,6 @@
 /obj/machinery/light/small/directional/south,
 /turf/open/floor/plating,
 /area/station/maintenance/port/aft)
-"fxk" = (
-/obj/machinery/firealarm/directional/north,
-/turf/open/floor/plating,
-/area/station/maintenance/ghetto/central)
 "fxo" = (
 /obj/machinery/light/small/directional/west,
 /obj/effect/decal/cleanable/dirt,
@@ -24476,9 +24455,9 @@
 "gjd" = (
 /obj/machinery/door/airlock/maintenance,
 /obj/effect/mapping_helpers/airlock/autoname,
-/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
 /obj/effect/mapping_helpers/airlock/unres,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan,
+/obj/effect/mapping_helpers/airlock/access/any/science/maintenance,
 /turf/open/floor/plating,
 /area/station/maintenance/starboard/aft)
 "gjm" = (
@@ -29081,7 +29060,7 @@
 	dir = 4
 	},
 /turf/open/floor/iron,
-/area/station/maintenance/starboard/aft)
+/area/station/science/xenobiology)
 "hut" = (
 /obj/machinery/light_switch/directional/east,
 /obj/effect/turf_decal/tile/yellow/anticorner/contrasted{
@@ -38385,13 +38364,13 @@
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/maintenance,
 /obj/effect/mapping_helpers/airlock/autoname,
-/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
 /obj/effect/mapping_helpers/airlock/unres{
 	dir = 4
 	},
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan,
 /obj/machinery/duct,
+/obj/effect/mapping_helpers/airlock/access/any/science/maintenance,
 /turf/open/floor/plating,
 /area/station/science/research)
 "jQX" = (
@@ -46256,10 +46235,10 @@
 /obj/machinery/door/airlock/maintenance,
 /obj/effect/mapping_helpers/airlock/autoname,
 /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
+/obj/machinery/door/firedoor,
 /obj/effect/mapping_helpers/airlock/unres{
 	dir = 1
 	},
-/obj/machinery/door/firedoor,
 /turf/open/floor/iron/dark,
 /area/station/maintenance/department/security/ghetto/north)
 "lMr" = (
@@ -47595,6 +47574,10 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/structure/window/reinforced/spawner/directional/north,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/table,
+/obj/item/hatchet,
+/obj/item/shovel/spade,
+/obj/item/wrench,
 /turf/open/floor/iron,
 /area/station/service/hydroponics)
 "mdi" = (
@@ -70113,12 +70096,9 @@
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
 	dir = 8
 	},
-/obj/structure/table,
-/obj/item/wrench,
 /obj/machinery/light/small/directional/east,
-/obj/item/shovel/spade,
-/obj/item/hatchet,
 /obj/machinery/firealarm/directional/east,
+/obj/machinery/biogenerator,
 /turf/open/floor/iron,
 /area/station/service/hydroponics)
 "rWN" = (
@@ -82687,12 +82667,12 @@
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/maintenance,
 /obj/effect/mapping_helpers/airlock/autoname,
-/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
 /obj/effect/mapping_helpers/airlock/unres{
 	dir = 8
 	},
 /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan,
 /obj/structure/cable,
+/obj/effect/mapping_helpers/airlock/access/any/science/maintenance,
 /turf/open/floor/plating,
 /area/station/science/research)
 "vld" = (
@@ -121792,7 +121772,7 @@ ceC
 mOI
 dlM
 cAn
-fxk
+dGY
 hIr
 aNI
 ePB
@@ -127127,7 +127107,7 @@ ydF
 tKO
 tKO
 tKO
-ems
+tKO
 sYS
 sYS
 sYS
@@ -200669,7 +200649,7 @@ eJS
 mcF
 mcF
 tLO
-qAE
+byC
 cbP
 uap
 kkl
@@ -201440,7 +201420,7 @@ ulp
 chW
 chW
 eXd
-aZS
+qAE
 cbP
 uap
 kkl

code/__HELPERS/names.dm

@@ -90,7 +90,7 @@ GLOBAL_VAR(command_name)
 /proc/station_name()
 	if(!GLOB.station_name)
 		var/newname
-		var/config_station_name = CONFIG_GET(string/stationname)
+		var/config_station_name = SSmapping.current_map?.fluff_name || CONFIG_GET(string/stationname) // BANDASTATION ADDITION - Station Fluff
 		if(config_station_name)
 			newname = config_station_name
 		else

code/controllers/subsystem/events.dm

@@ -179,7 +179,8 @@ GLOBAL_LIST(holidays)
 	if(GLOB.holidays.len)
 		shuffle_inplace(GLOB.holidays)
 		// regenerate station name because holiday prefixes.
-		set_station_name(new_station_name())
+		if(isnull(SSmapping.current_map?.fluff_name)) // BANDASTATION ADDITION - Station Fluff
+			set_station_name(new_station_name())
 		world.update_status()
 
 	return TRUE

code/controllers/subsystem/ticker.dm

@@ -284,7 +284,7 @@ SUBSYSTEM_DEF(ticker)
 	INVOKE_ASYNC(SSdbcore, TYPE_PROC_REF(/datum/controller/subsystem/dbcore,SetRoundStart))
 
 	to_chat(world, span_notice(span_bold("Welcome to [station_name()], enjoy your stay!")))
-	SEND_SOUND(world, sound(SSstation.announcer.get_rand_welcome_sound()))
+	SEND_SOUND(world, sound(SSmapping.current_map?.welcome_sound_override || SSstation.announcer.get_rand_welcome_sound()))
 
 	current_state = GAME_STATE_PLAYING
 	Master.SetRunLevel(RUNLEVEL_GAME)

code/datums/map_config.dm

@@ -23,7 +23,7 @@
 	var/space_empty_levels = DEFAULT_SPACE_EMPTY_LEVELS
 	/// Boolean that tells us if this is a planetary station. (like IceBoxStation)
 	var/planetary = FALSE
-
+	
 	///The type of mining Z-level that should be loaded.
 	var/minetype = "lavaland"
 	///If no minetype is set, this will be the blacklist file used
@@ -49,6 +49,14 @@
 	/// Boolean that tells SSmapping to load all away missions in the codebase.
 	var/load_all_away_missions = FALSE
 
+	// BANDASTATION ADDITION START - Station Fluff
+	/// This name will override all other station names, like holiday or randomly generated.
+	/// Station name change still will work.
+	var/fluff_name = null
+	/// Welcome sound that will play on round start instead of the announcer's one.
+	var/sound/welcome_sound_override = null
+	// BANDASTATION ADDITION END - Station Fluff
+
 /**
  * Proc that simply loads the default map config, which should always be functional.
  */
@@ -191,6 +199,16 @@
 	if ("load_all_away_missions" in json)
 		load_all_away_missions = json["load_all_away_missions"]
 
+	// BANDASTATION ADDITION START - Station Fluff
+	if ("fluff_name" in json)
+		fluff_name = json["fluff_name"]
+	if ("welcome_sound_override" in json)
+		var/file_path = json["welcome_sound_override"]
+		if(!fexists(file_path))
+			log_world("Welcome sound ([file_path]) does not exist!")
+		else
+			welcome_sound_override = file(file_path)
+	// BANDASTATION ADDITION END - Station Fluff
 	allow_custom_shuttles = json["allow_custom_shuttles"] != FALSE
 
 	if ("job_changes" in json)

code/modules/jobs/job_types/captain.dm

@@ -95,6 +95,11 @@
 
 /datum/outfit/job/captain/pre_equip(mob/living/carbon/human/H, visuals_only)
 	. = ..()
+	// BANDASTATION ADDITION START - Station Fluff
+	if(CHECK_MAP_JOB_CHANGE(JOB_CAPTAIN, "no_charter"))
+		backpack_contents -= /obj/item/station_charter
+		return
+	// BANDASTATION ADDITION END - Station Fluff
 	special_charter = CHECK_MAP_JOB_CHANGE(JOB_CAPTAIN, "special_charter")
 	if(!special_charter)
 		return

code/modules/mob/living/carbon/human/human_update_icons.dm

@@ -393,7 +393,7 @@ There are several things that need to be remembered:
 		var/icon_file = 'icons/mob/clothing/head/default.dmi'
 		// BANDASTATION EDIT START - SPECIES CLOTHING ICONS
 		var/list/icon_files_species = list(
-			"vulpkanin" = 'modular_bandastation/species/icons/mob/species/clothing/head.dmi',
+			"vulpkanin" = 'modular_bandastation/species/icons/mob/species/vulpkanin/clothing/head.dmi',
 		)
 
 		var/mutant_override = FALSE
@@ -462,7 +462,7 @@ There are several things that need to be remembered:
 		var/icon_file = DEFAULT_SUIT_FILE
 		// BANDASTATION EDIT START - SPECIES CLOTHING ICONS
 		var/list/icon_files_species = list(
-			"vulpkanin" = 'modular_bandastation/species/icons/mob/species/clothing/suit.dmi',
+			"vulpkanin" = 'modular_bandastation/species/icons/mob/species/vulpkanin/clothing/suit.dmi',
 		)
 
 		var/mutant_override = FALSE
@@ -532,7 +532,7 @@ There are several things that need to be remembered:
 
 		var/icon_file = 'icons/mob/clothing/mask.dmi'
 		var/list/icon_files_species = list(
-			"vulpkanin" = 'modular_bandastation/species/icons/mob/species/clothing/mask.dmi',
+			"vulpkanin" = 'modular_bandastation/species/icons/mob/species/vulpkanin/clothing/mask.dmi',
 		)
 
 		var/mutant_override = FALSE

modular_bandastation/customization/_customization.dm

@@ -0,0 +1,4 @@
+/datum/modpack/customization
+	name = "Cutomization"
+	desc = "Кастомизация персонажей."
+	author = "dj-34, Dekupich"

modular_bandastation/customization/_customization.dme

@@ -0,0 +1,3 @@
+#include "_customization.dm"
+
+#include "code/sprite_accessories/hair.dm"