diff --git a/Resources/Audio/Misc/attributions.yml b/Resources/Audio/Misc/attributions.yml index 9d238031ef5..cc11902ebdd 100644 --- a/Resources/Audio/Misc/attributions.yml +++ b/Resources/Audio/Misc/attributions.yml @@ -44,6 +44,16 @@ source: "https://github.com/Skyrat-SS13/Skyrat13/commit/2d4f2d1b489590b559e4073f41b126cef56f4c50" - files: ["bluealert.ogg"] - license: "CC-BY-SA-3.0" - copyright: "Taken from Citadel Station 13" - source: "https://github.com/Skyrat-SS13/Skyrat13/commit/2d4f2d1b489590b559e4073f41b126cef56f4c50" + license: "CC-BY-NC-SA-3.0" + copyright: "Taken from TG station." + source: "https://github.com/TauCetiStation/TauCetiClassic/pull/10207/commits/2454e0f5a1b06b303f19029a279a8ac6e5b2580d" + +- files: ["greenalert.ogg"] + license: "CC-BY-NC-SA-3.0" + copyright: "Taken from TG station." + source: "https://github.com/TauCetiStation/TauCetiClassic/pull/10207/commits/2454e0f5a1b06b303f19029a279a8ac6e5b2580d" + +- files: ["delta.ogg"] + license: "CC-BY-NC-SA-3.0" + copyright: "Taken from TG station." + source: "https://github.com/TauCetiStation/TauCetiClassic/pull/10207/commits/2454e0f5a1b06b303f19029a279a8ac6e5b2580d" diff --git a/Resources/Audio/Misc/bluealert.ogg b/Resources/Audio/Misc/bluealert.ogg index fef4e9af0f0..dc06619129e 100644 Binary files a/Resources/Audio/Misc/bluealert.ogg and b/Resources/Audio/Misc/bluealert.ogg differ diff --git a/Resources/Audio/Misc/delta.ogg b/Resources/Audio/Misc/delta.ogg index 7a9522c1ff6..736877b942d 100644 Binary files a/Resources/Audio/Misc/delta.ogg and b/Resources/Audio/Misc/delta.ogg differ diff --git a/Resources/Audio/Misc/greenalert.ogg b/Resources/Audio/Misc/greenalert.ogg new file mode 100644 index 00000000000..0f831309c6f Binary files /dev/null and b/Resources/Audio/Misc/greenalert.ogg differ diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Back/duffels.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Back/duffels.ftl index e7d54246a26..cb70a876dbd 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Back/duffels.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Back/duffels.ftl @@ -1,2 +1,5 @@ ent-ADTClothingBackpackDuffelBlueshield = вещмешок офицера синего щита .desc = Крайне вместительный вещмешок с яркой эмблемой щита, предназначенный для хранения охранного и медицинского арсенала Офицеров Синего Щита. + +ent-ADTClothingBackpackDuffelDurathead = дюротканевый вещмешок + .desc = Вещмешок выполненый из более прочной и эластичной дюраткани. diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Back/duffel.yml b/Resources/Prototypes/ADT/Entities/Clothing/Back/duffel.yml index 3153ebf477f..df8ec44b9b4 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Back/duffel.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Back/duffel.yml @@ -14,3 +14,24 @@ components: - type: Sprite sprite: ADT/Clothing/Back/pathologist_duffel.rsi + +- type: entity + parent: ClothingBackpackDuffel + id: ADTClothingBackpackDuffelDurathead + name: Durathead Duffel bag + description: A large duffel bag for holding extra tools and supplies. + components: + - type: Sprite + sprite: ADT/Clothing/Back/duffel_durathead.rsi + - type: ExplosionResistance + damageCoefficient: 0.7 + - type: Storage + maxItemSize: Huge + grid: + - 0,0,9,4 + - type: ClothingSpeedModifier + walkModifier: 1 + sprintModifier: 1 + - type: Construction + graph: DuffelDurathead + node: DuffelDurathead diff --git a/Resources/Prototypes/ADT/Recipes/Construction/Graph/clothing/durathead.yml b/Resources/Prototypes/ADT/Recipes/Construction/Graph/clothing/durathead.yml new file mode 100644 index 00000000000..067e01284ce --- /dev/null +++ b/Resources/Prototypes/ADT/Recipes/Construction/Graph/clothing/durathead.yml @@ -0,0 +1,27 @@ +- type: constructionGraph + id: DuffelDurathead + start: start + graph: + - node: start + edges: + - to: DuffelDurathead + steps: + - material: Cloth + amount: 10 + doAfter: 1 + - material: Durathread + amount: 20 + doAfter: 1 + - node: DuffelDurathead + entity: ADTClothingBackpackDuffelDurathead + +- type: construction + name: Duratthead duffel bag + id: DuffelDurathead + graph: DuffelDurathead + startNode: start + targetNode: DuffelDurathead + category: construction-category-clothing + description: A better bag for a swag. + icon: { sprite: ADT/Clothing/Back/duffel_durathead.rsi, state: icon } + objectType: Item diff --git a/Resources/Prototypes/AlertLevels/alert_levels.yml b/Resources/Prototypes/AlertLevels/alert_levels.yml index 980ab60c844..59bd29571e4 100644 --- a/Resources/Prototypes/AlertLevels/alert_levels.yml +++ b/Resources/Prototypes/AlertLevels/alert_levels.yml @@ -4,6 +4,7 @@ levels: green: announcement: alert-level-green-announcement + sound: /Audio/Misc/greenalert.ogg # ADT-Tweak color: Green emergencyLightColor: LawnGreen shuttleTime: 600 @@ -52,7 +53,7 @@ sound: path: /Audio/Misc/delta.ogg params: - volume: -6 # Corvax: Reduce sound volume + volume: -1 # ADT-Tweak disableSelection: true color: DarkRed emergencyLightColor: Orange diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml index d02f307abb5..1a1394f5613 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml @@ -84,6 +84,7 @@ type: WiresBoundUserInterface - type: Airtight - type: Occluder + - type: StationAiWhitelist #ADT-Tweak - type: Damageable damageContainer: StructuralInorganic damageModifierSet: StrongMetallic diff --git a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml index abfb72d2cd7..ecc268a2274 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml @@ -116,6 +116,7 @@ color: Red enabled: false castShadows: false + - type: StationAiWhitelist #ADT-Tweak - type: entity id: Firelock diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml index a340c00a690..c1d0346a39a 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml @@ -16,6 +16,7 @@ state: alert-2 - map: ["computerLayerKeys"] state: atmos_key + - type: StationAiWhitelist #ADT-Tweak - type: entity parent: BaseComputer @@ -243,6 +244,7 @@ interfaces: enum.PowerMonitoringConsoleUiKey.Key: type: PowerMonitoringConsoleBoundUserInterface + - type: StationAiWhitelist #ADT-Tweak - type: entity parent: BaseComputer @@ -301,6 +303,7 @@ - type: GuideHelp guides: - CriminalRecords + - type: StationAiWhitelist #ADT-Tweak - type: entity parent: BaseComputer @@ -324,6 +327,7 @@ - type: GuideHelp guides: - Forensics + - type: StationAiWhitelist #ADT-Tweak - type: entity parent: BaseComputer @@ -359,6 +363,7 @@ receiveFrequencyId: CrewMonitor - type: WirelessNetworkConnection range: 1200 + - type: StationAiWhitelist #ADT-Tweak - type: entity parent: BaseComputer @@ -396,6 +401,7 @@ board: ResearchComputerCircuitboard - type: AccessReader access: [["Research"]] + - type: StationAiWhitelist #ADT-Tweak - type: PointLight radius: 1.5 energy: 1.6 @@ -449,6 +455,7 @@ - type: GuideHelp guides: - Xenoarchaeology + - type: StationAiWhitelist #ADT-Tweak - type: entity parent: BaseComputer @@ -623,6 +630,7 @@ radius: 1.5 energy: 1.6 color: "#e6e227" + - type: StationAiWhitelist #ADT-Tweak - type: entity parent: BaseComputer @@ -653,6 +661,7 @@ radius: 1.5 energy: 1.6 color: "#e6e227" + - type: StationAiWhitelist #ADT-Tweak - type: entity id: ComputerCargoShuttle @@ -707,6 +716,7 @@ state: tech_key - type: CargoOrderConsole - type: BankClient + - type: StationAiWhitelist #ADT-Tweak - type: ActiveRadio channels: - Supply @@ -1082,6 +1092,7 @@ deviceNetId: Wireless receiveFrequencyId: RoboticsConsole transmitFrequencyId: CyborgControl + - type: StationAiWhitelist #ADT-Tweak - type: Computer board: RoboticsConsoleCircuitboard - type: AccessReader # only used for dangerous things diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index ca0c7d9a98d..90f9999f67b 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -112,6 +112,7 @@ - Sheet - RawMaterial - Ingot + - type: StationAiWhitelist #ADT-Tweak - type: Lathe idleState: icon runningState: building @@ -271,6 +272,7 @@ map: ["enum.WiresVisualLayers.MaintenancePanel"] - type: Machine board: ProtolatheMachineCircuitboard + - type: StationAiWhitelist #ADT-Tweak - type: MaterialStorage whitelist: tags: @@ -480,6 +482,7 @@ map: ["enum.WiresVisualLayers.MaintenancePanel"] - type: Machine board: CircuitImprinterMachineCircuitboard + - type: StationAiWhitelist #ADT-Tweak - type: Lathe producingSound: /Audio/Machines/circuitprinter.ogg idleState: icon diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml index 72fe81aff41..95a8b6cb5e3 100644 --- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml +++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml @@ -28,6 +28,7 @@ delay: 2 fx: EffectRCDDeconstruct2 # ADT-RPD-End + - type: StationAiWhitelist #ADT-Tweak - type: entity parent: GasBinaryBase diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/trinary.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/trinary.yml index e8025556aa5..e45a9c66cc9 100644 --- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/trinary.yml +++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/trinary.yml @@ -6,6 +6,7 @@ mode: SnapgridCenter components: - type: AtmosDevice + - type: StationAiWhitelist #ADT-Tweak - type: Tag tags: - Unstackable diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml index 5fcfecf234a..bdec74016c9 100644 --- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml +++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml @@ -230,6 +230,7 @@ examinableAddress: true - type: WiredNetworkConnection - type: PowerSwitch + - type: StationAiWhitelist #ADT-Tweak - type: entity parent: BaseGasThermoMachine diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml index 0fa8790947d..6b675213d05 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml @@ -52,6 +52,7 @@ tags: - AirAlarm - type: AtmosDevice + - type: StationAiWhitelist #ADT-Tweak - type: AirAlarm - type: Clickable - type: InteractionOutline diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/fire_alarm.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/fire_alarm.yml index 3088e0a0015..7052703542f 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/fire_alarm.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/fire_alarm.yml @@ -20,6 +20,7 @@ - type: WiredNetworkConnection - type: DeviceNetworkRequiresPower - type: AtmosDevice + - type: StationAiWhitelist #ADT-Tweak - type: AtmosAlarmable syncWith: - FireAlarm diff --git a/Resources/Textures/ADT/Clothing/Back/duffel_durathead.rsi/equipped-BACKPACK.png b/Resources/Textures/ADT/Clothing/Back/duffel_durathead.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..8eac995bd04 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Back/duffel_durathead.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/ADT/Clothing/Back/duffel_durathead.rsi/icon.png b/Resources/Textures/ADT/Clothing/Back/duffel_durathead.rsi/icon.png new file mode 100644 index 00000000000..5dc83e909b7 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Back/duffel_durathead.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Back/duffel_durathead.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Back/duffel_durathead.rsi/inhand-left.png new file mode 100644 index 00000000000..0297c76eb69 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Back/duffel_durathead.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Back/duffel_durathead.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Back/duffel_durathead.rsi/inhand-right.png new file mode 100644 index 00000000000..9cd3399a33a Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Back/duffel_durathead.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Back/duffel_durathead.rsi/meta.json b/Resources/Textures/ADT/Clothing/Back/duffel_durathead.rsi/meta.json new file mode 100644 index 00000000000..c9938e004ac --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Back/duffel_durathead.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Modified from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1, and modified for Adventure Time by prazat911 (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}