Revert "Update with Master."

This reverts commit 93b0cd1.
new-frontiers-14 · Nov 3, 2023 · 426fb18 · 426fb18
1 parent 93b0cd1
commit 426fb18
Show file tree

Hide file tree

Showing 11 changed files with 188 additions and 768 deletions.
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
@@ -1633,3 +1633,9 @@ Entries:
       message: Merges upstream changes. See their changelog over there > > >
   id: 4594
   time: '2023-10-30T22:36:05.0000000+00:00'
+- author: Cheackraze
+  changes:
+    - type: Add
+      message: Added the Gallery, an admin-only spawned grid for special events
+  id: 4595
+  time: '2023-11-02T23:40:45.0000000+00:00'
diff --git a/Resources/Maps/Shuttles/condor.yml b/Resources/Maps/Shuttles/condor.yml
@@ -2468,17 +2468,6 @@ entities:
     - pos: 3.5,0.5
       parent: 281
       type: Transform
-- proto: ClothingBeltChiefEngineerFilled
-  entities:
-  - uid: 669
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 668
-      type: Transform
-    - canCollide: False
-      type: Physics
-    - type: InsideEntityStorage
 - proto: ClothingHandsGlovesCaptain
   entities:
   - uid: 674

diff --git a/Resources/Maps/Shuttles/crescent.yml b/Resources/Maps/Shuttles/crescent.yml
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml b/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml
@@ -11,10 +11,11 @@
       - id: ClothingShoesBootsMag
       - id: ClothingMaskGasExplorer
 # Currently do not function as 'true' mesons, so they're useless for salvagers.
-#      - id: ClothingEyesGlassesMeson
-      - id: ClothingBeltUtilityFilled
+      - id: ClothingEyesGlassesMeson # Frontier
+#      - id: ClothingBeltUtilityFilled # Frontier
+      - id: ClothingBeltUtilityEngineering # Frontier
       - id: SurvivalKnife
-      - id: HandheldGPSBasic
+#      - id: HandheldGPSBasic # Frontier
       - id: RadioHandheld
       - id: OreBag
       - id: Flare
@@ -28,10 +29,11 @@
   - type: StorageFill
     contents:
 # Currently do not function as 'true' mesons, so they're useless for salvagers.
-#      - id: ClothingEyesGlassesMeson
-      - id: ClothingBeltUtilityFilled
+      - id: ClothingEyesGlassesMeson # Frontier
+#      - id: ClothingBeltUtilityFilled # Frontier
+      - id: ClothingBeltUtilityEngineering # Frontier
       - id: SurvivalKnife
-      - id: HandheldGPSBasic
+#      - id: HandheldGPSBasic # Frontier
       - id: RadioHandheld
       - id: OreBag
       - id: Flare

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -24,6 +24,9 @@
       - id: RubberStampQm
       - id: ClothingHeadsetAltCargo
       - id: BoxEncryptionKeyCargo
+      - id: ClothingNeckMantleQM # Frontier
+      - id: ClothingOuterWinterQM # Frontier
+      - id: ClothingBeltUtilityEngineering # Frontier
 
 - type: entity
   id: LockerCaptainFilledHardsuit
@@ -56,7 +59,7 @@
       - id: ClothingUniformJumpskirtCapFormalDress
       - id: RubberStampCaptain
 #      - id: WeaponAntiqueLaser # Frontier
-      - id: JetpackCaptainFilled
+#      - id: JetpackCaptainFilled # Frontier
       - id: ClothingHeadHatCapcap
 #      - id: MedalCase # Frontier
 
@@ -89,7 +92,7 @@
       - id: ClothingUniformJumpskirtCapFormalDress
       - id: RubberStampCaptain
 #      - id: WeaponAntiqueLaser # Frontier
-      - id: JetpackCaptainFilled
+#      - id: JetpackCaptainFilled # Frontier
 #      - id: MedalCase # Frontier
       - id: ClothingHeadHatCapcap
 
@@ -147,18 +150,21 @@
       - id: NitrogenTankFilled
       - id: ClothingNeckCloakCe
       - id: ClothingEyesGlassesMeson
-      - id: ClothingBeltChiefEngineerFilled
+#      - id: ClothingBeltChiefEngineerFilled # Frontier
+      - id: ClothingBeltUtilityEngineering # Frontier
       - id: ClothingHeadHatBeretEngineering
-      - id: ClothingShoesBootsMagAdv
+#      - id: ClothingShoesBootsMagAdv # Frontier
+      - id: ClothingShoesBootsMag # Frontier
       - id: ClothingHandsGlovesColorYellow
       - id: CigarCase
         prob: 0.15
 #      - id: DoorRemoteEngineering # Frontier
       - id: RubberStampCE
-      - id: JetpackVoidFilled
+#      - id: JetpackVoidFilled # Frontier
       - id: ClothingHeadsetAltEngineering
       - id: BoxEncryptionKeyEngineering
 #      - id: AccessConfigurator # Frontier
+      - id: ClothingNeckMantleCE # Frontier
 
 - type: entity
   id: LockerChiefEngineerFilled
@@ -169,7 +175,8 @@
     contents:
       - id: ClothingNeckCloakCe
       - id: ClothingEyesGlassesMeson
-      - id: ClothingBeltChiefEngineerFilled
+#      - id: ClothingBeltChiefEngineerFilled # Frontier
+      - id: ClothingBeltUtilityEngineering # Frontier
       - id: ClothingHeadHatBeretEngineering
       - id: ClothingHandsGlovesColorYellow
       - id: ClothingUniformJumpsuitChiefEngineerTurtle
@@ -181,6 +188,8 @@
       - id: ClothingHeadsetAltEngineering
       - id: BoxEncryptionKeyEngineering
 #      - id: AccessConfigurator # Frontier
+      - id: ClothingNeckMantleCE # Frontier
+      - id: ClothingOuterWinterCE # Frontier
 
 - type: entity
   id: LockerChiefMedicalOfficerFilledHardsuit
@@ -207,6 +216,7 @@
       - id: MaterialBiomass
         amount: 3
       - id: BoxEncryptionKeyMedical
+      - id: ClothingNeckMantleCMO # Frontier
 
 - type: entity
   id: LockerChiefMedicalOfficerFilled
@@ -234,6 +244,8 @@
       - id: MaterialBiomass
         amount: 3
       - id: BoxEncryptionKeyMedical
+      - id: ClothingNeckMantleCMO # Frontier
+      - id: ClothingOuterWinterCMO # Frontier
 
 - type: entity
   id: LockerResearchDirectorFilledHardsuit
@@ -251,10 +263,13 @@
 #      - id: HandTeleporter # Frontier
 #      - id: DoorRemoteResearch # Frontier
       - id: ClothingHeadHatBeretRND
+      - id: ClothingHandsGlovesColorPurple # Frontier
       - id: RubberStampRd
       - id: ClothingHeadsetAltScience
       - id: BoxEncryptionKeyScience
       - id: BoxEncryptionKeyRobo
+      - id: ClothingBeltUtilityEngineering # Frontier
+      - id: ClothingNeckMantleRD # Frontier
 
 - type: entity
   id: LockerResearchDirectorShuttleFilled
@@ -273,10 +288,13 @@
 #      - id: DoorRemoteResearch # Frontier
       - id: ClothingHeadHatBeretRND
       - id: ClothingHandsGlovesColorPurple
-      - id: ClothingBeltUtilityFilled
+      - id: ClothingBeltUtilityEngineering # Frontier
       - id: RubberStampRd
       - id: ClothingHeadsetAltScience
       - id: BoxEncryptionKeyScience
+      - id: BoxEncryptionKeyRobo # Frontier
+      - id: ClothingNeckMantleRD # Frontier
+      - id: ClothingOuterWinterRD # Frontier
 
 - type: entity
   id: LockerResearchDirectorFilled
@@ -294,10 +312,13 @@
 #      - id: DoorRemoteResearch # Frontier
       - id: ClothingHeadHatBeretRND
       - id: ClothingHandsGlovesColorPurple
-      - id: ClothingBeltUtilityFilled
+      - id: ClothingBeltUtilityEngineering # Frontier
       - id: RubberStampRd
       - id: ClothingHeadsetAltScience
       - id: BoxEncryptionKeyScience
+      - id: BoxEncryptionKeyRobo # Frontier
+      - id: ClothingNeckMantleRD # Frontier
+      - id: ClothingOuterWinterRD # Frontier
 
 - type: entity
   id: LockerHeadOfSecurityFilledHardsuit
@@ -327,9 +348,11 @@
       - id: ClothingUniformJumpsuitHosFormal
 #      - id: RubberStampHos # Frontier
       - id: SecurityTechFabCircuitboard
-      - id: JetpackSecurityFilled
+#      - id: JetpackSecurityFilled # Frontier
       - id: BoxEncryptionKeySecurity
       - id: HoloprojectorSecurity
+      - id: ClothingNeckMantleHOS # Frontier
+      - id: CrowbarRed # Frontier
 
 - type: entity
   id: LockerHeadOfSecurityFilled
@@ -360,3 +383,6 @@
       - id: BoxEncryptionKeySecurity
       - id: HoloprojectorSecurity
 #      - id: BookSecretDocuments # Frontier
+      - id: ClothingNeckMantleHOS # Frontier
+      - id: ClothingOuterWinterHoS # Frontier
+      - id: CrowbarRed # Frontier
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml b/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml
@@ -128,8 +128,8 @@
   components:
   - type: StorageFill
     contents:
-      - id: ClothingHeadHelmetVoidParamed
-      - id: ClothingOuterHardsuitVoidParamed
+#      - id: ClothingHeadHelmetVoidParamed # Frontier
+#      - id: ClothingOuterHardsuitVoidParamed # Frontier
       - id: ClothingOuterCoatParamedicWB
       - id: ClothingHeadHatParamedicsoft
       - id: ClothingUniformJumpsuitParamedic

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
@@ -22,6 +22,7 @@
       - id: ClothingOuterHardsuitWarden
       - id: HoloprojectorSecurity
       - id: ClothingEyesHudSecurity
+      - id: CrowbarRed # Frontier
 
 - type: entity
   id: LockerWardenFilled
@@ -46,6 +47,7 @@
 #      - id: DoorRemoteArmory
       - id: HoloprojectorSecurity
       - id: ClothingEyesHudSecurity
+      - id: CrowbarRed # Frontier
 
 - type: entity
   id: LockerSecurityFilled
@@ -68,6 +70,7 @@
       - id: WeaponMeleeNeedle
         prob: 0.1
       - id: ClothingEyesHudSecurity
+      - id: CrowbarRed # Frontier
 
 - type: entity
   id: LockerDetectiveFilled
@@ -86,6 +89,7 @@
       - id: BoxForensicPad
       - id: DrinkDetFlask
       - id: ClothingHandsGlovesForensic
+      - id: CrowbarRed # Frontier
 
 - type: entity
   id: ClosetBombFilled