Merge branch 'new-frontiers-14:master' into PetsSlotsErrors

new-frontiers-14 · Oct 27, 2023 · 8049c62 · 8049c62
2 parents 168e1fb + fe81031
commit 8049c62
Show file tree

Hide file tree

Showing 35 changed files with 179 additions and 76 deletions.
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
@@ -1515,3 +1515,35 @@ Entries:
       message: Fix AsteroidBunker breaking due to peaches.
   id: 4577
   time: '2023-10-25T16:35:19.0000000+00:00'
+- author: PeccNeck
+  changes:
+    - type: Add
+      message: NT Rosebud MKI captains can now manage their crew. Rejoice!
+    - type: Tweak
+      message: Adjusted NT Rosebud MKI's price for inflation.
+    - type: Tweak
+      message: Tweaked the SV naming prefix on vessels.
+    - type: Tweak
+      message: Suit storage lockers are now accessible to everyone.
+    - type: Fix
+      message: Re-oriented NT Helix defibrillator cabinets to be internally accessible.
+  id: 4578
+  time: '2023-10-26T22:11:36.0000000+00:00'
+- author: dvir01
+  changes:
+    - type: Add
+      message: NT will now provide the reporter with his mass media computer board.
+  id: 4579
+  time: '2023-10-26T23:06:56.0000000+00:00'
+- author: '-'
+  changes: []
+  id: 4580
+  time: '2023-10-26T23:41:22.0000000+00:00'
+- author: dvir01
+  changes:
+    - type: Add
+      message: >-
+        NT has provided everyone with a free space traffic control channel key
+        in the survival box.
+  id: 4581
+  time: '2023-10-26T23:42:43.0000000+00:00'
diff --git a/Resources/Maps/Shuttles/helix.yml b/Resources/Maps/Shuttles/helix.yml
@@ -1388,14 +1388,12 @@ entities:
   entities:
   - uid: 176
     components:
-    - rot: 3.141592653589793 rad
-      pos: -1.5,9.5
+    - pos: -1.5,9.5
       parent: 1
       type: Transform
   - uid: 177
     components:
-    - rot: 3.141592653589793 rad
-      pos: -3.5,7.5
+    - pos: -3.5,7.5
       parent: 1
       type: Transform
   - uid: 178

diff --git a/Resources/Maps/Shuttles/rosebudmki.yml b/Resources/Maps/Shuttles/rosebudmki.yml
@@ -18,7 +18,7 @@ entities:
   entities:
   - uid: 1
     components:
-    - name: RosebudMKII
+    - name: RosebudMKI
       type: MetaData
     - pos: -0.66406155,-0.5000076
       parent: invalid
@@ -781,7 +781,7 @@ entities:
       type: GridAtmosphere
     - type: GasTileOverlay
     - type: RadiationGridResistance
-    - id: RosebudMKII
+    - id: RosebudMKI
       type: BecomesStation
 - proto: AirlockAtmosphericsGlass
   entities:
@@ -3061,29 +3061,19 @@ entities:
     - pos: -10.5,5.5
       parent: 1
       type: Transform
-  - uid: 566
-    components:
-    - pos: -11.5,5.5
-      parent: 1
-      type: Transform
   - uid: 567
     components:
-    - pos: -11.5,6.5
+    - pos: -10.5,8.5
       parent: 1
       type: Transform
   - uid: 568
     components:
-    - pos: -11.5,7.5
-      parent: 1
-      type: Transform
-  - uid: 569
-    components:
-    - pos: -11.5,8.5
+    - pos: -10.5,7.5
       parent: 1
       type: Transform
   - uid: 570
     components:
-    - pos: -12.5,8.5
+    - pos: -10.5,6.5
       parent: 1
       type: Transform
   - uid: 990
@@ -3133,16 +3123,6 @@ entities:
     - pos: 8.5,1.5
       parent: 1
       type: Transform
-  - uid: 571
-    components:
-    - pos: -12.5,8.5
-      parent: 1
-      type: Transform
-  - uid: 573
-    components:
-    - pos: -11.5,8.5
-      parent: 1
-      type: Transform
   - uid: 574
     components:
     - pos: -10.5,8.5
@@ -3670,6 +3650,13 @@ entities:
     - pos: 0.5,-1.5
       parent: 1
       type: Transform
+- proto: ComputerStationRecords
+  entities:
+  - uid: 569
+    components:
+    - pos: -12.5,8.5
+      parent: 1
+      type: Transform
 - proto: ConveyorBelt
   entities:
   - uid: 4
@@ -7706,7 +7693,7 @@ entities:
   entities:
   - uid: 88
     components:
-    - pos: -12.5,8.5
+    - pos: -10.5,8.5
       parent: 1
       type: Transform
   - uid: 730
@@ -8680,7 +8667,7 @@ entities:
     - pos: 0.5,2.5
       parent: 1
       type: Transform
-    - location: RosebudMKII
+    - location: RosebudMKI
       type: WarpPoint
 - proto: WeaponCapacitorRecharger
   entities:

diff --git a/Resources/Maps/Shuttles/rosebudmkii.yml b/Resources/Maps/Shuttles/rosebudmkii.yml
@@ -11106,7 +11106,7 @@ entities:
   entities:
   - uid: 1087
     components:
-    - name: RosebudMKI
+    - name: RosebudMKII
       type: MetaData
     - pos: 0.5,2.5
       parent: 1

diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml b/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml
@@ -12,6 +12,7 @@
       - id: EmergencyMedipen
       - id: Flare
       - id: FoodTinMRE
+      - id: EncryptionKeyCommand
   - type: Sprite
     layers:
       - state: internals
@@ -31,6 +32,7 @@
       - id: EmergencyMedipen
       - id: Flare
       - id: FoodTinMRE
+      - id: EncryptionKeyCommand
   - type: Sprite
     layers:
       - state: internals
@@ -51,6 +53,7 @@
       - id: EmergencyMedipen
       - id: Flare
       - id: FoodTinMRE
+      - id: EncryptionKeyCommand
   - type: Sprite
     layers:
       - state: internals
@@ -71,6 +74,7 @@
       - id: EmergencyMedipen
       - id: EmergencyMedipen
       - id: FoodTinMRE
+      - id: EncryptionKeyCommand
   - type: Sprite
     layers:
       - state: internals
@@ -91,6 +95,7 @@
       - id: EmergencyMedipen
       - id: Flare
       - id: FoodTinMRE
+      - id: EncryptionKeyCommand
   - type: Sprite
     layers:
       - state: internals
@@ -116,6 +121,7 @@
       - id: EmergencyMedipen
       - id: Flare
       - id: FoodTinMRE
+      - id: EncryptionKeyCommand
   - type: Tag
     tags:
       - BoxHug
@@ -134,6 +140,7 @@
       - id: EmergencyMedipen
       - id: Flare
       - id: FoodTinMRE
+      - id: EncryptionKeyCommand
   - type: Sprite
     layers:
       - state: internals

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
@@ -122,7 +122,7 @@
         - id: ClothingOuterHardsuitEngineering
         - id: ClothingMaskBreath
   - type: AccessReader
-    access: [["Engineering"]]
+    # access: [["Engineering"]]
 
 #Atmospherics hardsuit
 - type: entity
@@ -137,7 +137,7 @@
         - id: ClothingOuterHardsuitAtmos
         - id: ClothingMaskBreath
   - type: AccessReader
-    access: [["Atmospherics"]]
+    # access: [["Atmospherics"]]
 
 #Security hardsuit
 - type: entity
@@ -169,7 +169,7 @@
         - id: ClothingOuterHardsuitEngineeringWhite
         - id: ClothingMaskBreath
   - type: AccessReader
-    access: [["ChiefEngineer"]]
+    # access: [["ChiefEngineer"]]
 
 #CMO's hardsuit
 - type: entity
@@ -184,7 +184,7 @@
         - id: ClothingOuterHardsuitMedical
         - id: ClothingMaskBreathMedical
   - type: AccessReader
-    access: [ [ "ChiefMedicalOfficer" ] ]
+    # access: [ [ "ChiefMedicalOfficer" ] ]
 
 #RD's hardsuit
 - type: entity
@@ -199,7 +199,7 @@
         - id: ClothingOuterHardsuitRd
         - id: ClothingMaskBreath
   - type: AccessReader
-    access: [ [ "ResearchDirector" ] ]
+    # access: [ [ "ResearchDirector" ] ]
 
 #HOS's hardsuit
 - type: entity
@@ -245,7 +245,7 @@
         - id: ClothingOuterHardsuitCap
         - id: ClothingMaskGasCaptain
   - type: AccessReader
-    access: [["Captain"]]
+    # access: [["Captain"]]
 
 #Salvage hardsuit
 - type: entity
@@ -261,7 +261,7 @@
       - id: ClothingOuterHardsuitSpatio
       - id: ClothingMaskGasExplorer
   - type: AccessReader
-    access: [["Salvage"]]
+    # access: [["Salvage"]]
 
 #Blood-red hardsuit
 - type: entity

diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml
@@ -5,7 +5,7 @@
   playTimeTracker: JobLawyer
   requirements:
     - !type:OverallPlaytimeRequirement
-      time: 36000 # 10 hrs
+      time: 21600
   startingGear: LawyerGear
   icon: "JobIconLawyer"
   supervisors: job-supervisors-hop

diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/senior_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/senior_engineer.yml
@@ -12,7 +12,7 @@
       time: 21600 #6 hrs
     - !type:DepartmentTimeRequirement
       department: Engineering
-      time: 216000 # 60 hrs
+      time: 21600 #6 hrs
   startingGear: SeniorEngineerGear
   icon: "JobIconSeniorEngineer"
   supervisors: job-supervisors-ce

diff --git a/Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml b/Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml
@@ -12,7 +12,7 @@
       time: 21600 #6 hrs
     - !type:DepartmentTimeRequirement
       department: Medical
-      time: 216000 # 60 hrs
+      time: 21600 #6 hrs
   startingGear: SeniorPhysicianGear
   icon: "JobIconSeniorPhysician"
   supervisors: job-supervisors-cmo

diff --git a/Resources/Prototypes/Roles/Jobs/Science/borg.yml b/Resources/Prototypes/Roles/Jobs/Science/borg.yml
@@ -5,7 +5,7 @@
   playTimeTracker: JobBorg
   requirements:
     - !type:OverallPlaytimeRequirement
-      time: 21600 #60 hrs
+      time: 21600
   canBeAntag: false
   icon: JobIconBorg
   supervisors: job-supervisors-rd

diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml b/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml
@@ -6,7 +6,7 @@
   requirements:
     - !type:DepartmentTimeRequirement
       department: Science
-      time: 54000 #15 hrs
+      time: 10800
       inverted: true # stop playing intern if you're good at science!
   startingGear: ResearchAssistantGear
   icon: "JobIconResearchAssistant"

diff --git a/Resources/Prototypes/Roles/Jobs/Science/senior_researcher.yml b/Resources/Prototypes/Roles/Jobs/Science/senior_researcher.yml
@@ -6,7 +6,7 @@
   requirements:
     - !type:DepartmentTimeRequirement
       department: Science
-      time: 216000 #60 hrs
+      time: 21600
   startingGear: SeniorResearcherGear
   icon: "JobIconSeniorResearcher"
   supervisors: job-supervisors-rd

diff --git a/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml b/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml
@@ -7,9 +7,9 @@
     - !type:RoleTimeRequirement
       role: JobWarden
       time: 21600 #6 hrs
-    - !type:RoleTimeRequirement
-      role: JobDetective
-      time: 7200 #2 hrs
+#    - !type:RoleTimeRequirement
+#      role: JobDetective
+#      time: 7200 #2 hrs
     - !type:RoleTimeRequirement
       role: JobSecurityOfficer
       time: 21600 #6 hrs

diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml
@@ -17,10 +17,10 @@
   id: ReporterGear
   equipment:
     jumpsuit: ClothingUniformJumpsuitReporter
-    back: ClothingBackpackFilled
+    back: ClothingBackpackReporterFilled
     shoes: ClothingShoesColorWhite
     id: ReporterPDA
     ears: ClothingHeadsetService
   innerClothingSkirt: ClothingUniformJumpsuitJournalist
-  satchel: ClothingBackpackSatchelFilled
-  duffelbag: ClothingBackpackDuffelFilled
+  satchel: ClothingBackpackSatchelReporterFilled
+  duffelbag: ClothingBackpackDuffelReporterFilled
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/backpack.yml
@@ -0,0 +1,21 @@
+- type: entity
+  noSpawn: true
+  parent: ClothingBackpackMerc
+  id: ClothingBackpackMercFilled
+  components:
+    - type: StorageFill
+      contents:
+      - id: BoxSurvival
+      - id: Lighter
+      - id: CigPackBlack
+      - id: Flash
+
+- type: entity
+  noSpawn: true
+  parent: ClothingBackpack
+  id: ClothingBackpackReporterFilled
+  components:
+  - type: StorageFill
+    contents:
+      - id: BoxSurvival
+      - id: ComputerMassMediaCircuitboard
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
@@ -0,0 +1,9 @@
+- type: entity
+  noSpawn: true
+  parent: ClothingBackpackDuffel
+  id: ClothingBackpackDuffelReporterFilled
+  components:
+  - type: StorageFill
+    contents:
+      - id: BoxSurvival
+      - id: ComputerMassMediaCircuitboard