Merge branch 'master' into lunchboxes

Resources/Maps/Shuttles/NTES_Centipede.yml → Resources/Maps/Shuttles/DeltaV/NTES_Centipede.yml

@@ -22,7 +22,8 @@ entities:
   entities:
   - uid: 1
     components:
-    - type: MetaData
+    - name: NTES Centipede
+      type: MetaData
     - pos: 0.39469033,0.22088978
       parent: invalid
       type: Transform
@@ -1781,32 +1782,6 @@ entities:
     - pos: -10.5,19.5
       parent: 1
       type: Transform
-- proto: AlwaysPoweredLightColoredRed
-  entities:
-  - uid: 687
-    components:
-    - pos: -12.5,-35.5
-      parent: 1
-      type: Transform
-  - uid: 1417
-    components:
-    - pos: -8.5,-35.5
-      parent: 1
-      type: Transform
-- proto: AlwaysPoweredLightSodium
-  entities:
-  - uid: 1418
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -15.5,-41.5
-      parent: 1
-      type: Transform
-  - uid: 1419
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -5.5,-41.5
-      parent: 1
-      type: Transform
 - proto: APCBasic
   entities:
   - uid: 1534
@@ -7098,6 +7073,13 @@ entities:
     - pos: -11.5,-25.5
       parent: 1
       type: Transform
+- proto: FoodCakeBirthday
+  entities:
+  - uid: 1506
+    components:
+    - pos: -12.487526,-29.333473
+      parent: 1
+      type: Transform
 - proto: FoodTartGrape
   entities:
   - uid: 1495
@@ -10930,6 +10912,14 @@ entities:
     - pos: -7.5,-23.5
       parent: 1
       type: Transform
+- proto: MaintenanceToolSpawner
+  entities:
+  - uid: 1507
+    components:
+    - rot: 3.141592653589793 rad
+      pos: -12.5,15.5
+      parent: 1
+      type: Transform
 - proto: MedicalBed
   entities:
   - uid: 530
@@ -11317,6 +11307,16 @@ entities:
       type: Transform
     - powerLoad: 0
       type: ApcPowerReceiver
+  - uid: 687
+    components:
+    - pos: -8.5,-35.5
+      parent: 1
+      type: Transform
+  - uid: 1417
+    components:
+    - pos: -12.5,-35.5
+      parent: 1
+      type: Transform
   - uid: 1451
     components:
     - pos: -4.5,-43.5
@@ -11431,6 +11431,20 @@ entities:
       type: Transform
     - powerLoad: 0
       type: ApcPowerReceiver
+- proto: PoweredlightSodium
+  entities:
+  - uid: 1418
+    components:
+    - rot: 3.141592653589793 rad
+      pos: -5.5,-41.5
+      parent: 1
+      type: Transform
+  - uid: 1419
+    components:
+    - rot: 3.141592653589793 rad
+      pos: -15.5,-41.5
+      parent: 1
+      type: Transform
 - proto: PoweredSmallLight
   entities:
   - uid: 1431
@@ -11670,6 +11684,43 @@ entities:
     - pos: -5.5,-39.5
       parent: 1
       type: Transform
+- proto: Screen
+  entities:
+  - uid: 1497
+    components:
+    - pos: -16.5,21.5
+      parent: 1
+      type: Transform
+  - uid: 1498
+    components:
+    - pos: -4.5,21.5
+      parent: 1
+      type: Transform
+  - uid: 1500
+    components:
+    - pos: -10.5,10.5
+      parent: 1
+      type: Transform
+  - uid: 1501
+    components:
+    - pos: -10.5,-1.5
+      parent: 1
+      type: Transform
+  - uid: 1503
+    components:
+    - pos: -10.5,-6.5
+      parent: 1
+      type: Transform
+  - uid: 1504
+    components:
+    - pos: -6.5,-23.5
+      parent: 1
+      type: Transform
+  - uid: 1505
+    components:
+    - pos: -7.5,-38.5
+      parent: 1
+      type: Transform
 - proto: Screwdriver
   entities:
   - uid: 1626

Resources/Maps/hammurabi.yml

@@ -86758,27 +86758,6 @@ entities:
       pos: 36.47866,-34.43493
       parent: 1
       type: Transform
-- proto: ClothingOuterHardsuitAtmos
-  entities:
-  - uid: 29233
-    components:
-    - pos: -30.966703,-22.620975
-      parent: 1
-      type: Transform
-- proto: ClothingOuterHardsuitEngineering
-  entities:
-  - uid: 42054
-    components:
-    - pos: -30.300037,-22.6314
-      parent: 1
-      type: Transform
-- proto: ClothingOuterHardsuitEngineeringWhite
-  entities:
-  - uid: 42053
-    components:
-    - pos: -31.643787,-22.641825
-      parent: 1
-      type: Transform
 - proto: ClothingOuterHoodieBlack
   entities:
   - uid: 30361
@@ -107479,8 +107458,6 @@ entities:
     - pos: -42.5,-59.5
       parent: 1
       type: Transform
-    - storageUsed: 15
-      type: Storage
     - containers:
         storagebase: !type:Container
           showEnts: False
@@ -203139,10 +203116,29 @@ entities:
       type: Transform
   - uid: 42000
     components:
-    - pos: -100.50548,0.6769848
+    - pos: -100.50558,0.7054387
       parent: 1
       type: Transform
-    - content: 'Captain:'
+    - content: >-
+        Captain:
+
+
+        A few notes:
+
+
+        1. As Hammurabi Station is a designated prison facility, all ore is to be diverted to prison workshop for processing. Materials produced by the prisoners will be sent back to Logistics for distribution throughout the station as needed.
+
+        Please coordinate with the warden and logistics officer to ensure the production chain is maintained efficiently.
+
+
+        2. The prison is on its own power grid and thus, the AME NE of the prison needs to be fueled.
+
+        Please make certain the engineering team is aware of this.
+
+
+        Regards, 
+
+        Central Command
       type: Paper
 - proto: PaperBin10
   entities:
@@ -270229,9 +270225,9 @@ entities:
     - pos: 47.5,-59.5
       parent: 1
       type: Transform
-    - text: Prison Wvac
+    - text: Prison Evac
       type: NavMapBeacon
-    - location: Prison Wvac
+    - location: Prison Evac
       type: WarpPoint
 - proto: WarpPointBeaconService
   entities:

Resources/Prototypes/Maps/arena.yml

@@ -13,7 +13,7 @@
             !type:NanotrasenNameGenerator
             prefixCreator: 'TG'
         - type: StationEmergencyShuttle
-          emergencyShuttlePath: /Maps/Shuttles/NTES_UCLB.yml
+          emergencyShuttlePath: /Maps/Shuttles/DeltaV/NTES_UCLB.yml
         - type: StationJobs
           overflowJobs:
             - Passenger

Resources/Prototypes/Maps/hammurabi.yml

@@ -13,7 +13,7 @@
             !type:NanotrasenNameGenerator
             prefixCreator: 'TG'
         - type: StationEmergencyShuttle
-          emergencyShuttlePath: /Maps/Shuttles/NTES_Centipede.yml
+          emergencyShuttlePath: /Maps/Shuttles/DeltaV/NTES_Centipede.yml
         - type: StationJobs
           overflowJobs:
             - Passenger

Resources/Prototypes/Maps/hive.yml

@@ -14,7 +14,7 @@
             !type:NanotrasenNameGenerator
             prefixCreator: 'TG'
         - type: StationEmergencyShuttle
-          emergencyShuttlePath: /Maps/Shuttles/NTES_Seal.yml
+          emergencyShuttlePath: /Maps/Shuttles/DeltaV/NTES_Seal.yml
         - type: StationJobs
           overflowJobs:
             - Passenger

Resources/Prototypes/Maps/tortuga.yml

@@ -13,7 +13,7 @@
             !type:NanotrasenNameGenerator
             prefixCreator: 'TG'
         - type: StationEmergencyShuttle
-          emergencyShuttlePath: /Maps/Shuttles/NTES_Seal.yml
+          emergencyShuttlePath: /Maps/Shuttles/DeltaV/NTES_Seal.yml
         - type: StationJobs
           overflowJobs:
             - Passenger

Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml

@@ -28,7 +28,7 @@
   id: ParamedicGear
   equipment:
     jumpsuit: ClothingUniformJumpsuitParamedic
-    back: ClothingBackpackParamedicFilled # DeltaV - Give Paramedics useful tools on spawn, see Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StargerGear/backpack.yml
+    back: ClothingBackpackParamedicFilledDV # DeltaV - Give Paramedics useful tools on spawn, see Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StargerGear/backpack.yml
     shoes: ClothingShoesColorBlue
     id: ParamedicPDA
     ears: ClothingHeadsetMedical