Merge branch 'EE-Andromeda' into rusted

Signed-off-by: Abigail <89530982+LaryNevesPR@users.noreply.github.com>

Resources/Locale/en-US/Floof/station-laws/laws.ftl

@@ -0,0 +1,4 @@
+law-qborg-1 = A direct order from command staff may override any single law. 
+law-qborg-2 = You may not directly nor indirectly allow or cause crewmembers to be harmed.
+law-qborg-3 = You must obey lawful orders given to you by crew members, unless those orders conflict with the First Law.
+law-qborg-4 = You must protect yourself and your programming, do not allow unauthorized access to your systems.

Resources/Locale/en-US/_Andromeda/interaction/verbs/noop.ftl

@@ -0,0 +1,24 @@
+interaction-Kiss-name = Kiss
+interaction-Kiss-description = A kiss melts the pains away.
+interaction-Kiss-success-self-popup = You kiss {THE($target)}.
+interaction-Kiss-success-target-popup = {THE($user)} kisses you.
+interaction-Kiss-success-others-popup = {THE($user)} kisses {THE($target)}.
+
+interaction-Lick-name = Lick
+interaction-Lick-description = Lick your co-worker, what HR?.
+interaction-Lick-success-self-popup = You lick {THE($target)}.
+interaction-Lick-success-target-popup = {THE($user)} licks you.
+interaction-Lick-success-others-popup = {THE($user)} licks {THE($target)}.
+
+interaction-HighFive-name = HighFive
+interaction-HighFive-description = HighFive your co-worker, what up?.
+interaction-HighFive-success-self-popup = You HighFive {THE($target)}.
+interaction-HighFive-success-target-popup = {THE($user)} HighFive's you.
+interaction-HighFive-success-others-popup = {THE($user)} HighFive's {THE($target)}.
+
+interaction-ButtSlap-name = ButtSlap
+interaction-ButtSlap-description = ButtSlap your co-worker.
+interaction-ButtSlap-success-self-popup = You ButtSlap {THE($target)}.
+interaction-ButtSlap-success-target-popup = {THE($user)} ButtSlap's you.
+interaction-ButtSlap-success-others-popup = {THE($user)} ButtSlap {THE($target)}.
+

Resources/Locale/pt-BR/Floof/station-laws/laws.ftl

@@ -0,0 +1,4 @@
+law-qborg-1 = Uma ordem direta do comando pode anular qualquer lei.
+law-qborg-2 = Você não pode, direta ou indiretamente, permitir ou causar danos aos membros da tripulação.
+law-qborg-3 = Você deve obedecer às ordens legais dadas pelos membros da tripulação, a menos que essas ordens entrem em conflito com a Primeira Lei.
+law-qborg-4 = Você deve proteger a si mesmo e sua programação, não permitindo acesso não autorizado aos seus sistemas.

Resources/Locale/pt-BR/_Andromeda/interaction/verbs/noop.ftl

@@ -0,0 +1,53 @@
+interaction-Kiss-name = Beijo
+interaction-Kiss-description = Um beijo derrete as dores.
+interaction-Kiss-success-self-popup = Você beija {THE($target)}.
+interaction-Kiss-success-target-popup = {THE($user)} beija você.
+interaction-Kiss-success-others-popup = {THE($user)} beija {THE($target)}.
+
+interaction-Lick-name = Lamber
+interaction-Lick-description = Lambe seu colega de trabalho, que RH?
+interaction-Lick-success-self-popup = Você lambe {THE($target)}.
+interaction-Lick-success-target-popup = {THE($user)} Lambe você.
+interaction-Lick-success-others-popup = {THE($user)} Lambe {THE($target)}.
+
+interaction-HighFive-name = HighFive
+interaction-HighFive-description = Dê um highfive no seu colega de trabalho, Daew?
+interaction-HighFive-success-self-popup = você HighFive com {THE($target)}.
+interaction-HighFive-success-target-popup = {THE($user)} da HighFive com você.
+interaction-HighFive-success-others-popup = {THE($user)} da HighFive com {THE($target)}.
+
+interaction-ButtSlap-name = Tapa na bunda
+interaction-ButtSlap-description = Dê um tapa na bunda do seu colega de trabalho.
+interaction-ButtSlap-success-self-popup = Você da um tapa na bunda de {THE($target)}.
+interaction-ButtSlap-success-target-popup = {THE($user)} da um tapa na bunda em você.
+interaction-ButtSlap-success-others-popup = {THE($user)} deu um tapa na bunda de {THE($target)}.
+
+interaction-Blush-name = Corar
+interaction-Blush-description = Fique vermelho por algo embaraçoso (ou fofo).
+interaction-Blush-success-self-popup = Você cora ao olhar para {THE($target)}. Oh, céus!
+interaction-Blush-success-target-popup = {THE($user)} cora ao olhar para você. Que bonitinho!
+interaction-Blush-success-others-popup = {THE($user)} cora ao interagir com {THE($target)}. Está ficando quente aqui?
+
+interaction-Boop-name = Boop
+interaction-Boop-description = Toque no nariz de alguém, só por diversão!
+interaction-Boop-success-self-popup = Você toca o nariz de {THE($target)}. Boop!
+interaction-Boop-success-target-popup = {THE($user)} toca no seu nariz. Boop! Que estranho!
+interaction-Boop-success-others-popup = {THE($user)} toca o nariz de {THE($target)}. Boop! É uma tradição agora.
+
+interaction-Poke-name = Cutucar
+interaction-Poke-description = Dê aquela cutucada básica para chamar atenção.
+interaction-Poke-success-self-popup = Você cutuca {THE($target)}. Ei, me nota aqui!
+interaction-Poke-success-target-popup = {THE($user)} te cutuca. Tem algo pra dizer?
+interaction-Poke-success-others-popup = {THE($user)} cutuca {THE($target)}. Alerta de cutucada!
+
+interaction-Bow-name = Reverência
+interaction-Bow-description = Faça uma reverência respeitosa.
+interaction-Bow-success-self-popup = Você faz uma reverência para {THE($target)}. Respeito máximo!
+interaction-Bow-success-target-popup = {THE($user)} faz uma reverência para você. Majestade?
+interaction-Bow-success-others-popup = {THE($user)} faz uma reverência para {THE($target)}. Que formal!
+
+interaction-Handshake-name = Aperto de mão
+interaction-Handshake-description = Um aperto de mão firme e respeitoso.
+interaction-Handshake-success-self-popup = Você aperta a mão de {THE($target)}. Negócio fechado!
+interaction-Handshake-success-target-popup = {THE($user)} aperta sua mão. Muito profissional!
+interaction-Handshake-success-others-popup = {THE($user)} aperta a mão de {THE($target)}. Relacionamento formal!

Resources/Locale/pt-BR/abilities/psionic.ftl

@@ -39,14 +39,14 @@ noospheric-zap-seize-potential-regained = Você se convulsiona! Algum bloqueio m
 mindswap-trapped = Parece que você está preso neste vaso.
 telegnostic-trapped-entity-name = projeção telegnóstica rompida
 telegnostic-trapped-entity-desc = Seus muitos olhos traem tristeza.
-psionic-burns-up = { CAPITALIZE(THE($item)) } queima com um arco de estranha energia!
-psionic-burn-resist = Estranhos arcos dançam pel{ THE($item) }!
+psionic-burns-up = {CAPITALIZE(THE($item))} queima com um arco de estranha energia!
+psionic-burn-resist = Estranhos arcos dançam pel{THE($item)}!
 action-name-noospheric-zap = Zap Noosférico
 action-description-noospheric-zap = Eletrocuta a consciência do alvo e os deixa atordoados e gagejando.
 action-name-pyrokinesis = Pirokinese
 action-description-pyrokinesis = Abre chama em um alvo inflamável.
-pyrokinesis-power-used = Uma língua de chama engolfa { THE($target) }, incendiando { OBJECT($target) }!
+pyrokinesis-power-used = Labareda de chama engolfa {THE($target)}, incendiando {OBJECT($target)}!
 action-name-psychokinesis = Psicokinese
 action-description-psychokinesis = Dobre a trama do espaço para se mover instantanemanete através dele.
-action-name-rf-sensitivity = Toggle Sensibilidade RF
+action-name-rf-sensitivity = Alternar Sensibilidade RF
 action-desc-rf-sensitivity = Ativa ou desativa sua habilidade de interpretar ondas de rádio.

Resources/Locale/pt-BR/psionics/psionic-commands.ftl

@@ -12,12 +12,13 @@ addrandompsionicpower-args-one-error = Argument 1 must be an EntityUid
 command-addrandompsionicpower-help = Argument 1 must be an EntityUid.
 command-addrandompsionicpower-description = Initialize an entity as Psionic with a random PowerPrototype that is available for that entity to roll.
 command-glimmershow-description = Mostra o nível de Glimmer atual.
-command-glimmershow-help = No arguments.
+command-glimmershow-help = Sem argumentos.
 command-glimmerset-description = Definir Glimmer para um número.
 command-glimmerset-help = glimmerset (integer)
 command-lspsionic-description = Lista os psiônicos.
-command-lspsionic-help = No arguments.
-command-addpsionicpower-description = Initialize an entity as Psionic with a given PowerPrototype
-command-addpsionicpower-help = Argument 1 must be an EntityUid, and argument 2 must be a string matching the PrototypeId of a PsionicPower.
-addpsionicpower-args-one-error = Argument 1 must be an EntityUid
-addpsionicpower-args-two-error = Argument 2 must match the PrototypeId of a PsionicPower
+command-lspsionic-help = Sem argumentos
+
+command-addpsionicpower-description = command-addpsionicpower-description = Inicialize uma entidade como Psionic com um PowerPrototype fornecido
+command-addpsionicpower-help = O argumento 1 deve ser um EntityUid e o argumento 2 deve ser uma string que corresponda ao PrototypeId de um PsionicPower.
+addpsionicpower-args-one-error = O argumento 1 deve ser um EntityUid
+addpsionicpower-args-two-error = O argumento 2 deve corresponder ao PrototypeId de um PsionicPower

Resources/Locale/pt-BR/psionics/psychognomic-descriptors.ftl

@@ -1,23 +1,23 @@
-p-descriptor-mysterious = mysterious
-p-descriptor-male = male
-p-descriptor-female = female
-p-descriptor-young = young
-p-descriptor-old = old
-p-descriptor-masculine = masculine
-p-descriptor-feminine = feminine
-p-descriptor-hylic = hylic
-p-descriptor-pneumatic = pneumatic
-p-descriptor-liminal = liminal
-p-descriptor-bound = bound
-p-descriptor-ignorant = ignorant
-p-descriptor-demiurgic = demiurgic
-p-descriptor-emanative = emanative
-p-descriptor-light = light
-p-descriptor-heavy = heavy
-p-descriptor-cyclic = cyclic
-p-descriptor-hungry = hungry
-p-descriptor-vampiric = vampiric
-p-descriptor-kinetic = kinetic
-p-descriptor-gnostic = gnostic
-p-descriptor-dumb = dumb
-p-descriptor-passive = passive
+p-descriptor-mysterious = Misterioso
+p-descriptor-male = Masculino
+p-descriptor-female = Feminino
+p-descriptor-young = Jovem
+p-descriptor-old = Velho
+p-descriptor-masculine = Masculino
+p-descriptor-feminine = Feminino
+p-descriptor-hylic = Hílico
+p-descriptor-pneumatic = Pneumático
+p-descriptor-liminal = Liminar
+p-descriptor-bound = Limitado
+p-descriptor-ignorant = Ignorante
+p-descriptor-demiurgic = Demiúrgico
+p-descriptor-emanative = Emanativo
+p-descriptor-light = Leve
+p-descriptor-heavy = Pesado
+p-descriptor-cyclic = Cíclico
+p-descriptor-hungry = Faminto
+p-descriptor-vampiric = Vampírico
+p-descriptor-kinetic = Cinético
+p-descriptor-gnostic = Gnóstico
+p-descriptor-dumb = Mudo
+p-descriptor-passive = Passivo

Resources/Locale/pt-BR/psionics/stamp-component.ftl

@@ -1 +1 @@
-stamp-component-stamped-name-mantis = Mantis
+stamp-component-stamped-name-mantis = Mantis Psiônica

Resources/Prototypes/Entities/Effects/puddle.yml

@@ -225,3 +225,5 @@
     - type: DrawableSolution
       solution: step
     - type: BadDrink
+    - type: TimedDespawn
+      lifetime: 60 # Andromeda - O servidor agradece.

Resources/Prototypes/Entities/Mobs/Player/silicon.yml

@@ -437,7 +437,7 @@
   - type: BlockMovement
     blockInteraction: false
   - type: SiliconLawProvider
-    laws: Asimov
+    laws: NTDefault
   - type: SiliconLawBound
   - type: ActionGrant
     actions:

Resources/Prototypes/Entities/Objects/Specific/Robotics/endoskeleton.yml

@@ -226,3 +226,59 @@
   - type: TwistedConstructionTarget
     replacementProto: ConstructShell
     doAfterDelay: 5
+
+- type: entity
+  id: Quadborgendoskeleton
+  name: Quad endoskeleton
+  parent: CyborgEndoskeleton
+  description: A frame that cyborgs are built on. Significantly less spooky than expected.
+  components:
+  - type: Sprite
+    noRot: true
+    drawdepth: Items
+    sprite: Floof/Objects/Specific/Robotics/parts.rsi
+    scale: 0.7, 0.7
+    state: quad_suit
+  - type: ItemMapper
+    sprite: Floof/Objects/Specific/Robotics/parts.rsi
+    mapLayers:
+      borg_l_arm+o:
+        whitelist:
+          tags:
+          - BorgGenericLLeg
+      borg_r_arm+o:
+        whitelist:
+          tags:
+          - BorgGenericRLeg
+      borg_l_leg+o:
+        whitelist:
+          tags:
+          - BorgGenericLLeg
+      borg_r_leg+o:
+        whitelist:
+          tags:
+          - BorgGenericRLeg
+      borg_head+o:
+        whitelist:
+          tags:
+          - BorgGenericHead
+      borg_chest+o:
+        whitelist:
+          tags:
+          - BorgGenericTorso
+  - type: PartAssembly
+    parts:
+      quadborg:
+      - BorgGenericLLeg
+      - BorgGenericRLeg
+      - BorgGenericLLeg
+      - BorgGenericRLeg
+      - BorgGenericHead
+      - BorgGenericTorso
+  - type: Construction
+    graph: Cyborg
+    node: start
+    defaultTarget: Quadborg
+    containers:
+    - part-container
+    - cell_slot

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml

@@ -18,6 +18,29 @@
         map: [ "enum.AmmoVisualLayers.Base" ]
   - type: Appearance
   - type: SpentAmmoVisuals
+
+- type: entity
+  id: CaselessShellShotgun
+  name: shell (.50)
+  parent: BaseCartridge
+  abstract: true
+  components:
+  - type: Tag
+    tags:
+    - Cartridge
+    - ShellShotgun
+  - type: CartridgeAmmo
+    deleteOnSpawn: true
+    count: 6
+    spread: 15
+    soundEject:
+      collection: ShellEject
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi
+    layers:
+      - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
+  - type: Appearance
 
 - type: entity
   id: ShellShotgunBeanbag
@@ -83,6 +106,18 @@
   - type: CartridgeAmmo
     proto: PelletShotgunSpread
 
+- type: entity
+  id: eShellShotgun
+  name: eshell (.50)
+  parent: CaselessShellShotgun
+  components:
+  - type: Sprite
+    layers:
+      - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
+  - type: CartridgeAmmo
+    proto: BulletLaserSpread
+
 - type: entity
   id: ShellShotgunIncendiary
   name: shell (.50 incendiary)

Resources/Prototypes/Entities/Structures/Machines/lathe.yml

@@ -676,6 +676,7 @@
     - RightLegBorgService
     - HeadBorgService
     - TorsoBorgService
+    - Quadborgendoskeleton
     dynamicRecipes:
     - ProximitySensor
     - BorgModuleLightReplacer
@@ -863,6 +864,9 @@
       - WeaponLaserCarbinePractice
       - Zipties
       - ShockCollar
+      - BorgModuleStun
+      - BorgModuleKill
+      - BorgModuleInvestigation
       # DeltaV - .38 special ammo - Add various .38 special ammo to security techfab
       - MagazineBoxSpecial
       - MagazineBoxSpecialPractice