diagonal window glass and pirate shuttle improvements (#21174)

* shuttle and priate improvements

* fix

* fix damn ubuntu

* darkened syndi airlocks

* fix

* fix ruranium

* added prison cell to pirate ship

Content.Server/GameTicking/Rules/PiratesRuleSystem.cs

@@ -8,6 +8,7 @@ using Content.Server.Preferences.Managers;
 using Content.Server.Spawners.Components;
 using Content.Server.Station.Components;
 using Content.Server.Station.Systems;
+using Content.Server.NPC.Systems;
 using Content.Shared.CCVar;
 using Content.Shared.Humanoid;
 using Content.Shared.Mind;
@@ -40,6 +41,7 @@ public sealed class PiratesRuleSystem : GameRuleSystem<PiratesRuleComponent>
     [Dependency] private readonly PricingSystem _pricingSystem = default!;
     [Dependency] private readonly MapLoaderSystem _map = default!;
     [Dependency] private readonly NamingSystem _namingSystem = default!;
+    [Dependency] private readonly NpcFactionSystem _npcFaction = default!;
     [Dependency] private readonly SharedMindSystem _mindSystem = default!;
     [Dependency] private readonly SharedAudioSystem _audioSystem = default!;
     [Dependency] private readonly MetaDataSystem _metaData = default!;
@@ -222,6 +224,9 @@ public sealed class PiratesRuleSystem : GameRuleSystem<PiratesRuleComponent>
                 var profile = _prefs.GetPreferences(session.UserId).SelectedCharacter as HumanoidCharacterProfile;
                 _stationSpawningSystem.EquipStartingGear(mob, pirateGear, profile);
 
+                _npcFaction.RemoveFaction(mob, "NanoTrasen", false);
+                _npcFaction.AddFaction(mob, "Syndicate");
+
                 pirates.Pirates.Add(newMind);
 
                 // Notificate every player about a pirate antagonist role with sound

Resources/Maps/Shuttles/striker.yml

@@ -2605,4 +2605,4 @@ entities:
     - pos: 1.60798,-0.3062118
       parent: 325
       type: Transform
-...
+...

Resources/Prototypes/Entities/Clothing/Head/helmets.yml

@@ -351,3 +351,14 @@
   - type: Construction
     graph: BoneHelmet
     node: helmet
+
+- type: entity
+  parent: ClothingHeadHelmetBasic
+  id: ClothingHeadHelmetPodWars
+  name: ironclad II helmet
+  description: An ironclad II helmet, a relic of the pod wars.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Helmets/podwars_helmet.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Helmets/podwars_helmet.rsi

Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml

@@ -280,3 +280,22 @@
   - type: Construction
     graph: BoneArmor
     node: armor
+
+- type: entity
+  parent: ClothingOuterBaseLarge
+  id: ClothingOuterArmorPodWars
+  name: ironclad II armor
+  description: A repurposed suit of ironclad II armor, a relic of the pod wars.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Armor/podwars_armor.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Armor/podwars_armor.rsi
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.5
+        Slash: 0.5
+        Piercing: 0.6
+        Heat: 0.5
+  - type: GroupExamine

Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml

@@ -651,6 +651,8 @@
     sprintModifier: 0.6
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetHardsuitPirateEVA
+  - type: StaticPrice
+    price: 0
 
 #Pirate Captain Hardsuit
 - type: entity
@@ -681,7 +683,8 @@
     sprintModifier: 0.8
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetHardsuitPirateCap
-
+  - type: StaticPrice
+    price: 0
 
 #CENTCOMM / ERT HARDSUITS
 #ERT Leader Hardsuit

Resources/Prototypes/Entities/Objects/Devices/pda.yml

@@ -949,3 +949,15 @@
     accentVColor: "#DFDFDF"
   - type: Icon
     state: pda-seniorofficer
+
+- type: entity
+  parent: SyndiPDA
+  id: PiratePDA
+  name: pirate PDA
+  description: Yargh!
+  components:
+  - type: Pda
+    id: PirateIDCard
+    state: pda-pirate
+  - type: Icon
+    state: pda-pirate

Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml

@@ -624,6 +624,19 @@
     - NuclearOperative
     - SyndicateAgent
 
+- type: entity
+  parent: IDCardStandard
+  id: PirateIDCard
+  name: pirate ID card
+  components:
+  - type: Sprite
+    layers:
+    - state: pirate
+  - type: Access
+    tags:
+    - NuclearOperative
+    - SyndicateAgent
+
 - type: entity
   parent: IDCardStandard
   id: PsychologistIDCard

Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml

@@ -220,6 +220,8 @@
     graph: ShotgunSawn
     node: shotgunsawn
     deconstructionTarget: null
+  - type: StaticPrice
+    price: 0
 
 - type: entity
   name: blunderbuss
@@ -234,6 +236,8 @@
     fireRate: 2
   - type: BallisticAmmoProvider
     capacity: 1
+  - type: StaticPrice
+    price: 0
 
 - type: entity
   name: improvised shotgun
@@ -254,7 +258,7 @@
     graph: ImprovisedShotgunGraph
     node: shotgun
   - type: StaticPrice
-    price: 400
+    price: 20
 
 - type: entity
   name: improvised shotgun

Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml

@@ -100,3 +100,5 @@
         - CartridgeAntiMateriel
     capacity: 1
     proto: CartridgeAntiMateriel
+  - type: StaticPrice
+    price: 0

Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml

@@ -805,7 +805,7 @@
     access: [["External"]]
 
 - type: entity
-  parent: AirlockShuttle
+  parent: AirlockShuttleSyndicate
   id: AirlockExternalShuttleSyndicateLocked
   suffix: External, Docking, Syndicate, Locked
   components:
@@ -813,7 +813,7 @@
     access: [["SyndicateAgent"]]
 
 - type: entity
-  parent: AirlockShuttle
+  parent: AirlockShuttleSyndicate
   id: AirlockExternalShuttleNukeopLocked
   suffix: External, Docking, Nukeop, Locked
   components:
@@ -828,6 +828,22 @@
   - type: AccessReader
     access: [["External"]]
 
+- type: entity
+  parent: AirlockGlassShuttleSyndicate
+  id: AirlockExternalGlassShuttleSyndicateLocked
+  suffix: Syndicate, Locked, Glass
+  components:
+  - type: AccessReader
+    access: [["SyndicateAgent"]]
+
+- type: entity
+  parent: AirlockGlassShuttleSyndicate
+  id: AirlockExternalGlassShuttleNukeopLocked
+  suffix: Nukeop, Locked, Glass
+  components:
+  - type: AccessReader
+    access: [["NuclearOperative"]]
+
 - type: entity
   parent: AirlockGlassShuttle
   id: AirlockExternalGlassShuttleEmergencyLocked

Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml

@@ -120,3 +120,47 @@
   - type: Construction
     graph: AirlockShuttle
     node: assembly
+
+- type: entity
+  id: AirlockGlassShuttleSyndicate
+  parent: AirlockShuttle
+  name: external airlock
+  suffix: Glass, Docking
+  description: Necessary for connecting two space craft together.
+  components:
+  - type: Docking
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Glass/shuttle_syndicate.rsi
+    snapCardinals: false
+    layers:
+    - state: closed
+      map: ["enum.DoorVisualLayers.Base"]
+    - state: closed_unlit
+      shader: unshaded
+      map: ["enum.DoorVisualLayers.BaseUnlit"]
+    - state: welded
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: bolted_unlit
+      shader: unshaded
+      map: ["enum.DoorVisualLayers.BaseBolted"]
+    - state: emergency_unlit
+      shader: unshaded
+      map: ["enum.DoorVisualLayers.BaseEmergencyAccess"]
+    - state: panel_open
+      map: ["enum.WiresVisualLayers.MaintenancePanel"]
+  - type: Occluder
+    enabled: false
+  - type: PaintableAirlock
+    group: ShuttleGlass
+  - type: Door
+    occludes: false
+
+- type: entity
+  parent: AirlockShuttle
+  id: AirlockShuttleSyndicate
+  suffix: Docking
+  name: external airlock
+  description: Necessary for connecting two space craft together.
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Standard/shuttle_syndicate.rsi

Resources/Prototypes/Entities/Structures/Walls/grille.yml

@@ -124,3 +124,38 @@
               node: start
             - !type:DoActsBehavior
               acts: ["Destruction"]
+
+- type: entity
+  id: GrilleDiagonal
+  parent: Grille
+  name: diagonal grille
+  components:
+    - type: Sprite
+      drawdepth: Walls
+      sprite: Structures/Walls/grille.rsi
+      layers:
+        - state: grille_diagonal
+        - state: electrified_diagonal
+          sprite: Effects/electricity.rsi
+          map: ["enum.ElectrifiedLayers.Powered"]
+          shader: unshaded
+          visible: false
+    - type: Icon
+      sprite: Structures/Walls/grille.rsi
+      state: grille_diagonal
+    - type: Fixtures
+      fixtures:
+        fix1:
+          shape:
+            !type:PolygonShape
+              vertices:
+              - "-0.5,-0.5"
+              - "0.5,0.5"
+              - "0.5,-0.5"
+          mask:
+          - FullTileMask
+          layer:
+          - WallLayer
+    - type: Construction
+      graph: GrilleDiagonal
+      node: grilleDiagonal

Resources/Prototypes/Entities/Structures/Windows/plasma.yml

@@ -81,3 +81,44 @@
         acts: [ "Destruction" ]
   - type: StaticPrice
     price: 30
+
+- type: entity
+  parent: PlasmaWindow
+  id: PlasmaWindowDiagonal
+  name: diagonal plasma window
+  suffix: diagonal
+  placement:
+    mode: SnapgridCenter
+    snap:
+    - Window
+  components:
+  - type: Sprite
+    drawdepth: WallTops
+    sprite: Structures/Windows/plasma_diagonal.rsi
+    state: state0
+  - type: IconSmooth
+    mode: Diagonal
+    key: windows
+    base: state
+  - type: Icon
+    sprite: Structures/Windows/plasma_diagonal.rsi
+    state: state0
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PolygonShape
+            vertices:
+            - "-0.5,-0.5"
+            - "0.5,0.5"
+            - "0.5,-0.5"
+        mask:
+        - FullTileMask
+        layer:
+        - GlassLayer
+  - type: DamageVisuals
+    damageOverlay:
+      sprite: Structures/Windows/cracks_diagonal.rsi
+  - type: Construction
+    graph: WindowDiagonal
+    node: plasmaWindowDiagonal

Resources/Prototypes/Entities/Structures/Windows/reinforced.yml

@@ -107,3 +107,44 @@
         acts: [ "Destruction" ]
   - type: StaticPrice
     price: 22
+
+- type: entity
+  parent: ReinforcedWindow
+  id: ReinforcedWindowDiagonal
+  name: reinforced window diagonal
+  suffix: diagonal
+  placement:
+    mode: SnapgridCenter
+    snap:
+    - Window
+  components:
+  - type: Sprite
+    drawdepth: WallTops
+    sprite: Structures/Windows/reinforced_window_diagonal.rsi
+    state: state0
+  - type: IconSmooth
+    mode: Diagonal
+    key: windows
+    base: state
+  - type: Icon
+    sprite: Structures/Windows/reinforced_window_diagonal.rsi
+    state: state0
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PolygonShape
+            vertices:
+            - "-0.5,-0.5"
+            - "0.5,0.5"
+            - "0.5,-0.5"
+        mask:
+        - FullTileMask
+        layer:
+        - GlassLayer
+  - type: DamageVisuals
+    damageOverlay:
+      sprite: Structures/Windows/cracks_diagonal.rsi
+  - type: Construction
+    graph: WindowDiagonal
+    node: reinforcedWindowDiagonal

Resources/Prototypes/Entities/Structures/Windows/rplasma.yml

@@ -99,3 +99,44 @@
         acts: [ "Destruction" ]
   - type: StaticPrice
     price: 66
+
+- type: entity
+  parent: ReinforcedPlasmaWindow
+  id: ReinforcedPlasmaWindowDiagonal
+  name: diagonal reinforced plasma window
+  suffix: diagonal
+  placement:
+    mode: SnapgridCenter
+    snap:
+    - Window
+  components:
+  - type: Sprite
+    drawdepth: WallTops
+    sprite: Structures/Windows/reinforced_plasma_diagonal.rsi
+    state: state0
+  - type: IconSmooth
+    mode: Diagonal
+    key: windows
+    base: state
+  - type: Icon
+    sprite: Structures/Windows/reinforced_plasma_diagonal.rsi
+    state: state0
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PolygonShape
+            vertices:
+            - "-0.5,-0.5"
+            - "0.5,0.5"
+            - "0.5,-0.5"
+        mask:
+        - FullTileMask
+        layer:
+        - GlassLayer
+  - type: DamageVisuals
+    damageOverlay:
+      sprite: Structures/Windows/cracks_diagonal.rsi
+  - type: Construction
+    graph: WindowDiagonal
+    node: reinforcedPlasmaWindowDiagonal

Resources/Prototypes/Entities/Structures/Windows/ruranium.yml

@@ -52,3 +52,44 @@
     price: 140
   - type: RadiationBlocker
     resistance: 5
+
+- type: entity
+  parent: ReinforcedUraniumWindow
+  id: ReinforcedUraniumWindowDiagonal
+  name: diagonal reinforced uranium window
+  suffix: diagonal
+  placement:
+    mode: SnapgridCenter
+    snap:
+    - Window
+  components:
+  - type: Sprite
+    drawdepth: WallTops
+    sprite: Structures/Windows/reinforced_uranium_diagonal.rsi
+    state: state0
+  - type: IconSmooth
+    mode: Diagonal
+    key: windows
+    base: state
+  - type: Icon
+    sprite: Structures/Windows/reinforced_uranium_diagonal.rsi
+    state: state0
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PolygonShape
+            vertices:
+            - "-0.5,-0.5"
+            - "0.5,0.5"
+            - "0.5,-0.5"
+        mask:
+        - FullTileMask
+        layer:
+        - GlassLayer
+  - type: DamageVisuals
+    damageOverlay:
+      sprite: Structures/Windows/cracks_diagonal.rsi
+  - type: Construction
+    graph: WindowDiagonal
+    node: reinforcedUraniumWindowDiagonal

Resources/Prototypes/Entities/Structures/Windows/shuttle.yml

@@ -47,3 +47,41 @@
       sprite: Structures/Windows/cracks.rsi
   - type: StaticPrice
     price: 75
+
+- type: entity
+  parent: ShuttleWindow
+  id: ShuttleWindowDiagonal
+  name: diagonal shuttle window
+  suffix: diagonal
+  placement:
+    mode: SnapgridCenter
+    snap:
+    - Window
+  components:
+  - type: Sprite
+    drawdepth: WallTops
+    sprite: Structures/Windows/shuttle_window_diagonal.rsi
+    state: state0
+  - type: IconSmooth
+    mode: Diagonal
+    key: windows
+    base: state
+  - type: Icon
+    sprite: Structures/Windows/shuttle_window_diagonal.rsi
+    state: state0
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PolygonShape
+            vertices:
+            - "-0.5,-0.5"
+            - "0.5,0.5"
+            - "0.5,-0.5"
+        mask:
+        - FullTileMask
+        layer:
+        - GlassLayer
+  - type: DamageVisuals
+    damageOverlay:
+      sprite: Structures/Windows/cracks_diagonal.rsi

Resources/Prototypes/Entities/Structures/Windows/uranium.yml

@@ -44,3 +44,44 @@
     price: 80
   - type: RadiationBlocker
     resistance: 3
+
+- type: entity
+  parent: UraniumWindow
+  id: UraniumWindowDiagonal
+  name: diagonal uranium window
+  suffix: diagonal
+  placement:
+    mode: SnapgridCenter
+    snap:
+    - Window
+  components:
+  - type: Sprite
+    drawdepth: WallTops
+    sprite: Structures/Windows/uranium_window_diagonal.rsi
+    state: state0
+  - type: IconSmooth
+    mode: Diagonal
+    key: windows
+    base: state
+  - type: Icon
+    sprite: Structures/Windows/uranium_window_diagonal.rsi
+    state: state0
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PolygonShape
+            vertices:
+            - "-0.5,-0.5"
+            - "0.5,0.5"
+            - "0.5,-0.5"
+        mask:
+        - FullTileMask
+        layer:
+        - GlassLayer
+  - type: DamageVisuals
+    damageOverlay:
+      sprite: Structures/Windows/cracks_diagonal.rsi
+  - type: Construction
+    graph: WindowDiagonal
+    node: uraniumWindowDiagonal

Resources/Prototypes/Entities/Structures/Windows/window.yml

@@ -185,3 +185,44 @@
   - type: Icon
     sprite: Structures/Windows/directional.rsi
     state: frosted_window
+
+- type: entity
+  parent: Window
+  id: WindowDiagonal
+  name: window diagonal
+  suffix: diagonal
+  placement:
+    mode: SnapgridCenter
+    snap:
+    - Window
+  components:
+  - type: Sprite
+    drawdepth: WallTops
+    sprite: Structures/Windows/window_diagonal.rsi
+    state: state0
+  - type: IconSmooth
+    mode: Diagonal
+    key: windows
+    base: state
+  - type: Icon
+    sprite: Structures/Windows/window_diagonal.rsi
+    state: state0
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PolygonShape
+            vertices:
+            - "-0.5,-0.5"
+            - "0.5,0.5"
+            - "0.5,-0.5"
+        mask:
+        - FullTileMask
+        layer:
+        - GlassLayer
+  - type: DamageVisuals
+    damageOverlay:
+      sprite: Structures/Windows/cracks_diagonal.rsi
+  - type: Construction
+    graph: WindowDiagonal
+    node: windowDiagonal

Resources/Prototypes/Recipes/Construction/Graphs/structures/grille_diagonal.yml

@@ -0,0 +1,29 @@
+- type: constructionGraph
+  id: GrilleDiagonal
+  start: start
+  graph:
+    - node: start
+      edges:
+        - to: grilleDiagonal
+          completed:
+            - !type:SnapToGrid
+              southRotation: true
+          steps:
+            - material: MetalRod
+              amount: 2
+              doAfter: 1
+
+    - node: grilleDiagonal
+      entity: GrilleDiagonal
+      edges:
+        - to: start
+          completed:
+            - !type:AdminLog
+              message: "A grille was cut"
+            - !type:SpawnPrototype
+              prototype: PartRodMetal1
+              amount: 2
+            - !type:DeleteEntity
+          steps:
+            - tool: Cutting
+              doAfter: 0.25

Resources/Prototypes/Recipes/Construction/Graphs/structures/window_diagonal.yml

@@ -0,0 +1,163 @@
+- type: constructionGraph
+  id: WindowDiagonal
+  start: start
+  graph:
+    - node: start
+      edges:
+        - to: plasmaWindowDiagonal
+          steps:
+            - material: PlasmaGlass
+              amount: 2
+              doAfter: 2
+
+        - to: reinforcedWindowDiagonal
+          steps:
+            - material: ReinforcedGlass
+              amount: 2
+              doAfter: 2
+
+        - to: reinforcedPlasmaWindowDiagonal
+          steps:
+            - material: ReinforcedPlasmaGlass
+              amount: 2
+              doAfter: 3
+
+        - to: uraniumWindowDiagonal
+          steps:
+            - material: UraniumGlass
+              amount: 2
+              doAfter: 2
+
+        - to: reinforcedUraniumWindowDiagonal
+          steps:
+            - material: ReinforcedUraniumGlass
+              amount: 2
+              doAfter: 3
+
+        - to: windowDiagonal
+          steps:
+            - material: Glass
+              amount: 2
+              doAfter: 3
+
+    - node: windowDiagonal
+      entity: WindowDiagonal
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+              prototype: SheetGlass1
+              amount: 2
+            - !type:DeleteEntity {}
+          steps:
+            - tool: Screwing
+              doAfter: 1
+            - tool: Anchoring
+              doAfter: 2
+
+    - node: reinforcedWindowDiagonal
+      entity: ReinforcedWindowDiagonal
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+              prototype: SheetRGlass1
+              amount: 2
+            - !type:DeleteEntity {}
+          steps:
+            - tool: Welding
+              doAfter: 5
+            - tool: Screwing
+              doAfter: 1
+            - tool: Prying
+              doAfter: 2
+            - tool: Welding
+              doAfter: 5
+            - tool: Screwing
+              doAfter: 1
+            - tool: Anchoring
+              doAfter: 2
+
+    - node: plasmaWindowDiagonal
+      entity: PlasmaWindowDiagonal
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+              prototype: SheetPGlass1
+              amount: 2
+            - !type:DeleteEntity {}
+          steps:
+            - tool: Screwing
+              doAfter: 2
+            - tool: Prying
+              doAfter: 3
+            - tool: Screwing
+              doAfter: 2
+            - tool: Anchoring
+              doAfter: 3
+
+    - node: reinforcedPlasmaWindowDiagonal
+      entity: ReinforcedPlasmaWindowDiagonal
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+              prototype: SheetRPGlass1
+              amount: 2
+            - !type:DeleteEntity {}
+          steps:
+            - tool: Welding
+              doAfter: 5
+            - tool: Screwing
+              doAfter: 2
+            - tool: Prying
+              doAfter: 3
+            - tool: Welding
+              doAfter: 5
+            - tool: Screwing
+              doAfter: 2
+            - tool: Anchoring
+              doAfter: 3
+
+    - node: uraniumWindowDiagonal
+      entity: UraniumWindowDiagonal
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+              prototype: SheetUGlass1
+              amount: 2
+            - !type:DeleteEntity {}
+          steps:
+            - tool: Screwing
+              doAfter: 2
+            - tool: Prying
+              doAfter: 3
+            - tool: Screwing
+              doAfter: 2
+            - tool: Anchoring
+              doAfter: 3
+
+    - node: reinforcedUraniumWindowDiagonal
+      entity: ReinforcedUraniumWindowDiagonal
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+              prototype: SheetRUGlass1
+              amount: 2
+            - !type:DeleteEntity {}
+          steps:
+            - tool: Welding
+              doAfter: 5
+            - tool: Screwing
+              doAfter: 2
+            - tool: Prying
+              doAfter: 3
+            - tool: Welding
+              doAfter: 5
+            - tool: Screwing
+              doAfter: 2
+            - tool: Anchoring
+              doAfter: 3

Resources/Prototypes/Recipes/Construction/structures.yml

@@ -232,6 +232,23 @@
   placementMode: SnapgridCenter
   canRotate: false
 
+- type: construction
+  name: diagonal grille
+  id: GrilleDiagonal
+  graph: GrilleDiagonal
+  startNode: start
+  targetNode: grilleDiagonal
+  category: construction-category-structures
+  description: A flimsy framework of iron rods.
+  conditions:
+    - !type:TileNotBlocked
+      failIfSpace: false
+  icon:
+    sprite: Structures/Walls/grille.rsi
+    state: grille_diagonal
+  objectType: Structure
+  placementMode: SnapgridCenter
+
 - type: construction
   name: window
   id: Window
@@ -251,6 +268,24 @@
   placementMode: SnapgridCenter
   canRotate: false
 
+- type: construction
+  name: diagonal window
+  id: WindowDiagonal
+  graph: WindowDiagonal
+  startNode: start
+  targetNode: windowDiagonal
+  category: construction-category-structures
+  description: Clear.
+  canBuildInImpassable: true
+  conditions:
+    - !type:EmptyOrWindowValidInTile
+    - !type:NoWindowsInTile
+  icon:
+    sprite: Structures/Windows/window_diagonal.rsi
+    state: state1
+  objectType: Structure
+  placementMode: SnapgridCenter
+
 - type: construction
   name: reinforced window
   id: ReinforcedWindow
@@ -270,6 +305,24 @@
   placementMode: SnapgridCenter
   canRotate: false
 
+- type: construction
+  name: diagonal reinforced window
+  id: ReinforcedWindowDiagonal
+  graph: WindowDiagonal
+  startNode: start
+  targetNode: reinforcedWindowDiagonal
+  category: construction-category-structures
+  description: Clear but tough.
+  canBuildInImpassable: true
+  conditions:
+    - !type:EmptyOrWindowValidInTile
+    - !type:NoWindowsInTile
+  icon:
+    sprite: Structures/Windows/reinforced_window_diagonal.rsi
+    state: state1
+  objectType: Structure
+  placementMode: SnapgridCenter
+
 - type: construction
   name: tinted window
   id: TintedWindow
@@ -327,6 +380,42 @@
   placementMode: SnapgridCenter
   canRotate: false
 
+- type: construction
+  name: diagonal plasma window
+  id: PlasmaWindowDiagonal
+  graph: WindowDiagonal
+  startNode: start
+  targetNode: plasmaWindowDiagonal
+  category: construction-category-structures
+  canBuildInImpassable: true
+  description: Clear and even tougher, with a purple tint.
+  conditions:
+    - !type:EmptyOrWindowValidInTile
+    - !type:NoWindowsInTile
+  icon:
+    sprite: Structures/Windows/plasma_diagonal.rsi
+    state: state1
+  objectType: Structure
+  placementMode: SnapgridCenter
+
+- type: construction
+  name: diagonal reinforced plasma window
+  id: ReinforcedPlasmaWindowDiagonal
+  graph: WindowDiagonal
+  startNode: start
+  targetNode: reinforcedPlasmaWindowDiagonal
+  category: construction-category-structures
+  canBuildInImpassable: true
+  description: Fire resistant and even tougher, with a purple tint.
+  conditions:
+    - !type:EmptyOrWindowValidInTile
+    - !type:NoWindowsInTile
+  icon:
+    sprite: Structures/Windows/reinforced_plasma_diagonal.rsi
+    state: state1
+  objectType: Structure
+  placementMode: SnapgridCenter
+
 - type: construction
   name: directional window
   id: WindowDirectional
@@ -437,6 +526,42 @@
   placementMode: SnapgridCenter
   canRotate: false
 
+- type: construction
+  name: diagonal uranium window
+  id: UraniumWindowDiagonal
+  graph: WindowDiagonal
+  startNode: start
+  targetNode: uraniumWindowDiagonal
+  category: construction-category-structures
+  canBuildInImpassable: true
+  description: Clear and much tougher than regular glass, with added RadAbsorb to protect you from deadly radiation.
+  conditions:
+    - !type:EmptyOrWindowValidInTile
+    - !type:NoWindowsInTile
+  icon:
+    sprite: Structures/Windows/uranium_window_diagonal.rsi
+    state: state1
+  objectType: Structure
+  placementMode: SnapgridCenter
+
+- type: construction
+  name: diagonal reinforced uranium window
+  id: ReinforcedUraniumWindowDiagonal
+  graph: WindowDiagonal
+  startNode: start
+  targetNode: reinforcedUraniumWindowDiagonal
+  category: construction-category-structures
+  canBuildInImpassable: true
+  description: Clear and much tougher than regular glass, with added RadAbsorb to protect you from deadly radiation.
+  conditions:
+    - !type:EmptyOrWindowValidInTile
+    - !type:NoWindowsInTile
+  icon:
+    sprite: Structures/Windows/reinforced_uranium_diagonal.rsi
+    state: state1
+  objectType: Structure
+  placementMode: SnapgridCenter
+
 - type: construction
   name: firelock
   id: Firelock

Resources/Prototypes/Roles/Antags/pirate.yml

@@ -5,7 +5,7 @@
     back: ClothingBackpackPirateFilled
     head: ClothingHeadBandBlack
     shoes: ClothingShoesBootsLaceup
-    id: PassengerPDA
+    id: PiratePDA
     belt: ClothingBeltUtility
     pocket1: AppraisalTool
   innerClothingSkirt: ClothingUniformJumpsuitPirate
@@ -19,7 +19,7 @@
     back: ClothingBackpackPirateFilled
     head: ClothingHeadHatPirate
     shoes: ClothingShoesBootsLaceup
-    id: PassengerPDA
+    id: PiratePDA
     belt: ClothingBeltUtility
     pocket1: AppraisalTool
     pocket2: EnergyCutlass
@@ -35,7 +35,7 @@
     back: ClothingBackpackPirateFilled
     head: ClothingHeadHatPirateTricord
     shoes: ClothingShoesBootsLaceup
-    id: PassengerPDA
+    id: PiratePDA
     belt: ClothingBeltUtility
     pocket1: AppraisalTool
     outerClothing: ClothingOuterCoatGentle

Resources/Textures/Clothing/Head/Helmets/podwars_helmet.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by patogrone (ss14 discord)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "direction": 4
+    }
+  ]
+}

Resources/Textures/Clothing/OuterClothing/Armor/podwars_armor.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by patogrone (ss14 discord)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/Effects/electricity.rsi/meta.json

@@ -19,6 +19,19 @@
           0.1
         ]
       ]
+    },
+    {
+      "name": "electrified_diagonal",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
     }
   ]
 }

Resources/Textures/Objects/Devices/pda.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/59f2a4e10e5ba36033c9734ddebfbbdc6157472d, pda-cluwne made by brainfood1183 (github) ss14 | pda-brigmedic and pda-centcom made by PuroSlavKing (Github) | pda-brigemdic resprited by Hülle#2562 (Discord)",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/59f2a4e10e5ba36033c9734ddebfbbdc6157472d, pda-cluwne made by brainfood1183 (github) ss14 | pda-brigmedic and pda-centcom made by PuroSlavKing (Github) | pda-brigemdic resprited by Hülle#2562 (Discord), pda-pirate made by brainfood1183 (Github)",
   "size": {
     "x": 32,
     "y": 32
@@ -114,6 +114,9 @@
     {
       "name": "pda-miner"
     },
+    {
+      "name": "pda-pirate"
+    },
     {
       "name": "pda-qm"
     },

Resources/Textures/Objects/Misc/id_cards.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e idcluwne made by brainfood1183 (github) for ss14, idbrigmedic made by PuroSlavKing (Github)",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e idcluwne made by brainfood1183 (github) for ss14, idbrigmedic made by PuroSlavKing (Github), pirate made by brainfood1183 (github)",
   "size": {
     "x": 32,
     "y": 32
@@ -172,6 +172,9 @@
     {
       "name": "orange"
     },
+    {
+      "name": "pirate"
+    },
     {
       "name": "prisoner_001"
     },
@@ -199,7 +202,7 @@
     {
       "name": "syndie"
     },
-	{
+    {
       "name": "idcluwne"
     },
     {

Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle_syndicate.rsi/meta.json

@@ -0,0 +1,143 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from CEV-Eris at commit https://github.com/discordia-space/CEV-Eris/commit/14517938186858388656a6aee14bf47af9e9649f - then modified by 20kdc & AJCM-git, glass by Peptide90, modified by brainfood1183 (github)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "bolted_unlit"
+    },
+    {
+      "name": "closed"
+    },
+    {
+      "name": "closed_unlit"
+    },
+    {
+      "name": "closing",
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+      ]
+    ]
+    },
+    {
+      "name": "closing_unlit",
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+      ]
+    ]
+    },
+    {
+      "name": "deny_unlit",
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+      ]
+    ]
+    },
+    {
+      "name": "open"
+    },
+    {
+      "name": "opening",
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+      ]
+    ]
+    },
+    {
+      "name": "opening_unlit",
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+      ]
+    ]
+    },
+    {
+      "name": "panel_closing",
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+      ]
+    ]
+    },
+    {
+      "name": "panel_open"
+    },
+    {
+      "name": "panel_opening",
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+      ]
+    ]
+    },
+    {
+      "name": "welded"
+    },
+    {
+      "name": "emergency_unlit",
+      "delays": [
+        [
+          0.4,
+          0.4
+        ]
+      ]
+    }
+  ]
+}

Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle_syndicate.rsi/meta.json

@@ -0,0 +1,143 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from CEV-Eris at commit https://github.com/discordia-space/CEV-Eris/commit/14517938186858388656a6aee14bf47af9e9649f - then modified by brainfood1183 (github)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "bolted_unlit"
+    },
+    {
+      "name": "closed"
+    },
+    {
+      "name": "closed_unlit"
+    },
+    {
+      "name": "closing",
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+      ]
+    ]
+    },
+    {
+      "name": "closing_unlit",
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+      ]
+    ]
+    },
+    {
+      "name": "deny_unlit",
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+      ]
+    ]
+    },
+    {
+      "name": "open"
+    },
+    {
+      "name": "opening",
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+      ]
+    ]
+    },
+    {
+      "name": "opening_unlit",
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+      ]
+    ]
+    },
+    {
+      "name": "panel_closing",
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+      ]
+    ]
+    },
+    {
+      "name": "panel_open"
+    },
+    {
+      "name": "panel_opening",
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+      ]
+    ]
+    },
+    {
+      "name": "welded"
+    },
+    {
+      "name": "emergency_unlit",
+      "delays": [
+        [
+          0.4,
+          0.4
+        ]
+      ]
+    }
+  ]
+}

Resources/Textures/Structures/Walls/grille.rsi/meta.json

@@ -10,6 +10,9 @@
     {
       "name": "grille"
     },
+    {
+      "name": "grille_diagonal"
+    },
     {
       "name": "grille_broken"
     },

Resources/Textures/Structures/Windows/cracks_diagonal.rsi/meta.json

@@ -0,0 +1,14 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/tgstation/tgstation at commit e06b82a7f4b2b09216fb28fd384c95a2e1dc50e5",
+  "states": [
+    {"name": "DamageOverlay_4", "directions": 1},
+    {"name": "DamageOverlay_8", "directions": 1},
+    {"name": "DamageOverlay_12", "directions": 1}
+  ]
+}

Resources/Textures/Structures/Windows/plasma_diagonal.rsi/meta.json

@@ -0,0 +1,17 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Made by brainfood1183 (github)",
+    "states": [
+        {
+            "name": "state0"
+        },
+        {
+            "name": "state1"
+        }
+    ]
+}

Resources/Textures/Structures/Windows/reinforced_plasma_diagonal.rsi/meta.json

@@ -0,0 +1,17 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Made by brainfood1183 (github)",
+    "states": [
+        {
+            "name": "state0"
+        },
+        {
+            "name": "state1"
+        }
+    ]
+}

Resources/Textures/Structures/Windows/reinforced_uranium_diagonal.rsi/meta.json

@@ -0,0 +1,17 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Made by brainfood1183 (github)",
+    "states": [
+        {
+            "name": "state0"
+        },
+        {
+            "name": "state1"
+        }
+    ]
+}

Resources/Textures/Structures/Windows/reinforced_window_diagonal.rsi/meta.json

@@ -0,0 +1,17 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Made by brainfood1183 (github)",
+    "states": [
+        {
+            "name": "state0"
+        },
+        {
+            "name": "state1"
+        }
+    ]
+}

Resources/Textures/Structures/Windows/shuttle_window_diagonal.rsi/meta.json

@@ -0,0 +1,17 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Made by brainfood1183 (github)",
+    "states": [
+        {
+            "name": "state0"
+        },
+        {
+            "name": "state1"
+        }
+    ]
+}