PTech Changes: Infinite ID cards and Encryption keys (#2014)

* Make ptech great again * Cleanup * Content * Update vending_machine_restock.yml * Remove pens from SR PTech, add sr/nfsd forms * Brown and green PAL folders with docs --------- Co-authored-by: Dvir <[email protected]> Co-authored-by: Dvir <[email protected]> Co-authored-by: Whatstone <[email protected]>
new-frontiers-14 · Sep 20, 2024 · bceffc9 · bceffc9
1 parent 9c9511c
commit bceffc9
Show file tree

Hide file tree

Showing 8 changed files with 108 additions and 83 deletions.
diff --git a/Resources/Maps/_NF/Outpost/frontier.yml b/Resources/Maps/_NF/Outpost/frontier.yml
@@ -33375,7 +33375,7 @@ entities:
     - type: Transform
       pos: -5.5,13.5
       parent: 2173
-- proto: VendingMachineCart
+- proto: NFVendingMachineCart
   entities:
   - uid: 1211
     components:

diff --git a/Resources/Maps/_NF/POI/nfsd.yml b/Resources/Maps/_NF/POI/nfsd.yml
@@ -15415,7 +15415,7 @@ entities:
     - type: Transform
       pos: -4.5,-3.5
       parent: 1
-- proto: VendingMachineCartNfsd
+- proto: NFVendingMachineCartNfsd
   entities:
   - uid: 934
     components:

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml
@@ -1,38 +1,18 @@
 - type: vendingMachineInventory
   id: PTechInventory
   startingInventory:
-    ContractorPDA: 5 # Frontier: PassengerPDA<ContractorPDA
-    ClearNFPDA: 5 # Frontier: ClearPDA<ClearNFPDA
-    MusicianPDA: 3 # Frontier
-    MedicalPDA: 3 # Frontier
-    SecurityGuardPDA: 3 # Frontier
-    ContractorIDCard: 10 # Frontier: Passenger<Contractor, 5<10
-    ClothingHeadsetGrey: 10 # Frontier 5<10
-    RubberStampStc: 1 # Frontier
-    RubberStampCaptain: 10 # Frontier
-    RubberStampApproved: 3 # Frontier 1<3
-    RubberStampDenied: 3 # Frontier 1<3
-    Pen: 10 # Frontier
-#    Paper: 10 # Frontier
-#    Envelope: 10 # Frontier
-    BoxPaper: 4 # Frontier
-    BoxPaperOffice: 4 # Frontier
-    BoxPaperCaptainsThoughts: 4 # Frontier
-    BoxEnvelope: 4 # Frontier
-    BoxFolderClipboard: 3 # Frontier
-    BoxFolderBlue: 3 # Frontier
-    BoxFolderRed: 3 # Frontier
-    BoxFolderYellow: 3 # Frontier
-    HandLabeler: 3 # Frontier
-    BrbSign: 3 # Frontier
-    DeskBell: 3 # Frontier
-    EncryptionKeyCommand: 3 # Frontier
-    EncryptionKeySecurity: 10 # Frontier  1<10
-    EncryptionKeyNfsd: 10 # Frontier
-    EncryptionKeyCargo: 20 # Frontier 2<20
-    EncryptionKeyEngineering: 20 # Frontier 2<20
-    EncryptionKeyMedical: 20 # Frontier 2<20
-    EncryptionKeyScience: 20 # Frontier 2<20
-    EncryptionKeyCommon: 30 # Frontier
-    EncryptionKeyService: 30 # Frontier 3<30
-    EncryptionKeyTraffic: 30 # Frontier
+    PassengerPDA: 5
+    ClearPDA: 5
+    PassengerIDCard: 5
+    ClothingHeadsetGrey: 5
+    RubberStampApproved: 1
+    RubberStampDenied: 1
+    Paper: 10
+    Envelope: 10
+    HandLabeler: 2
+    EncryptionKeyCargo: 2
+    EncryptionKeyEngineering: 2
+    EncryptionKeyMedical: 2
+    EncryptionKeyScience: 2
+    EncryptionKeySecurity: 1
+    EncryptionKeyService: 3
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml b/Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml
@@ -321,7 +321,6 @@
   - type: VendingMachineRestock
     canRestock:
     - PTechInventory
-    - PTechNfsdInventory # Frontier
   - type: Sprite
     layers:
     - state: base

diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
@@ -206,7 +206,7 @@
     - Drinks
 
 - type: entity
-  parent: [BaseStructureDisableScrewing, BaseStructureIndestructible, BaseStructureAccessReaderImmuneToEmag, VendingMachine] # Frontier: add BaseStructureDisableScrewing, BaseStructureIndestructible, BaseStructureAccessReaderImmuneToEmag
+  parent: VendingMachine
   id: VendingMachineCart
   name: PTech
   description: PTech vending! Providing a ROBUST selection of PDAs, cartridges, and anything else a dull paper pusher needs!
@@ -234,8 +234,6 @@
     color: "#ffb0b0"
   - type: AccessReader
     access: [["HeadOfPersonnel"]]
-  - type: MarketModifier # Frontier
-    mod: 5 # Frontier
 
 - type: entity
   parent: VendingMachine

diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Paper/forms_nfsd.yml b/Resources/Prototypes/_NF/Catalog/Fills/Paper/forms_nfsd.yml
@@ -5,11 +5,8 @@
 
 # Filled Folder
 - type: entity
-  id: BoxFolderNfsdForms
-  parent: BoxFolderPalGreen
-  name: PAL folder
-  description: A folder filled with NFSD paperwork templates.
-  suffix: Forms, Green
+  id: FillNfsdForms
+  abstract: true
   components:
   - type: StorageFill
     contents:
@@ -27,6 +24,20 @@
     - id: Paper
       prob: 0.5
 
+- type: entity
+  id: BoxFolderNfsdForms
+  parent: [FillNfsdForms, BoxFolderPalGreen]
+  name: PAL folder
+  description: A folder filled with NFSD paperwork templates.
+  suffix: Forms, Green
+
+- type: entity
+  id: BoxFolderNfsdFormsBrown
+  parent: [FillNfsdForms, BoxFolderPalBrown]
+  name: PAL folder
+  description: A folder filled with NFSD paperwork templates.
+  suffix: Forms, Brown
+
 # Forms
 - type: entity # Creator: Kwentov (Vica)
   id: PaperWrittenNfsdWarrant

diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cart.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cart.yml
@@ -1,24 +1,64 @@
 - type: vendingMachineInventory
-  id: PTechNfsdInventory
+  id: NFPTechInventory
   startingInventory:
-    CadetPDA: 3
-    DeputyPDA: 3
-    BrigmedicNFPDA: 3
-    DetectiveNFPDA: 3
-    SergeantPDA: 3
-    BailiffPDA: 3
-    ClothingOuterCoatNfsdFormal: 4
-    ClothingOuterCoatNfsdFormalSheriff: 4
+    ContractorPDA: 4294967295 #infinite
+    ClearNFPDA: 4294967295 #infinite
+    ContractorIDCard: 4294967295 #infinite
+    ClothingHeadsetGrey: 4294967295 #infinite
+    RubberStampStc: 3
+    RubberStampCaptain: 4294967295 #Infinite
+    RubberStampApproved: 4294967295 #Infinite
+    RubberStampDenied: 4294967295 #Infinite
+    BoxPaper: 4
+    BoxPaperOffice: 4
+    BoxPaperCaptainsThoughts: 4
+    BoxEnvelope: 4
+    BoxFolderClipboard: 3
+    BoxFolderSr: 3
+    BoxFolderBlue: 3
+    BoxFolderRed: 3
+    BoxFolderYellow: 3
+    HandLabeler: 4294967295 #Infinite
+    BrbSign: 4294967295 #Infinite
+    DeskBell: 4294967295 #Infinite
+    EncryptionKeySecurity: 4294967295 #Infinite
+    EncryptionKeyService: 4294967295 #Infinite
+    EncryptionKeyNfsd: 5 
+    EncryptionKeyCommand: 5
+
+- type: vendingMachineInventory
+  id: NFPTechNfsdInventory
+  startingInventory:
+    CadetPDA: 10
+    DeputyPDA: 10
+    BrigmedicNFPDA: 10
+    DetectiveNFPDA: 10
+    SergeantPDA: 10
+    BailiffPDA: 10
+    ClothingHeadsetNfsdBrownCommon: 4294967295 #infinite
+    ClothingHeadsetNfsdCreamCommon: 4294967295 #infinite
+    ClothingHeadsetNfsdGreenCommon: 4294967295 #infinite
+    RubberStampPal: 3
+    RubberStampApproved: 4294967295 #Infinite
+    RubberStampDenied: 4294967295 #Infinite
+    Pen: 4294967295 #Infinite
+    BoxPaper: 4
+    BoxPaperOffice: 4
+    BoxPaperCaptainsThoughts: 4
+    BoxEnvelope: 4
+    BoxFolderNfsdForms: 3
+    BoxFolderNfsdFormsBrown: 3
+    HandLabeler: 4294967295 #Infinite
+    EncryptionKeyNfsd: 4294967295 #Infinite
+    ClothingOuterCoatNfsdFormal: 3
+    ClothingOuterCoatNfsdFormalSheriff: 3
     ClothingOuterCoatNfsdLongCoat: 3
     ClothingNeckCloakSheriff: 3
     ClothingNeckMantleSheriff: 3
-    ClothingNeckNfsdBadgeSecurityCadet: 3
-    ClothingNeckNfsdBadgeSecurityBrigmedic: 3
-    ClothingNeckNfsdBadgeDetective: 3
-    ClothingNeckNfsdBadgeSeniorOfficer: 3
-    ClothingNeckNfsdBadgeWarden: 3
-    ClothingNeckNfsdBadgeSheriff: 10
-    ClothingMaskGasSheriff: 2
-    EncryptionKeyNfsd: 10
-    BoxEnvelope: 4
-    BoxPaper: 4
+    ClothingNeckNfsdBadgeSecurityCadet: 10
+    ClothingNeckNfsdBadgeSecurityBrigmedic: 10
+    ClothingNeckNfsdBadgeDetective: 10
+    ClothingNeckNfsdBadgeSeniorOfficer: 10
+    ClothingNeckNfsdBadgeWarden: 10
+    ClothingNeckNfsdBadgeSheriff: 3
+    ClothingMaskGasSheriff: 3
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml
@@ -454,27 +454,24 @@
     access: [["Security"]]
 
 - type: entity
-  parent: VendingMachineCart # Frontier
-  id: VendingMachineCartNfsd
+  parent: [BaseStructureDisableScrewing, BaseStructureIndestructible, BaseStructureAccessReaderImmuneToEmag, VendingMachineCart]
+  id: NFVendingMachineCart
+  suffix: SR
+  components:
+  - type: VendingMachine
+    pack: NFPTechInventory
+  - type: AccessReader
+    access: [["HeadOfPersonnel"]]
+  - type: MarketModifier
+    mod: 5
+
+- type: entity
+  parent: NFVendingMachineCart
+  id: NFVendingMachineCartNfsd
   suffix: NFSD
   components:
   - type: VendingMachine
-    pack: PTechNfsdInventory
-    offState: off
-    brokenState: broken
-    normalState: normal-unshaded
-    ejectState: eject-unshaded
-    denyState: deny-unshaded
-  - type: Sprite
-    sprite: Structures/Machines/VendingMachines/cart.rsi
-    layers:
-    - state: "off"
-      map: ["enum.VendingMachineVisualLayers.Base"]
-    - state: "off"
-      map: ["enum.VendingMachineVisualLayers.BaseUnshaded"]
-      shader: unshaded
-    - state: panel
-      map: ["enum.WiresVisualLayers.MaintenancePanel"]
+    pack: NFPTechNfsdInventory
   - type: AccessReader
     access: [["HeadOfSecurity"]]