Merge branch 'master' into pr-95369

Author: Bruh-24

_maps/map_files/Deltastation/DeltaStation2.dmm

@@ -26085,20 +26085,16 @@
 /area/station/maintenance/disposal/incinerator)
 "gqZ" = (
 /obj/machinery/door/firedoor,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
-	cycle_id = "brig-entrance"
-	},
-/obj/machinery/door/airlock/security/glass{
-	name = "Brig"
-	},
-/obj/effect/mapping_helpers/airlock/access/all/security/entrance,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
 /obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/machinery/turnstile/brig{
+	dir = 4
+	},
 /turf/open/floor/iron/dark,
 /area/station/security/brig)
 "gri" = (
@@ -43344,24 +43340,20 @@
 /turf/open/floor/iron,
 /area/station/hallway/secondary/entry)
 "kEp" = (
-/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
-	cycle_id = "brig-entrance"
-	},
-/obj/machinery/door/airlock/security/glass{
-	name = "Brig"
-	},
-/obj/effect/mapping_helpers/airlock/access/all/security/entrance,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
 /obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/machinery/scanner_gate/preset_guns,
 /obj/machinery/flasher/directional/south{
 	id = "brigflashdoor"
 	},
+/obj/machinery/turnstile/brig{
+	dir = 4
+	},
+/obj/machinery/door/firedoor,
 /turf/open/floor/iron/dark,
 /area/station/security/brig)
 "kEw" = (

_maps/map_files/KiloStation/KiloStation.dmm

@@ -12791,8 +12791,6 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/obj/effect/turf_decal/caution/stand_clear,
-/obj/machinery/door/firedoor,
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -20493,8 +20491,6 @@
 	name = "Front Security Blast Door"
 	},
 /obj/structure/extinguisher_cabinet/directional/north,
-/obj/effect/turf_decal/caution/stand_clear,
-/obj/machinery/door/firedoor,
 /turf/open/floor/iron/dark,
 /area/station/security/brig)
 "gKd" = (
@@ -43030,8 +43026,9 @@
 	id = "brigfrontdoor";
 	name = "Front Security Blast Door"
 	},
-/obj/effect/turf_decal/caution/stand_clear,
-/obj/machinery/door/firedoor,
+/obj/effect/turf_decal/caution/stand_clear{
+	dir = 4
+	},
 /turf/open/floor/iron/dark,
 /area/station/security/brig)
 "odd" = (
@@ -55359,14 +55356,10 @@
 /turf/open/floor/circuit/green/telecomms/mainframe,
 /area/station/tcommsat/server)
 "shC" = (
-/obj/machinery/door/airlock/security/glass{
-	id_tag = "innerbrig";
-	name = "Brig"
-	},
-/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
-	cycle_id = "brig-entrance-right"
+/obj/machinery/turnstile/brig{
+	dir = 8
 	},
-/obj/effect/mapping_helpers/airlock/access/all/security/entrance,
+/obj/machinery/door/firedoor,
 /turf/open/floor/iron/dark,
 /area/station/security/brig)
 "shE" = (
@@ -67866,6 +67859,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/effect/mapping_helpers/airlock/access/all/security/entrance,
+/obj/machinery/door/firedoor,
 /turf/open/floor/iron/dark,
 /area/station/security/brig)
 "was" = (
@@ -71754,17 +71748,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/grass,
 /area/station/medical/psychology)
-"xmO" = (
-/obj/machinery/door/airlock/security/glass{
-	id_tag = "outerbrig";
-	name = "Brig"
-	},
-/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
-	cycle_id = "brig-entrance-right"
-	},
-/obj/effect/mapping_helpers/airlock/access/all/security/entrance,
-/turf/open/floor/iron/dark,
-/area/station/security/brig)
 "xmQ" = (
 /obj/machinery/door/airlock/external{
 	name = "External Airlock"
@@ -98129,7 +98112,7 @@ lYG
 lOY
 weR
 hAP
-xmO
+shC
 sFF
 war
 rhd

_maps/map_files/MetaStation/MetaStation.dmm

@@ -4484,10 +4484,6 @@
 /area/station/hallway/primary/central)
 "bAV" = (
 /obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/security/glass{
-	id_tag = "outerbrig";
-	name = "Brig"
-	},
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -4496,11 +4492,9 @@
 	id = "secentranceflasher";
 	pixel_y = -5
 	},
-/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
-	cycle_id = "brig-entrance"
+/obj/machinery/turnstile/brig{
+	dir = 1
 	},
-/obj/effect/mapping_helpers/airlock/access/all/security/entrance,
-/obj/machinery/scanner_gate/preset_guns,
 /turf/open/floor/iron,
 /area/station/security/brig)
 "bBo" = (
@@ -37241,17 +37235,13 @@
 /turf/open/floor/iron/white,
 /area/station/science/cytology)
 "mKQ" = (
-/obj/machinery/door/airlock/security/glass{
-	id_tag = "innerbrig";
-	name = "Brig"
-	},
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
-	cycle_id = "brig-entrance"
+/obj/machinery/door/firedoor,
+/obj/machinery/turnstile/brig{
+	dir = 1
 	},
-/obj/effect/mapping_helpers/airlock/access/all/security/entrance,
 /turf/open/floor/iron,
 /area/station/security/brig)
 "mKR" = (

code/controllers/subsystem/tts.dm

@@ -782,3 +782,17 @@ SUBSYSTEM_DEF(tts)
 	return filtered_listeners
 
 #undef SHIFT_DATA_ARRAY
+
+
+// MASSMETA ADD BEGIN
+/// Helper to get a random TTS voice for a vendor
+/datum/controller/subsystem/tts/proc/radnom_vendor_voice()
+	if(!tts_enabled)
+		return null
+
+	for (var/voice in available_speakers)
+		if (findtext(voice, "Vendor"))
+			return voice
+	CRASH("Cant find voice for vendor! At least one voice must me for vendors")
+	return pick(available_speakers)
+// MASSMETA ADD END

code/modules/vending/vendor/_vending.dm

@@ -213,8 +213,10 @@
 	set_wires(new /datum/wires/vending(src))
 
 	if(SStts.tts_enabled)
-		var/static/list/vendor_voice_by_type = list()
-		vendor_voice_by_type[type] ||= SStts.random_tts_voice()
+		var/static/vendor_voice_by_type = list()
+		if(!vendor_voice_by_type[type])
+			vendor_voice_by_type[type] = SStts.radnom_vendor_voice() // //MASSMETA ADD START (vendor one voice) Original: vendor_voice_by_type[type] = pick(SStts.available_speakers)
+
 		voice = vendor_voice_by_type[type]
 
 	slogan_list = splittext(product_slogans, ";")

html/changelogs/AutoChangeLog-pr-104.yml

@@ -0,0 +1,4 @@
+author: "MassMeta"
+delete-after: True
+changes:
+  - map: "добавлены турникеты ко входу в бриг (они крепкие, поэтому не думайте их ломать)"

html/changelogs/AutoChangeLog-pr-106.yml

@@ -0,0 +1,4 @@
+author: "MassMeta"
+delete-after: True
+changes:
+  - bugfix: "Вендоры говорят одним голосом"

modular_meta/features/security_extended/code/machinery/turnstile.dm

@@ -0,0 +1,69 @@
+/obj/machinery/turnstile
+	name = "turnstile"
+	desc = "A mechanical door that permits one-way access to an area."
+	icon = 'modular_meta/features/security_extended/icons/objects.dmi'
+	icon_state = "turnstile_map"
+	power_channel = AREA_USAGE_ENVIRON
+	density = TRUE
+	max_integrity = 250
+	armor_type = /datum/armor/machinery_turnstile
+	anchored = TRUE
+	use_power = FALSE
+	idle_power_usage = 2
+	resistance_flags = LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
+	layer = OPEN_DOOR_LAYER
+
+/datum/armor/machinery_turnstile
+	melee = 50
+	bullet = 20
+	laser = 0
+	energy = 80
+	bomb = 10
+	fire = 90
+	acid = 50
+
+/obj/machinery/turnstile/Initialize(mapload)
+	. = ..()
+	icon_state = "turnstile"
+
+/obj/machinery/turnstile/can_atmos_pass(turf/target_turf, vertical = FALSE)
+	return TRUE
+
+/obj/machinery/turnstile/Cross(atom/movable/mover)
+	. = ..()
+	if(istype(mover) && (mover.pass_flags & PASSGLASS))
+		return TRUE
+	if(istype(mover, /mob/living/simple_animal/bot))
+		flick("operate", src)
+		playsound(src,'sound/items/tools/ratchet.ogg',50,0,3)
+		return TRUE
+	else if (!isliving(mover) && !istype(mover, /obj/vehicle/ridden/wheelchair))
+		flick("deny", src)
+		playsound(src,'sound/machines/beep/deniedbeep.ogg',50,0,3)
+		return FALSE
+	var/allowed = allowed(mover)
+	if(!allowed && mover.pulledby)
+		allowed = allowed(mover.pulledby)
+
+	if(istype(mover, /obj/vehicle/ridden/wheelchair))
+		for(var/mob/living/rider in mover.buckled_mobs)
+			if(allowed(rider) && !mover.pulledby)
+				allowed = TRUE
+	var/is_handcuffed = FALSE
+	if(iscarbon(mover))
+		var/mob/living/carbon/C = mover
+		is_handcuffed = C.handcuffed
+	if((get_dir(loc, mover.loc) == dir && !is_handcuffed) || allowed)
+		flick("operate", src)
+		playsound(src,'sound/items/tools/ratchet.ogg',50,0,3)
+		return TRUE
+	else
+		flick("deny", src)
+		playsound(src,'sound/machines/beep/deniedbeep.ogg',50,0,3)
+		return FALSE
+
+/obj/machinery/turnstile/brig
+	name = "brig turnstile"
+	req_access = list(ACCESS_SECURITY)
+	max_integrity = 350
+	damage_deflection = 16

modular_meta/features/security_extended/code/spawners.dm

@@ -4,3 +4,18 @@
 	. = ..()
 	new /obj/item/ammo_box/magazine/recharge(get_turf(src))
 	new /obj/item/gun/ballistic/automatic/laser/security(get_turf(src))
+
+/obj/effect/spawner/random/baton_or_tonfa
+	name = "baton or tonfa spawner"
+	loot = list(
+		/obj/item/melee/baton/security/loaded = 2,
+		/obj/item/melee/tonfa = 1,
+	)
+
+/obj/item/storage/belt/security/full/PopulateContents()
+	new /obj/item/reagent_containers/spray/pepper(src)
+	new /obj/item/restraints/handcuffs(src)
+	new /obj/item/grenade/flashbang(src)
+	new /obj/item/assembly/flash/handheld(src)
+	new /obj/effect/spawner/random/baton_or_tonfa(src)
+	update_appearance()

modular_meta/features/security_extended/code/supply/security_pack.dm

@@ -0,0 +1,28 @@
+/datum/supply_pack/security/armory/slrifle
+	name = "Security Laser Rifle Crate"
+	desc = "Contains single Security Laser Rifle and powerpack to it. Developed by Research Nanotrasen group. \
+		For security department, ."
+	cost = CARGO_CRATE_VALUE * 8
+	contains = list(/obj/item/gun/ballistic/automatic/laser/security = 1, /obj/item/ammo_box/magazine/recharge = 2)
+	crate_name = "security laser rifle crate"
+	crate_type = /obj/structure/closet/crate/secure/plasma
+
+/datum/supply_pack/security/slr_ammo
+	name = "Security Laser Rifle Ammo Crate"
+	desc = "Contains a bunch of types powerpacks, that can be putted \
+		in the Security Laser Rifle."
+	cost = CARGO_CRATE_VALUE * 6.5
+	access_view = ACCESS_ARMORY
+	contains = list(/obj/item/ammo_box/magazine/recharge = 3,
+					/obj/item/ammo_box/magazine/recharge/stun = 1,
+					/obj/item/ammo_box/magazine/recharge/scatter = 1,
+				)
+	crate_name = "ammo crate"
+
+/datum/supply_pack/security/tonfa
+	name = "Poilice Tonfa Crate"
+	desc = "Arm the Civil Protection Forces with three police tonfa."
+	cost = CARGO_CRATE_VALUE * 3
+	access_view = ACCESS_SECURITY
+	contains = list(/obj/item/melee/tonfa = 3)
+	crate_name = "police tonfa crate"