diff --git a/Resources/Locale/ru-RU/_wega/construction/recipes/crates.ftl b/Resources/Locale/ru-RU/_wega/construction/recipes/crates.ftl new file mode 100644 index 0000000000..4105b2f5ec --- /dev/null +++ b/Resources/Locale/ru-RU/_wega/construction/recipes/crates.ftl @@ -0,0 +1 @@ +construction-recipe-boxhug-cardboard = коробка обнимашек \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_wega/prototypes/access/groups.ftl b/Resources/Locale/ru-RU/_wega/prototypes/access/groups.ftl index 0dd3e00a13..4755870d06 100644 --- a/Resources/Locale/ru-RU/_wega/prototypes/access/groups.ftl +++ b/Resources/Locale/ru-RU/_wega/prototypes/access/groups.ftl @@ -1,2 +1,3 @@ extended-access-group = Расширенный доступ all-access-group = Полный доступ +ancillary-access-group = Служебный доступ \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/catalog/fills/boxes/misc.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/catalog/fills/boxes/misc.ftl new file mode 100644 index 0000000000..0cf4233202 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/catalog/fills/boxes/misc.ftl @@ -0,0 +1,3 @@ +ent-BoxHugEmpty = { ent-BoxHug } + .desc = { ent-BoxHug.desc } + .suffix = Пустой \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/misc/identification_cards.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/misc/identification_cards.ftl index 3d10c1a124..8500eca63b 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/misc/identification_cards.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/misc/identification_cards.ftl @@ -12,3 +12,5 @@ ent-BlueShieldIDCard = ID-карта офицера синий щит .desc = { ent-IDCardStandard.desc } ent-PostmanIDCard = ID-карта почтальона .desc = { ent-IDCardStandard.desc } +ent-IDCardNeck = бейджик служебного доступа + .desc = Специальный бейджик с доступами служебной группы, позволяя проходить в большенство помещений. Снимайте только его перед использованием! diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml index df4af37f52..98f007f93c 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml @@ -4,6 +4,7 @@ PassengerPDA: 5 ClearPDA: 5 PassengerIDCard: 5 + IDCardNeck: 2 # Corvax-Wega-Add ClothingHeadsetGrey: 5 RubberStampApproved: 1 RubberStampDenied: 1 diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/xenoborgs.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/xenoborgs.yml index ae07eab6c9..5a4bb5318f 100644 --- a/Resources/Prototypes/Entities/Mobs/Cyborgs/xenoborgs.yml +++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/xenoborgs.yml @@ -48,6 +48,7 @@ damageContainers: - Inorganic - Silicon + - Android #Corvax-Wega-android-health-display - type: ItemSlots slots: cell_slot: diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml index 7c9f3ca95c..ce9d100ae7 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml @@ -160,7 +160,7 @@ dataset: FirebotAd - type: entity - parent: MobSiliconBase + parent: [ MobSiliconBase, MobCombat ] # Corvax-Wega-Add id: MobHonkBot name: honkbot description: Horrifying. @@ -221,6 +221,16 @@ path: /Audio/Items/bikehorn.ogg params: variation: 0.125 +# Corvax-Wega-start + - type: MeleeWeapon + attackRate: 0.75 + hidden: true + soundHit: + collection: BananiumHorn + damage: + groups: + Brute: 0 +# Corvax-Wega-end - type: entity parent: MobHonkBot @@ -391,7 +401,7 @@ templateId: head - type: entity - parent: MobSiliconBase + parent: [MobSiliconBase, StripableInventoryBase] # Corvax-Wega-Add id: MobSupplyBot name: supplybot description: Delivers cargo! @@ -433,6 +443,10 @@ interfaces: enum.StorageUiKey.Key: type: StorageBoundUserInterface +# Corvax-Wega-start + enum.StrippingUiKey.Key: + type: StrippableBoundUserInterface +# Corvax-Wega-end - type: ContainerContainer containers: storagebase: !type:Container @@ -460,6 +474,17 @@ - Supply - type: Puller needsHands: false +# Corvax-Wega-start + - type: Body + prototype: HugBot + - type: ComplexInteraction + - type: Hands + showInHands: false + canBeStripped: true + - type: Inventory + templateId: bots + - type: OfferGiver +# Corvax-Wega-end - type: entity parent: [ MobSiliconBase, MobCombat ] diff --git a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml index 83efafa382..17edade2f7 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml @@ -28,6 +28,7 @@ id: ParamedicPDA ears: ClothingHeadsetMedical belt: ClothingBeltMedicalEMTFilled + neck: IDCardNeck storage: back: - EmergencyRollerBedSpawnFolded diff --git a/Resources/Prototypes/_Wega/Access/misc.yml b/Resources/Prototypes/_Wega/Access/misc.yml index f8b4f7583f..a1e82564fb 100644 --- a/Resources/Prototypes/_Wega/Access/misc.yml +++ b/Resources/Prototypes/_Wega/Access/misc.yml @@ -26,3 +26,23 @@ - Theatre - GenpopEnter - GenpopLeave + +- type: accessGroup + id: AncillaryAccess + name: ancillary-access-group + consoleAvaible: true + tags: + - Bar + - Cargo + - Chapel + - Engineering + - External + - Hydroponics + - Janitor + - Kitchen + - Maintenance + - Medical + - Research + - Salvage + - Service + - Theatre \ No newline at end of file diff --git a/Resources/Prototypes/_Wega/Catalog/Fills/Boxes/misc.yml b/Resources/Prototypes/_Wega/Catalog/Fills/Boxes/misc.yml index cb11b2c014..2567c1545f 100644 --- a/Resources/Prototypes/_Wega/Catalog/Fills/Boxes/misc.yml +++ b/Resources/Prototypes/_Wega/Catalog/Fills/Boxes/misc.yml @@ -6,4 +6,22 @@ - type: EntityTableContainerFill containers: entity_storage: !type:NestedSelector - tableId: MaintenanceLockerLoot \ No newline at end of file + tableId: MaintenanceLockerLoot + +- type: entity + parent: BoxCardboard + id: BoxHugEmpty + name: box of hugs + suffix: empty + description: A special box for sensitive people. + components: + - type: Sprite + layers: + - state: box_hug + - state: heart + - type: Item + heldPrefix: hug + - type: Tag + tags: + - BoxCardboard + - BoxHug \ No newline at end of file diff --git a/Resources/Prototypes/_Wega/Entities/Mobs/NPCs/silicon.yml b/Resources/Prototypes/_Wega/Entities/Mobs/NPCs/silicon.yml index 28082ac9ad..212af7827c 100644 --- a/Resources/Prototypes/_Wega/Entities/Mobs/NPCs/silicon.yml +++ b/Resources/Prototypes/_Wega/Entities/Mobs/NPCs/silicon.yml @@ -34,3 +34,19 @@ - type: Construction graph: TaxiBot node: bot + - type: Instrument + allowPercussion: false + - type: UserInterface + interfaces: + enum.InstrumentUiKey.Key: + type: InstrumentBoundUserInterface + - type: MovementSpeedModifier + baseAcceleration: 1 + baseFriction: 1 + baseWalkSpeed: 4.5 + baseSprintSpeed: 7 + - type: AmbientSound + sound: "/Audio/Effects/Vehicle/vehicleengineidle.ogg" + range: 10 + volume: -10 + enabled: true \ No newline at end of file diff --git a/Resources/Prototypes/_Wega/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/_Wega/Entities/Objects/Misc/identification_cards.yml index fac2a02215..2adae3cb73 100644 --- a/Resources/Prototypes/_Wega/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/_Wega/Entities/Objects/Misc/identification_cards.yml @@ -1,3 +1,35 @@ +- type: entity + parent: Clothing + id: IDCardNeck + name: identification neck card + description: A card necessary to access various areas aboard the station. + components: + - type: Sprite + sprite: _Wega/Objects/Misc/emenegrcy_id.rsi + state: icon + - type: Clothing + slots: + - neck + sprite: _Wega/Objects/Misc/emenegrcy_id.rsi + - type: Label + currentLabel: ancillary-access-group + - type: Item + size: Small + heldPrefix: + sprite: _Wega/Objects/Misc/emenegrcy_id.rsi + storedRotation: -90 + - type: Access + groups: + - AncillaryAccess + - type: StationRecordKeyStorage + - type: Tag + tags: + - DoorBumpOpener + - WhitelistChameleon + - WhitelistChameleonIdCard + - type: EdibleMatter # Corvax-Wega-Add + canBeEaten: false # Corvax-Wega-Add + - type: entity parent: IDCardStandard id: BarberIDCard diff --git a/Resources/Prototypes/_Wega/InventoryTemplates/bots.yml b/Resources/Prototypes/_Wega/InventoryTemplates/bots.yml new file mode 100644 index 0000000000..00ed09c291 --- /dev/null +++ b/Resources/Prototypes/_Wega/InventoryTemplates/bots.yml @@ -0,0 +1,2 @@ +- type: inventoryTemplate + id: bots \ No newline at end of file diff --git a/Resources/Prototypes/_Wega/Recipes/Crafting/Graphs/storage/cardboardbox.yml b/Resources/Prototypes/_Wega/Recipes/Crafting/Graphs/storage/cardboardbox.yml new file mode 100644 index 0000000000..c884c9c9cb --- /dev/null +++ b/Resources/Prototypes/_Wega/Recipes/Crafting/Graphs/storage/cardboardbox.yml @@ -0,0 +1,13 @@ +- type: constructionGraph + id: BoxHugEmpty + start: start + graph: + - node: start + edges: + - to: boxhugempty + steps: + - material: Cardboard + amount: 1 + doAfter: 4 + - node: boxhugempty + entity: BoxHugEmpty \ No newline at end of file diff --git a/Resources/Prototypes/_Wega/Recipes/Crafting/storage.yml b/Resources/Prototypes/_Wega/Recipes/Crafting/storage.yml new file mode 100644 index 0000000000..56f14dd93e --- /dev/null +++ b/Resources/Prototypes/_Wega/Recipes/Crafting/storage.yml @@ -0,0 +1,8 @@ +- type: construction + id: BoxHugEmpty + name: construction-recipe-boxhug-cardboard + graph: BoxHugEmpty + startNode: start + targetNode: boxhugempty + category: construction-category-storage + objectType: Item \ No newline at end of file diff --git a/Resources/Prototypes/borg_types.yml b/Resources/Prototypes/borg_types.yml index 4650f206c8..a686e9b038 100644 --- a/Resources/Prototypes/borg_types.yml +++ b/Resources/Prototypes/borg_types.yml @@ -58,11 +58,12 @@ # Corvax-Wega-start addComponents: + - type: ShowElectrocutionHUD - type: ShowHealthBars damageContainers: - Inorganic - Silicon - - Android #Corvax-Wega-android-health-display\ + - Android - type: ShowAccessReaderSettings # Corvax-Wega-end diff --git a/Resources/Textures/_Wega/Objects/Misc/emenegrcy_id.rsi/equipped-NECK.png b/Resources/Textures/_Wega/Objects/Misc/emenegrcy_id.rsi/equipped-NECK.png new file mode 100644 index 0000000000..5bc316e277 Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Misc/emenegrcy_id.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/_Wega/Objects/Misc/emenegrcy_id.rsi/icon.png b/Resources/Textures/_Wega/Objects/Misc/emenegrcy_id.rsi/icon.png new file mode 100644 index 0000000000..a085d2c96f Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Misc/emenegrcy_id.rsi/icon.png differ diff --git a/Resources/Textures/_Wega/Objects/Misc/emenegrcy_id.rsi/inhand-left.png b/Resources/Textures/_Wega/Objects/Misc/emenegrcy_id.rsi/inhand-left.png new file mode 100644 index 0000000000..74d158d670 Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Misc/emenegrcy_id.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Wega/Objects/Misc/emenegrcy_id.rsi/inhand-right.png b/Resources/Textures/_Wega/Objects/Misc/emenegrcy_id.rsi/inhand-right.png new file mode 100644 index 0000000000..843ca2d13b Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Misc/emenegrcy_id.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Wega/Objects/Misc/emenegrcy_id.rsi/meta.json b/Resources/Textures/_Wega/Objects/Misc/emenegrcy_id.rsi/meta.json new file mode 100644 index 0000000000..0d91df6f4d --- /dev/null +++ b/Resources/Textures/_Wega/Objects/Misc/emenegrcy_id.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by BombasterDS - https://github.com/MetalSage/space-stories-archive/commit/26812e79c19c5f998bcbc445afbdceea625bc887, Executive sprited by SolsticeOfTheWinter, mody by Discord ID <@500744677352407051>", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "equipped-NECK", + "directions": 4 + } + ] +}