diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Catalog/Fills/boxes/emergency.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Catalog/Fills/boxes/emergency.ftl index d9088e52f7b..051778c5d06 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Catalog/Fills/boxes/emergency.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Catalog/Fills/boxes/emergency.ftl @@ -1,3 +1,41 @@ ent-BoxSurvivalBrigmedic = аварийный запас .desc = Коробка с базовым набором для выживания. .suffix = Медицинский + +ent-ADTBoxSurvivalMoth = аварийный запас для ниан + .desc = Коробка с базовым набором для выживания представителей вида ниан. + .suffix = Стандартный, Нианы +ent-ADTBoxSurvivalMothEngineering = расширенный аварийный запас для ниан + .desc = Коробка с базовым набором для выживания представителей вида ниан. Согласно этикетке, содержит более ёмкий баллон. + .suffix = Инженерный, Нианы +ent-ADTBoxSurvivalMothSecurity = аварийный запас для ниан + .desc = Коробка с базовым набором для выживания представителей вида ниан. + .suffix = СБ, Нианы +ent-ADTBoxSurvivalMothMedical = аварийный запас для ниан + .desc = Коробка с базовым набором для выживания представителей вида ниан. + .suffix = Медицинский, Нианы +ent-ADTBoxMothHug = коробка обнимашек ниан + .desc = Специальная коробка для чутких молей. + .suffix = Аварийный, Нианы +ent-ADTBoxSurvivalMothSyndicate = расширенный аварийный запас для ниан + .desc = Коробка с базовым набором для выживания представителей вида ниан. Согласно этикетке, содержит более ёмкий баллон. + .suffix = Синдикат, Нианы + +ent-ADTBoxSurvivalSilicon = аварийный запас для синтетиков + .desc = Коробка с базовым набором для выживания синтетических форм жизни. + .suffix = Стандартный, КПБ +ent-ADTBoxSurvivalSiliconEngineering = расширенный аварийный запас для синтетиков + .desc = Коробка с базовым набором для выживания синтетических форм жизни. Согласно этикетке, содержит более ёмкую батарею. + .suffix = Инженерный, КПБ +ent-ADTBoxSurvivalSiliconSecurity = аварийный запас для синтетиков + .desc = Коробка с базовым набором для выживания синтетических форм жизни. + .suffix = СБ, КПБ +ent-ADTBoxSurvivalSiliconMedical = аварийный запас для синтетиков + .desc = Коробка с базовым набором для выживания синтетических форм жизни. + .suffix = Медицинский, КПБ +ent-ADTBoxSiliconHug = коробка обнимашек синтетиков + .desc = Специальная коробка для чутких машин. + .suffix = Аварийный, КПБ +ent-ADTBoxSurvivalSiliconSyndicate = расширенный аварийный запас для синтетиков + .desc = Коробка с базовым набором для выживания синтетических форм жизни. Согласно этикетке, содержит более ёмкую батарею. + .suffix = Синдикат, КПБ diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/tools/crowbars.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/tools/crowbars.ftl index db1c04bdd6f..da1344fb84f 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/tools/crowbars.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/tools/crowbars.ftl @@ -1,12 +1,12 @@ -ent-BaseCrowbar = crowbar +ent-BaseCrowbar = лом .desc = { ent-BaseItem.desc } ent-Crowbar = { ent-BaseCrowbar } - .desc = A multipurpose tool to pry open doors and fight interdimensional invaders. -ent-CrowbarRed = emergency crowbar - .desc = A pocket crowbar designed to pry open doors and firelocks during power outages. + .desc = Многофункциональный инструмент для открывания дверей и борьбы с межпространственными захватчиками. +ent-CrowbarRed = аварийный лом + .desc = Многофункциональный инструмент для открывания дверей и борьбы с межпространственными захватчиками. ent-CrowbarGreen = { ent-BaseCrowbar } - .desc = A multipurpose tool to pry open doors and fight interdimensional invaders, printed from an autolathe. + .desc = Многофункциональный инструмент для открывания дверей и борьбы с межпространственными захватчиками, сделанный в автолате. ent-CrowbarOrange = { ent-BaseCrowbar } - .desc = A multipurpose tool to pry open doors and fight interdimensional invaders, found in toolboxes. + .desc = Многофункциональный инструмент для открывания дверей и борьбы с межпространственными захватчиками, найденный в ящике для инструментов. ent-CrowbarYellow = { ent-BaseCrowbar } - .desc = A pocket crowbar designed to pry open doors and firelocks during power outages, dispensed from Engineering. + .desc = Многофункциональный инструмент для открывания дверей и борьбы с межпространственными захватчиками, прямо из инженерного отдела. diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/backpack.yml index b813d9dea6e..5f11183c838 100644 --- a/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/backpack.yml +++ b/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/backpack.yml @@ -5,7 +5,7 @@ components: - type: StorageFill contents: - - id: BoxSurvivalMedical + # - id: BoxSurvivalMedical - id: BodyBagFolded # До добавления слота носков- id: ADTFootTag - id: SpaceCash500 @@ -71,8 +71,8 @@ components: - type: StorageFill contents: - - id: BoxSurvivalBrigmedic + # - id: BoxSurvivalBrigmedic - id: Flash - id: MagazinePistol # - id: ADTSpaceLaw - - id: SpaceCash500 + # - id: SpaceCash500 diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml index f0b018f0088..b322d3cab8b 100644 --- a/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml +++ b/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml @@ -5,7 +5,7 @@ components: - type: StorageFill contents: - - id: BoxSurvivalMedical + # - id: BoxSurvivalMedical - id: BodyBagFolded # До добавления слота носков- id: ADTFootTag - id: SpaceCash500 @@ -27,10 +27,10 @@ components: - type: StorageFill contents: - - id: BoxSurvivalBrigmedic + # - id: BoxSurvivalBrigmedic - id: Flash - id: MagazinePistol # - id: ADTSpaceLaw - - id: SpaceCash500 + # - id: SpaceCash500 diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/satchel.yml index 331642f4ac3..a103362107e 100644 --- a/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/satchel.yml +++ b/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/satchel.yml @@ -5,7 +5,7 @@ components: - type: StorageFill contents: - - id: BoxSurvivalMedical + # - id: BoxSurvivalMedical - id: BodyBagFolded # До добавления слота носков - id: ADTFootTag - id: SpaceCash500 @@ -25,8 +25,8 @@ components: - type: StorageFill contents: - - id: BoxSurvivalBrigmedic + # - id: BoxSurvivalBrigmedic - id: Flash - id: MagazinePistol # - id: ADTSpaceLaw - - id: SpaceCash500 + # - id: SpaceCash500 diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Boxes/emergency.yml b/Resources/Prototypes/ADT/Catalog/Fills/Boxes/emergency.yml index 593bdc77986..016da2b9cac 100644 --- a/Resources/Prototypes/ADT/Catalog/Fills/Boxes/emergency.yml +++ b/Resources/Prototypes/ADT/Catalog/Fills/Boxes/emergency.yml @@ -18,3 +18,248 @@ layers: - state: internals - state: emergencytank + +#Аварийный запас для молей +- type: entity + parent: BoxCardboard + id: ADTBoxSurvivalMoth + name: survival moth box + description: It's a box with basic internals inside. + suffix: Moth + components: + - type: StorageFill + contents: + - id: ClothingMaskBreath + - id: EmergencyOxygenTankFilled + - id: EmergencyMedipen + - id: Flare + - id: FoodTinPeaches + - id: DrinkWaterBottleFull + - id: SpaceMedipen # ADT rework - add SpaceMedipen in all survival box + - type: Sprite + layers: + - state: internals + - state: emergencytank + +- type: entity + parent: BoxCardboard + id: ADTBoxMothHug + name: box of moth hugs + description: A special box for sensitive people. + suffix: Emergency, Moth + components: + - type: Sprite + layers: + - state: box_hug + - state: heart + - type: Item + heldPrefix: hug + - type: StorageFill + contents: + - id: ClothingMaskBreath + - id: EmergencyFunnyOxygenTankFilled + - id: EmergencyMedipen + - id: Flare + - id: FoodTinPeaches + - id: DrinkWaterBottleFull + - id: SpaceMedipen + - type: Tag + tags: + - BoxHug + +- type: entity + parent: BoxCardboard + id: ADTBoxSurvivalMothEngineering + name: extended-capacity moth survival box + description: It's a box with basic internals inside. This one is labelled to contain an extended-capacity tank. + suffix: Extended, Moth + components: + - type: StorageFill + contents: + - id: ClothingMaskBreath + - id: ExtendedEmergencyOxygenTankFilled + - id: EmergencyMedipen + - id: Flare + - id: FoodTinPeaches + - id: DrinkWaterBottleFull + - id: SpaceMedipen + - type: Sprite + layers: + - state: internals + - state: extendedtank + +- type: entity + parent: BoxCardboard + id: ADTBoxSurvivalMothSecurity + name: survival moth box + description: It's a box with basic internals inside. + suffix: Security, Moth + components: + - type: StorageFill + contents: + - id: ClothingMaskGasSecurity + - id: EmergencyOxygenTankFilled + - id: EmergencyMedipen + - id: Flare + - id: FoodTinPeaches + - id: DrinkWaterBottleFull + - id: SpaceMedipen + - type: Sprite + layers: + - state: internals + - state: emergencytank + +- type: entity + parent: BoxCardboard + id: ADTBoxSurvivalMothMedical + name: survival moth box + description: It's a box with basic internals inside. + suffix: Medical, Moth + components: + - type: StorageFill + contents: + - id: ClothingMaskBreathMedical + - id: EmergencyOxygenTankFilled + - id: EmergencyMedipen + - id: Flare + - id: FoodTinPeaches + - id: DrinkWaterBottleFull + - id: SpaceMedipen + - type: Sprite + layers: + - state: internals + - state: emergencytank + +- type: entity + parent: BoxCardboard + id: ADTBoxSurvivalMothSyndicate + name: extended-capacity survival moth box + description: It's a box with basic internals inside. This one is labelled to contain an extended-capacity tank. + suffix: Syndicate, Moth + components: + - type: StorageFill + contents: + - id: ClothingMaskGasSyndicate + - id: ExtendedEmergencyOxygenTankFilled + - id: EmergencyMedipen + - id: Flare + - id: FoodTinPeaches + - id: SpaceMedipen + - type: Sprite + layers: + - state: internals + - state: extendedtank + +#Аварийный запас для КПБ +- type: entity + parent: BoxCardboard + id: ADTBoxSurvivalSilicon + name: survival silicon box + description: It's a box with basic internals inside. + suffix: IPC + components: + - type: StorageFill + contents: + - id: Flare + - id: CableApcStack + - id: WelderMini + - id: PowerCellMedium + - type: Sprite + layers: + - state: internals + - state: emergencytank + +- type: entity + parent: BoxCardboard + id: ADTBoxSiliconHug + name: box of silicon hugs + description: A special box for sensitive people. + suffix: Emergency, IPC + components: + - type: Sprite + layers: + - state: box_hug + - state: heart + - type: Item + heldPrefix: hug + - type: StorageFill + contents: + - id: Flare + - id: CableApcStack + - id: WelderMini + - id: PowerCellMedium + - type: Tag + tags: + - BoxHug + +- type: entity + parent: BoxCardboard + id: ADTBoxSurvivalSiliconEngineering + name: extended-capacity silicon survival box + description: It's a box with basic internals inside. This one is labelled to contain an extended-capacity tank. + suffix: Extended, IPC + components: + - type: StorageFill + contents: + - id: Flare + - id: CableApcStack + - id: WelderMini + - id: PowerCellHigh + - type: Sprite + layers: + - state: internals + - state: extendedtank + +- type: entity + parent: BoxCardboard + id: ADTBoxSurvivalSiliconSecurity + name: survival silicon box + description: It's a box with basic internals inside. + suffix: Security, IPC + components: + - type: StorageFill + contents: + - id: Flare + - id: CableApcStack + - id: WelderMini + - id: PowerCellHigh + - type: Sprite + layers: + - state: internals + - state: emergencytank + +- type: entity + parent: BoxCardboard + id: ADTBoxSurvivalSiliconMedical + name: survival silicon box + description: It's a box with basic internals inside. + suffix: Medical, IPC + components: + - type: StorageFill + contents: + - id: Flare + - id: CableApcStack + - id: WelderMini + - id: PowerCellMedium + - type: Sprite + layers: + - state: internals + - state: emergencytank + +- type: entity + parent: BoxCardboard + id: ADTBoxSurvivalSiliconSyndicate + name: extended-capacity survival silicon box + description: It's a box with basic internals inside. This one is labelled to contain an extended-capacity tank. + suffix: Syndicate, IPC + components: + - type: StorageFill + contents: + - id: Flare + - id: CableApcStack + - id: WelderMini + - id: PowerCellHigh + - type: Sprite + layers: + - state: internals + - state: extendedtank diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Player/ipc.yml b/Resources/Prototypes/ADT/Entities/Mobs/Player/ipc.yml index ca0b8519b09..43e6b6b6596 100644 --- a/Resources/Prototypes/ADT/Entities/Mobs/Player/ipc.yml +++ b/Resources/Prototypes/ADT/Entities/Mobs/Player/ipc.yml @@ -131,6 +131,7 @@ tallscale: 1.1 short: true shortscale: 0.9 + - type: CanEnterCryostorage - type: entity save: false diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/paranormal.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/paranormal.yml index 21097009597..c558f07d3bf 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/paranormal.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/paranormal.yml @@ -41,6 +41,8 @@ - type: Item sprite: ADT/Objects/Weapons/Melee/ecto-sword.rsi size: Huge + shape: + - 0,0,1,3 - type: HolyDamage - type: PointLight color: Cyan diff --git a/Resources/Prototypes/ADT/Loadouts/Miscellaneous/survival.yml b/Resources/Prototypes/ADT/Loadouts/Miscellaneous/survival.yml new file mode 100644 index 00000000000..bd5a01f3b82 --- /dev/null +++ b/Resources/Prototypes/ADT/Loadouts/Miscellaneous/survival.yml @@ -0,0 +1,129 @@ +#Species + +- type: loadoutEffectGroup + id: ADTMothSpecies + effects: + - !type:SpeciesLoadoutEffect + species: + - Moth + +- type: loadoutEffectGroup + id: ADTSiliconSpecies + effects: + - !type:SpeciesLoadoutEffect + species: + - IPC + +# Basic +- type: loadout + id: ADTEmergencyMoth + effects: + - !type:GroupLoadoutEffect + proto: ADTMothSpecies + storage: + back: + - ADTBoxSurvivalMoth + +- type: loadout + id: ADTEmergencyIPC + effects: + - !type:GroupLoadoutEffect + proto: ADTSiliconSpecies + storage: + back: + - ADTBoxSurvivalSilicon + +# Clown +- type: loadout + id: ADTEmergencyMothClown + effects: + - !type:GroupLoadoutEffect + proto: ADTMothSpecies + storage: + back: + - ADTBoxMothHug + +- type: loadout + id: ADTEmergencyIPCClown + effects: + - !type:GroupLoadoutEffect + proto: ADTSiliconSpecies + storage: + back: + - ADTBoxSiliconHug + +# Engineering / Extended +- type: loadout + id: ADTEmergencyMothExtended + effects: + - !type:GroupLoadoutEffect + proto: ADTMothSpecies + storage: + back: + - ADTBoxSurvivalMothEngineering + +- type: loadout + id: ADTEmergencyIPCExtended + effects: + - !type:GroupLoadoutEffect + proto: ADTSiliconSpecies + storage: + back: + - ADTBoxSurvivalSiliconEngineering + +# Medical +- type: loadout + id: ADTEmergencyMothMedical + effects: + - !type:GroupLoadoutEffect + proto: ADTMothSpecies + storage: + back: + - ADTBoxSurvivalMothMedical + +- type: loadout + id: ADTEmergencyIPCMedical + effects: + - !type:GroupLoadoutEffect + proto: ADTSiliconSpecies + storage: + back: + - ADTBoxSurvivalSiliconMedical + +# Security +- type: loadout + id: ADTEmergencyMothSecurity + effects: + - !type:GroupLoadoutEffect + proto: ADTMothSpecies + storage: + back: + - ADTBoxSurvivalMothSecurity + +- type: loadout + id: ADTEmergencyIPCSecurity + effects: + - !type:GroupLoadoutEffect + proto: ADTSiliconSpecies + storage: + back: + - ADTBoxSurvivalSiliconSecurity + +# Syndicate +- type: loadout + id: ADTEmergencyMothSyndicate + effects: + - !type:GroupLoadoutEffect + proto: ADTMothSpecies + storage: + back: + - ADTBoxSurvivalMothSyndicate + +- type: loadout + id: ADTEmergencyIPCSyndicate + effects: + - !type:GroupLoadoutEffect + proto: ADTSiliconSpecies + storage: + back: + - ADTBoxSurvivalSiliconSyndicate diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml index b6c35079d9c..7d6d3e56292 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml @@ -32,13 +32,6 @@ # ADTClothingUnderwearWhiteComfyPanties: 2 # ADTClothingUnderwearTopComfyWhiteBra: 2 # конец белья -# начало обмоток - # ADTClothingFootWrapsWhite: 2 - # ADTClothingFootWrapsBlack: 2 - # ADTClothingFootWrapsBrown: 2 # TODO: Убрать комменты после добавления обмоток - # ADTClothingFootWrapsHighWhite: 2 - # ADTClothingFootWrapsHighBlack: 2 -# конец обмоток ADTClothingNeckDarkGreyCloak: 1 ADTClothingNeckGothicCloak: 1 # ADT бельё/обмотки/плащи конец @@ -174,4 +167,4 @@ ClothingMaskNeckGaiter: 2 ClothingUniformJumpsuitTacticool: 1 ClothingUniformJumpskirtTacticool: 1 -# DO NOT ADD MORE, USE UNIFORM DYING \ No newline at end of file +# DO NOT ADD MORE, USE UNIFORM DYING diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index 5a92bc77f81..5af4ea7272f 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -922,7 +922,7 @@ productEntity: ReinforcementRadioSyndicateNukeops icon: { sprite: Objects/Devices/communication.rsi, state: old-radio-nukeop } cost: - Telecrystal: 35 + Telecrystal: 16 #ADT_Tweak - подкрепление стоит дешево, но поступает без своего аплинка categories: - UplinkAllies conditions: diff --git a/Resources/Prototypes/Corvax/Roles/Jobs/Command/iaa.yml b/Resources/Prototypes/Corvax/Roles/Jobs/Command/iaa.yml index cc4598e64c2..3e3b97ea4e6 100644 --- a/Resources/Prototypes/Corvax/Roles/Jobs/Command/iaa.yml +++ b/Resources/Prototypes/Corvax/Roles/Jobs/Command/iaa.yml @@ -36,6 +36,6 @@ pocket2: BookSpaceLaw inhand: - BriefcaseIAAFilled - storage: - back: - - BoxSurvival + # storage: #Заменяем на аварийник по лодауту + # back: + # - BoxSurvival diff --git a/Resources/Prototypes/Corvax/Roles/Jobs/Security/pilot.yml b/Resources/Prototypes/Corvax/Roles/Jobs/Security/pilot.yml index a05681cf6e3..825ee4a280b 100644 --- a/Resources/Prototypes/Corvax/Roles/Jobs/Security/pilot.yml +++ b/Resources/Prototypes/Corvax/Roles/Jobs/Security/pilot.yml @@ -33,6 +33,6 @@ pocket1: WeaponPistolMk58 storage: back: - - BoxSurvivalSecurity + # - BoxSurvivalSecurity #ADT_Tweaks - заменяем на аварийник по лодауту - Flash - MagazinePistol diff --git a/Resources/Prototypes/Entities/Mobs/Species/diona.yml b/Resources/Prototypes/Entities/Mobs/Species/diona.yml index 7b15ced7b62..adc4458e39d 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/diona.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/diona.yml @@ -91,7 +91,7 @@ Unsexed: UnisexDiona - type: BodyEmotes soundsId: DionaBodyEmotes - - type: Pacified # Corvax-DionaPacifist + # - type: Pacified # Corvax-DionaPacifist #ADT_Tweak - дионы распацифижены - type: IgnoreKudzu - type: IgniteOnHeatDamage fireStacks: 1 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/tin.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/tin.yml index 3fbf14a6d60..dcacc39ef81 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/tin.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/tin.yml @@ -93,6 +93,8 @@ - type: Tag tags: - Fruit + - type: Openable + openableByHand: true #ADT_Tweak - чтобы была возможность открыть консерву из аварийного набора ниан без ломика - type: entity parent: FoodTinBaseTrash diff --git a/Resources/Prototypes/Entities/Objects/Tools/crowbars.yml b/Resources/Prototypes/Entities/Objects/Tools/crowbars.yml index 7311c814340..f638dff8c3b 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/crowbars.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/crowbars.yml @@ -38,7 +38,7 @@ - Belt - type: Item sprite: Objects/Tools/crowbar.rsi - size: Normal + size: Small #ADT_Tweaks - ломы снова лезут в карман shape: - 0,0,0,1 diff --git a/Resources/Prototypes/Entities/Structures/Machines/telecomms.yml b/Resources/Prototypes/Entities/Structures/Machines/telecomms.yml index a9a857c316f..7a7327f7168 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/telecomms.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/telecomms.yml @@ -86,7 +86,7 @@ - EncryptionKeySecurity - EncryptionKeyService - EncryptionKeyCommand - - ADTEncryptionKeyLawyer + - ADTEncryptionKeyLawyer #ADT_Tweak - type: entity parent: TelecomServer @@ -147,6 +147,7 @@ containers: key_slots: - EncryptionKeySecurity + - ADTEncryptionKeyLawyer #ADT_Tweak - type: entity parent: TelecomServer diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/survival.yml b/Resources/Prototypes/Loadouts/Miscellaneous/survival.yml index 2716310ecfb..e90f575b06f 100644 --- a/Resources/Prototypes/Loadouts/Miscellaneous/survival.yml +++ b/Resources/Prototypes/Loadouts/Miscellaneous/survival.yml @@ -16,8 +16,19 @@ - Diona - Dwarf - Human - - Moth + # - Moth #ADT_Tweak - Нианы получают свой вариант аварийного запаса - Reptilian + #ADT_Species Start + - DemonSpecies + - DraskSpecies + - Felinid + - KoboltSpecies + - NovakidSpecies + - Shadekin + - TajaranSpecies + - UrsusSpecies + - VulpkaninSpecies + #ADT_Species End - type: loadoutEffectGroup id: EffectSpeciesVox diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index 540451b911a..38076e36dc1 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -65,6 +65,8 @@ - EmergencyNitrogen - EmergencyOxygen - LoadoutSpeciesVoxNitrogen + - ADTEmergencyMoth #ADT_Species + - ADTEmergencyIPC #ADT_Species - type: loadoutGroup id: GroupEVATank @@ -453,6 +455,8 @@ - EmergencyNitrogenClown - EmergencyOxygenClown - LoadoutSpeciesVoxNitrogen + - ADTEmergencyMothClown #ADT_Species + - ADTEmergencyIPCClown #ADT_Species - type: loadoutGroup id: MimeHead @@ -776,6 +780,8 @@ - EmergencyNitrogenExtended - EmergencyOxygenExtended - LoadoutSpeciesVoxNitrogen + - ADTEmergencyMothExtended #ADT_Species + - ADTEmergencyIPCExtended #ADT_Species # Science - type: loadoutGroup @@ -1065,6 +1071,8 @@ - EmergencyNitrogenSecurity - EmergencyOxygenSecurity - LoadoutSpeciesVoxNitrogen + - ADTEmergencyMothSecurity #ADT_Species + - ADTEmergencyIPCSecurity #ADT_Species # Medical - type: loadoutGroup @@ -1247,6 +1255,8 @@ - EmergencyNitrogenMedical - EmergencyOxygenMedical - LoadoutSpeciesVoxNitrogen + - ADTEmergencyMothMedical #ADT_Species + - ADTEmergencyIPCMedical #ADT_Species # Wildcards - type: loadoutGroup @@ -1289,6 +1299,8 @@ - EmergencyNitrogenSyndicate - EmergencyOxygenSyndicate - LoadoutSpeciesVoxNitrogen + - ADTEmergencyMothSyndicate #ADT_Species + - ADTEmergencyIPCSyndicate #ADT_Species - type: loadoutGroup id: GroupSpeciesBreathTool diff --git a/Resources/Prototypes/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml index 4dcef67f77d..f86f1f1eef4 100644 --- a/Resources/Prototypes/Reagents/medicine.yml +++ b/Resources/Prototypes/Reagents/medicine.yml @@ -514,7 +514,7 @@ - !type:HealthChange conditions: - !type:ReagentThreshold - min: 30 + min: 60 #ADT_Tweak - изменено значение передозировки для борьбы с набегаторами damage: types: Poison: 3 @@ -522,7 +522,7 @@ probability: 0.15 conditions: - !type:ReagentThreshold - min: 30 + min: 60 #ADT_Tweak - изменено значение передозировки для борьбы с набегаторами - !type:GenericStatusEffect key: PressureImmunity component: PressureImmunity diff --git a/Resources/Prototypes/Roles/Antags/nukeops.yml b/Resources/Prototypes/Roles/Antags/nukeops.yml index c13418c704e..9503f5c7e07 100644 --- a/Resources/Prototypes/Roles/Antags/nukeops.yml +++ b/Resources/Prototypes/Roles/Antags/nukeops.yml @@ -57,7 +57,7 @@ shoes: ClothingShoesBootsCombatFilled id: SyndiPDA pocket1: DoubleEmergencyOxygenTankFilled - pocket2: BaseUplinkRadio40TC #ADT Оставил аплинк + pocket2: PlushieCarp belt: ClothingBeltAssault #ADT nukebuff storage: back: diff --git a/Resources/Prototypes/StatusIcon/security.yml b/Resources/Prototypes/StatusIcon/security.yml index eb97610c7be..fdfce4c081d 100644 --- a/Resources/Prototypes/StatusIcon/security.yml +++ b/Resources/Prototypes/StatusIcon/security.yml @@ -44,7 +44,7 @@ - type: securityIcon id: MindShieldIcon priority: 2 - locationPreference: Right + locationPreference: Left # Corvax-TypingIndicator layer: Mod isShaded: true icon: diff --git a/Resources/Textures/ADT/Clothing/Shoes/Specific/black_footwraps.rsi/equipped-FEET-reptilian.png b/Resources/Textures/ADT/Clothing/Shoes/Specific/black_footwraps.rsi/equipped-FEET-reptilian.png index b9539e97931..091dcd73115 100644 Binary files a/Resources/Textures/ADT/Clothing/Shoes/Specific/black_footwraps.rsi/equipped-FEET-reptilian.png and b/Resources/Textures/ADT/Clothing/Shoes/Specific/black_footwraps.rsi/equipped-FEET-reptilian.png differ diff --git a/Resources/Textures/ADT/Clothing/Shoes/Specific/black_footwraps.rsi/equipped-FEET.png b/Resources/Textures/ADT/Clothing/Shoes/Specific/black_footwraps.rsi/equipped-FEET.png index 091dcd73115..b9539e97931 100644 Binary files a/Resources/Textures/ADT/Clothing/Shoes/Specific/black_footwraps.rsi/equipped-FEET.png and b/Resources/Textures/ADT/Clothing/Shoes/Specific/black_footwraps.rsi/equipped-FEET.png differ diff --git a/Resources/Textures/ADT/Clothing/Shoes/Specific/blackhigh_footwraps.rsi/equipped-FEET-reptilian.png b/Resources/Textures/ADT/Clothing/Shoes/Specific/blackhigh_footwraps.rsi/equipped-FEET-reptilian.png index 2fdceef21b1..dcb17d1dbe6 100644 Binary files a/Resources/Textures/ADT/Clothing/Shoes/Specific/blackhigh_footwraps.rsi/equipped-FEET-reptilian.png and b/Resources/Textures/ADT/Clothing/Shoes/Specific/blackhigh_footwraps.rsi/equipped-FEET-reptilian.png differ diff --git a/Resources/Textures/ADT/Clothing/Shoes/Specific/blackhigh_footwraps.rsi/equipped-FEET.png b/Resources/Textures/ADT/Clothing/Shoes/Specific/blackhigh_footwraps.rsi/equipped-FEET.png index dcb17d1dbe6..2fdceef21b1 100644 Binary files a/Resources/Textures/ADT/Clothing/Shoes/Specific/blackhigh_footwraps.rsi/equipped-FEET.png and b/Resources/Textures/ADT/Clothing/Shoes/Specific/blackhigh_footwraps.rsi/equipped-FEET.png differ diff --git a/Resources/Textures/ADT/Clothing/Shoes/Specific/brown_footwraps.rsi/equipped-FEET-reptilian.png b/Resources/Textures/ADT/Clothing/Shoes/Specific/brown_footwraps.rsi/equipped-FEET-reptilian.png index b568df084cb..c53e7ee6fbf 100644 Binary files a/Resources/Textures/ADT/Clothing/Shoes/Specific/brown_footwraps.rsi/equipped-FEET-reptilian.png and b/Resources/Textures/ADT/Clothing/Shoes/Specific/brown_footwraps.rsi/equipped-FEET-reptilian.png differ diff --git a/Resources/Textures/ADT/Clothing/Shoes/Specific/brown_footwraps.rsi/equipped-FEET.png b/Resources/Textures/ADT/Clothing/Shoes/Specific/brown_footwraps.rsi/equipped-FEET.png index c53e7ee6fbf..b568df084cb 100644 Binary files a/Resources/Textures/ADT/Clothing/Shoes/Specific/brown_footwraps.rsi/equipped-FEET.png and b/Resources/Textures/ADT/Clothing/Shoes/Specific/brown_footwraps.rsi/equipped-FEET.png differ diff --git a/Resources/Textures/ADT/Clothing/Shoes/Specific/brownhigh_footwraps.rsi/equipped-FEET-reptilian.png b/Resources/Textures/ADT/Clothing/Shoes/Specific/brownhigh_footwraps.rsi/equipped-FEET-reptilian.png index 079fb8f12be..246f8e0049b 100644 Binary files a/Resources/Textures/ADT/Clothing/Shoes/Specific/brownhigh_footwraps.rsi/equipped-FEET-reptilian.png and b/Resources/Textures/ADT/Clothing/Shoes/Specific/brownhigh_footwraps.rsi/equipped-FEET-reptilian.png differ diff --git a/Resources/Textures/ADT/Clothing/Shoes/Specific/brownhigh_footwraps.rsi/equipped-FEET.png b/Resources/Textures/ADT/Clothing/Shoes/Specific/brownhigh_footwraps.rsi/equipped-FEET.png index 246f8e0049b..079fb8f12be 100644 Binary files a/Resources/Textures/ADT/Clothing/Shoes/Specific/brownhigh_footwraps.rsi/equipped-FEET.png and b/Resources/Textures/ADT/Clothing/Shoes/Specific/brownhigh_footwraps.rsi/equipped-FEET.png differ diff --git a/Resources/Textures/ADT/Clothing/Shoes/Specific/white_footwraps.rsi/equipped-FEET-reptilian.png b/Resources/Textures/ADT/Clothing/Shoes/Specific/white_footwraps.rsi/equipped-FEET-reptilian.png index f5b9a65dd6c..b9872e677f4 100644 Binary files a/Resources/Textures/ADT/Clothing/Shoes/Specific/white_footwraps.rsi/equipped-FEET-reptilian.png and b/Resources/Textures/ADT/Clothing/Shoes/Specific/white_footwraps.rsi/equipped-FEET-reptilian.png differ diff --git a/Resources/Textures/ADT/Clothing/Shoes/Specific/white_footwraps.rsi/equipped-FEET.png b/Resources/Textures/ADT/Clothing/Shoes/Specific/white_footwraps.rsi/equipped-FEET.png index b9872e677f4..f5b9a65dd6c 100644 Binary files a/Resources/Textures/ADT/Clothing/Shoes/Specific/white_footwraps.rsi/equipped-FEET.png and b/Resources/Textures/ADT/Clothing/Shoes/Specific/white_footwraps.rsi/equipped-FEET.png differ diff --git a/Resources/Textures/ADT/Clothing/Shoes/Specific/whitehigh_footwraps.rsi/equipped-FEET-reptilian.png b/Resources/Textures/ADT/Clothing/Shoes/Specific/whitehigh_footwraps.rsi/equipped-FEET-reptilian.png index 25e348153ef..1ebff7a36aa 100644 Binary files a/Resources/Textures/ADT/Clothing/Shoes/Specific/whitehigh_footwraps.rsi/equipped-FEET-reptilian.png and b/Resources/Textures/ADT/Clothing/Shoes/Specific/whitehigh_footwraps.rsi/equipped-FEET-reptilian.png differ diff --git a/Resources/Textures/ADT/Clothing/Shoes/Specific/whitehigh_footwraps.rsi/equipped-FEET.png b/Resources/Textures/ADT/Clothing/Shoes/Specific/whitehigh_footwraps.rsi/equipped-FEET.png index 1ebff7a36aa..25e348153ef 100644 Binary files a/Resources/Textures/ADT/Clothing/Shoes/Specific/whitehigh_footwraps.rsi/equipped-FEET.png and b/Resources/Textures/ADT/Clothing/Shoes/Specific/whitehigh_footwraps.rsi/equipped-FEET.png differ diff --git a/Resources/Textures/Objects/Tools/crowbar.rsi/cover-icon.png b/Resources/Textures/Objects/Tools/crowbar.rsi/cover-icon.png index bca60ba34ef..8f08c6af24b 100644 Binary files a/Resources/Textures/Objects/Tools/crowbar.rsi/cover-icon.png and b/Resources/Textures/Objects/Tools/crowbar.rsi/cover-icon.png differ diff --git a/Resources/Textures/Objects/Tools/crowbar.rsi/green-storage.png b/Resources/Textures/Objects/Tools/crowbar.rsi/green-storage.png index f0d0d68aa5e..aefbe0b4756 100644 Binary files a/Resources/Textures/Objects/Tools/crowbar.rsi/green-storage.png and b/Resources/Textures/Objects/Tools/crowbar.rsi/green-storage.png differ diff --git a/Resources/Textures/Objects/Tools/crowbar.rsi/meta.json b/Resources/Textures/Objects/Tools/crowbar.rsi/meta.json index d18e0db03cc..7c20154836e 100644 --- a/Resources/Textures/Objects/Tools/crowbar.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/crowbar.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from skyrat-tg at https://github.com/Skyrat-SS13/Skyrat-tg/commit/31156a1fcd48d67a717e7b63c11513172b28eeb1, storage and red-storage by SonicHDC", + "copyright": "Taken from skyrat-tg at https://github.com/Skyrat-SS13/Skyrat-tg/commit/31156a1fcd48d67a717e7b63c11513172b28eeb1, storage and red-storage by SonicHDC, other storage colors based on red-storage", "size": { "x": 32, "y": 32 @@ -16,10 +16,7 @@ "directions": 4 }, { - "name": "icon" - }, - { - "name": "red-icon" + "name": "icon" }, { "name": "equipped-BELT", @@ -46,6 +43,9 @@ { "name": "red-storage" }, + { + "name": "red-icon" + }, { "name": "green-storage" }, diff --git a/Resources/Textures/Objects/Tools/crowbar.rsi/orange-storage.png b/Resources/Textures/Objects/Tools/crowbar.rsi/orange-storage.png index 53713b314bb..eae9ae174d2 100644 Binary files a/Resources/Textures/Objects/Tools/crowbar.rsi/orange-storage.png and b/Resources/Textures/Objects/Tools/crowbar.rsi/orange-storage.png differ diff --git a/Resources/Textures/Objects/Tools/crowbar.rsi/yellow-storage.png b/Resources/Textures/Objects/Tools/crowbar.rsi/yellow-storage.png index 1730e7d6fa9..9cf194c2d9d 100644 Binary files a/Resources/Textures/Objects/Tools/crowbar.rsi/yellow-storage.png and b/Resources/Textures/Objects/Tools/crowbar.rsi/yellow-storage.png differ diff --git a/Resources/migration.yml b/Resources/migration.yml index 3d1c137cd6f..eca253d5538 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -169,7 +169,7 @@ TransmitterSubspaceStockPart: null ClothingHeadHatHoodRad: null # 2024-01-12 -SpaceMedipen: null +# SpaceMedipen: null - ADT_Tweak # 2024-01-18 ClothingHeadHelmetVoidParamed: null