Ch

AdventureTimeSS14 · May 21, 2024 · 057657a · 057657a
1 parent 6ac04c5
commit 057657a
Show file tree

Hide file tree

Showing 8 changed files with 34,785 additions and 34,521 deletions.
diff --git a/Resources/Maps/ADTMaps/adt_delta.yml b/Resources/Maps/ADTMaps/adt_delta.yml
@@ -15134,6 +15134,25 @@ entities:
     - type: Transform
       pos: 0.65877503,-13.378418
       parent: 13307
+- proto: ADTSecretBookEarth
+  entities:
+  - uid: 6573
+    components:
+    - type: Transform
+      pos: 65.001785,45.638874
+      parent: 13307
+- proto: ADTSecretBookSpaceLaw
+  entities:
+  - uid: 2792
+    components:
+    - type: Transform
+      pos: 50.526173,7.6504726
+      parent: 13307
+  - uid: 4657
+    components:
+    - type: Transform
+      pos: 44.416885,18.610737
+      parent: 13307
 - proto: ADTSofaBrownLeftSide
   entities:
   - uid: 381
@@ -15193,16 +15212,6 @@ entities:
     - type: Transform
       pos: 30.842611,12.597673
       parent: 13307
-  - uid: 2792
-    components:
-    - type: Transform
-      pos: 50.526173,7.6504726
-      parent: 13307
-  - uid: 4657
-    components:
-    - type: Transform
-      pos: 44.416885,18.610737
-      parent: 13307
 - proto: ADTSpawnPointADTSupplyBorg
   entities:
   - uid: 36051
@@ -18218,7 +18227,7 @@ entities:
       pos: 51.5,11.5
       parent: 13307
     - type: Door
-      secondsUntilStateChange: -14746.298
+      secondsUntilStateChange: -14708.683
       state: Opening
   - uid: 2175
     components:
@@ -18227,7 +18236,7 @@ entities:
       pos: 49.5,4.5
       parent: 13307
     - type: Door
-      secondsUntilStateChange: -63522.33
+      secondsUntilStateChange: -63484.715
       state: Opening
 - proto: AirlockAtmosphericsGlass
   entities:
@@ -18418,7 +18427,7 @@ entities:
       pos: 45.5,3.5
       parent: 13307
     - type: Door
-      secondsUntilStateChange: -63806.484
+      secondsUntilStateChange: -63768.87
       state: Opening
   - uid: 3108
     components:
@@ -18790,7 +18799,7 @@ entities:
       pos: -3.5,-9.5
       parent: 13307
     - type: Door
-      secondsUntilStateChange: -127.51421
+      secondsUntilStateChange: -89.89924
       state: Opening
   - uid: 17204
     components:
@@ -19670,7 +19679,7 @@ entities:
       pos: 74.5,33.5
       parent: 13307
     - type: Door
-      secondsUntilStateChange: -23357.203
+      secondsUntilStateChange: -23319.588
       state: Opening
   - uid: 11503
     components:
@@ -20387,7 +20396,7 @@ entities:
       pos: 60.5,24.5
       parent: 13307
     - type: Door
-      secondsUntilStateChange: -28859.047
+      secondsUntilStateChange: -28821.432
       state: Opening
 - proto: AirlockHydroGlassLocked
   entities:
@@ -20671,7 +20680,7 @@ entities:
       pos: 1.5,41.5
       parent: 13307
     - type: Door
-      secondsUntilStateChange: -72551.3
+      secondsUntilStateChange: -72513.68
       state: Opening
   - uid: 9959
     components:
@@ -21770,7 +21779,7 @@ entities:
       pos: 57.5,37.5
       parent: 13307
     - type: Door
-      secondsUntilStateChange: -23673.752
+      secondsUntilStateChange: -23636.137
       state: Opening
   - uid: 11596
     components:
@@ -26847,13 +26856,6 @@ entities:
         - 0
         - 0
         - 0
-- proto: BookEarth
-  entities:
-  - uid: 6573
-    components:
-    - type: Transform
-      pos: 65.001785,45.638874
-      parent: 13307
 - proto: BookFeather
   entities:
   - uid: 7125
@@ -111901,7 +111903,7 @@ entities:
       pos: -63.5,-31.5
       parent: 13307
     - type: Door
-      secondsUntilStateChange: -66761.67
+      secondsUntilStateChange: -66724.055
       state: Closing
   - uid: 23371
     components:
@@ -113896,7 +113898,7 @@ entities:
       pos: 26.5,6.5
       parent: 13307
     - type: Door
-      secondsUntilStateChange: -16334.266
+      secondsUntilStateChange: -16296.65
       state: Closing
     - type: DeviceNetwork
       deviceLists:
@@ -114196,7 +114198,7 @@ entities:
       pos: 11.5,-21.5
       parent: 13307
     - type: Door
-      secondsUntilStateChange: -1226.4482
+      secondsUntilStateChange: -1188.8333
       state: Closing
   - uid: 29394
     components:
@@ -114452,7 +114454,7 @@ entities:
       pos: -43.5,13.5
       parent: 13307
     - type: Door
-      secondsUntilStateChange: -9923.066
+      secondsUntilStateChange: -9885.451
       state: Closing
   - uid: 34431
     components:
@@ -175981,6 +175983,11 @@ entities:
           showEnts: False
           occludes: True
           ent: null
+  - uid: 30290
+    components:
+    - type: Transform
+      pos: 7.5,-3.5
+      parent: 13307
 - proto: HamtrLLeg
   entities:
   - uid: 1378
@@ -178017,13 +178024,6 @@ entities:
           showEnts: False
           occludes: True
           ent: null
-- proto: LockerBlueshieldFilled
-  entities:
-  - uid: 30290
-    components:
-    - type: Transform
-      pos: 7.5,-3.5
-      parent: 13307
 - proto: LockerBoozeFilled
   entities:
   - uid: 15908
@@ -195996,6 +195996,11 @@ entities:
     - type: Transform
       pos: 13.5,-9.5
       parent: 13307
+  - uid: 30320
+    components:
+    - type: Transform
+      pos: 7.5,-5.5
+      parent: 13307
   - uid: 30383
     components:
     - type: Transform
@@ -212264,13 +212269,6 @@ entities:
     - type: Transform
       pos: -52.5,38.5
       parent: 13307
-- proto: SuitStorageBlueshield
-  entities:
-  - uid: 30320
-    components:
-    - type: Transform
-      pos: 7.5,-5.5
-      parent: 13307
 - proto: SuitStorageCaptain
   entities:
   - uid: 14840
@@ -247100,7 +247098,7 @@ entities:
       pos: 7.5,44.5
       parent: 13307
     - type: Door
-      secondsUntilStateChange: -4325.53
+      secondsUntilStateChange: -4287.915
       state: Opening
   - uid: 20774
     components:

diff --git a/Resources/Maps/ADTMaps/adt_origin.yml b/Resources/Maps/ADTMaps/adt_origin.yml
diff --git a/Resources/Prototypes/ADT/Entities/Markers/Spawners/job.yml b/Resources/Prototypes/ADT/Entities/Markers/Spawners/job.yml
@@ -181,7 +181,7 @@
     - type: Sprite
       layers:
         - state: green
-        - state: hop
+        - state: blueshield
 
 - type: entity
   id: ADTSpawnPointRoboticist

diff --git a/Resources/Prototypes/ADT/Entities/Objects/Device/pda.yml b/Resources/Prototypes/ADT/Entities/Objects/Device/pda.yml
@@ -42,18 +42,19 @@
 
 - type: entity
   parent: BasePDA
-  id: ADTBlueShieldOfficerPDA
+  id: ADTBlueshieldOfficerPDA
   name: BlueShield PDA
   description: Smells like protection.
   components:
     - type: Pda
       id: ADTBlueShieldOfficerIDCard
-      state: pda-ert
+      state: pda-blueshield
     - type: PdaBorderColor
-      borderColor: "#A32D26"
-      accentVColor: "#447987"
+      borderColor: "#424248"
+      accentHColor: "#2851a4"
+      accentVColor: "#e1e1e1"
     - type: Icon
-      state: pda-ert
+      state: pda-blueshield
     - type: HealthAnalyzer
       scanDelay: 1.2
 

diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/identification_cards.yml
@@ -43,8 +43,8 @@
   components:
     - type: Sprite
       layers:
-        - state: default
-        - state: ert_security
+        - state: centcom
+        - state: idblueshield
     - type: PresetIdCard
       job: ADTBlueShieldOfficer
 

diff --git a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml
@@ -296,19 +296,6 @@
     - sprite: Mobs/Silicon/chassis.rsi
       state: robot_e
 
-# CentCom
-- type: entity
-  id: SpawnADTBlueShieldOfficer
-  parent: SpawnPointJobBase
-  name: ADTBlueShieldOfficer
-  components:
-    - type: SpawnPoint
-      job_id: ADTBlueShieldOfficer
-    - type: Sprite
-      layers:
-        - state: green
-        - state: blueshield
-
 # Command
 
 - type: entity

diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
@@ -521,24 +521,6 @@
   - type: Icon
     state: pda-cmo
 
-- type: entity
-  parent: BasePDA
-  id: ADTBlueshieldOfficerPDA
-  name: BlueShield PDA
-  description: Smells like protection.
-  components:
-    - type: Pda
-      id: ADTBlueShieldOfficerIDCard
-      state: pda-blueshield
-    - type: PdaBorderColor
-      borderColor: "#424248"
-      accentHColor: "#2851a4"
-      accentVColor: "#e1e1e1"
-    - type: Icon
-      state: pda-blueshield
-    - type: HealthAnalyzer
-      scanDelay: 1.2
-
 - type: entity
   parent: BaseMedicalPDA
   id: MedicalPDA

diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
@@ -75,30 +75,6 @@
     - state: default
     - state: idintern-sci
 
-- type: entity
-  parent: IDCardStandard
-  id: ADTBlueShieldOfficerIDCard
-  name: Blue Shield Officer ID card
-  components:
-    - type: Sprite
-      layers:
-        - state: centcom
-        - state: idblueshield
-    - type: PresetIdCard
-      job: ADTBlueShieldOfficer
-
-- type: entity
-  parent: PassengerIDCard
-  id: SecurityCadetIDCard
-  name: security cadet ID card
-  components:
-  - type: PresetIdCard
-    job: SecurityCadet
-  - type: Sprite
-    layers:
-    - state: default
-    - state: idintern-cadet
-
 - type: entity
   parent: PassengerIDCard
   id: ServiceWorkerIDCard