Cherry-picked commit f3048043658cde7a69c831b3c5342d516ed55449 from De…

…ltaV-Station/Delta-v/master

Resources/Locale/en-US/deltav/warp-points/warp-points.ftl

@@ -1,4 +1,4 @@
-warp-point-evac = Evac
+warp-point-evacshuttle = Evac Shuttle
 warp-point-shuttle = Shuttle
 warp-point-debris = Space Debris
 warp-point-ruin = Space Ruin

Resources/Prototypes/DeltaV/Entities/Markers/warp_points.yml → Resources/Prototypes/DeltaV/Entities/Markers/warp_point.yml

@@ -5,31 +5,31 @@
   suffix: Evac Shuttle
   components:
   - type: WarpPoint
-    location: warp-point-evac
+    location: Evac Shuttle
 
 - type: entity
   id: WarpPointShuttle
   parent: WarpPoint
   suffix: Shuttle
   components:
   - type: WarpPoint
-    location: warp-point-shuttle
+    location: Shuttle
 
 - type: entity
   id: WarpPointDebris
   parent: WarpPoint
   suffix: Space Debris
   components:
   - type: WarpPoint
-    location: warp-point-debris
+    location: Space Debris
 
 - type: entity
   id: WarpPointRuin
   parent: WarpPoint
   suffix: Space Ruin
   components:
   - type: WarpPoint
-    location: warp-point-ruin
+    location: Space Ruin
 
 # Command
 - type: entity
@@ -38,15 +38,15 @@
   suffix: Bridge
   components:
   - type: WarpPoint
-    location: warp-point-bridge
+    location: Bridge
 
 - type: entity
   id: WarpPointVault
   parent: WarpPoint
   suffix: Vault
   components:
   - type: WarpPoint
-    location: warp-point-vault
+    location: Vault
 
 # Security
 - type: entity
@@ -55,31 +55,31 @@
   suffix: Security
   components:
   - type: WarpPoint
-    location: warp-point-sec
+    location: Security
 
 - type: entity
   id: WarpPointPerma
   parent: WarpPoint
   suffix: Perma
   components:
   - type: WarpPoint
-    location: warp-point-perma
+    location: Perma
 
 - type: entity
   id: WarpPointDetective
   parent: WarpPoint
   suffix: Detective
   components:
   - type: WarpPoint
-    location: warp-point-detective
+    location: Detective
 
 - type: entity
   id: WarpPointCourt
   parent: WarpPoint
   suffix: Courtroom
   components:
   - type: WarpPoint
-    location: warp-point-court
+    location: Courtroom
 
 #Medical
 - type: entity
@@ -88,15 +88,15 @@
   suffix: Medical
   components:
   - type: WarpPoint
-    location: warp-point-medical
+    location: Medical
 
 - type: entity
   id: WarpPointMorgue
   parent: WarpPoint
   suffix: Morgue
   components:
   - type: WarpPoint
-    location: warp-point-morgue
+    location: Morgue
 
 #Epistemics
 - type: entity
@@ -105,7 +105,7 @@
   suffix: Epistemics
   components:
   - type: WarpPoint
-    location: warp-point-epistemics
+    location: Epistemics
 
 #Logistics
 - type: entity
@@ -114,15 +114,15 @@
   suffix: Logistics
   components:
   - type: WarpPoint
-    location: warp-point-logistics
+    location: Logistics
 
 - type: entity
   id: WarpPointSalvage
   parent: WarpPoint
   suffix: Salvage
   components:
   - type: WarpPoint
-    location: warp-point-salvage
+    location: Salvage
 
 #Engineering
 - type: entity
@@ -131,23 +131,23 @@
   suffix: Engineering
   components:
   - type: WarpPoint
-    location: warp-point-engineering
+    location: Engineering
 
 - type: entity
   id: WarpPointSingulo
   parent: WarpPoint
   suffix: Singularity
   components:
   - type: WarpPoint
-    location: warp-point-singularity
+    location: Singularity
 
 - type: entity
   id: WarpPointAtmos
   parent: WarpPoint
   suffix: Atmos
   components:
   - type: WarpPoint
-    location: warp-point-atmospherics
+    location: Atmos
 
 #Service
 - type: entity
@@ -156,55 +156,55 @@
   suffix: HoP
   components:
   - type: WarpPoint
-    location: warp-point-hop
+    location: HoP
 
 - type: entity
   id: WarpPointKitchen
   parent: WarpPoint
   suffix: Kitchen
   components:
   - type: WarpPoint
-    location: warp-point-kitchen
+    location: Kitchen
 
 - type: entity
   id: WarpPointBar
   parent: WarpPoint
   suffix: Bar
   components:
   - type: WarpPoint
-    location: warp-point-bar
+    location: Bar
 
 - type: entity
   id: WarpPointBotany
   parent: WarpPoint
   suffix: Botany
   components:
   - type: WarpPoint
-    location: warp-point-botany
+    location: Botany
 
 - type: entity
   id: WarpPointJanitor
   parent: WarpPoint
   suffix: Janitor
   components:
   - type: WarpPoint
-    location: warp-point-janitor
+    location: Janitor
 
 - type: entity
   id: WarpPointReporter
   parent: WarpPoint
   suffix: Reporter
   components:
   - type: WarpPoint
-    location: warp-point-reporter
+    location: Reporter
 
 - type: entity
   id: WarpPointLawyer
   parent: WarpPoint
   suffix: Lawyer
   components:
   - type: WarpPoint
-    location: warp-point-lawyer
+    location: Lawyer
 
 #Misc
 - type: entity
@@ -213,60 +213,60 @@
   suffix: AI
   components:
   - type: WarpPoint
-    location: warp-point-ai
+    location: AI
 
 - type: entity
   id: WarpPointArrivals
   parent: WarpPoint
   suffix: Arrivals
   components:
   - type: WarpPoint
-    location: warp-point-arrivals
+    location: Arrivals
 
 - type: entity
   id: WarpPointEvac
   parent: WarpPoint
   suffix: Evac
   components:
   - type: WarpPoint
-    location: warp-point-evac
+    location: Evac
 
 - type: entity
   id: WarpPointCryo
   parent: WarpPoint
   suffix: Cryo
   components:
   - type: WarpPoint
-    location: warp-point-cryo
+    location: Cryo
 
 - type: entity
   id: WarpPointChapel
   parent: WarpPoint
   suffix: Chapel
   components:
   - type: WarpPoint
-    location: warp-point-chapel
+    location: Chapel
 
 - type: entity
   id: WarpPointLibrary
   parent: WarpPoint
   suffix: Library
   components:
   - type: WarpPoint
-    location: warp-point-library
+    location: Library
 
 - type: entity
   id: WarpPointDorms
   parent: WarpPoint
   suffix: Dorms
   components:
   - type: WarpPoint
-    location: warp-point-dorms
+    location: Dorms
 
 - type: entity
   id: WarpPointDisposals
   parent: WarpPoint
   suffix: Disposals
   components:
   - type: WarpPoint
-    location: warp-point-disposals
+    location: Disposals