Skip to content

Commit

Permalink
Undo warp-strings (#103)
Browse files Browse the repository at this point in the history
## Mirror of PR #1013: [Undo
warp-strings](DeltaV-Station/Delta-v#1013) from
<img src="https://avatars.githubusercontent.com/u/131613340?v=4"
alt="DeltaV-Station" width="22"/>
[DeltaV-Station](https://github.com/DeltaV-Station)/[Delta-v](https://github.com/DeltaV-Station/Delta-v)

###### `f3048043658cde7a69c831b3c5342d516ed55449`

PR opened by <img
src="https://avatars.githubusercontent.com/u/107660393?v=4"
width="16"/><a href="https://github.com/IamVelcroboy"> IamVelcroboy</a>
at 2024-03-27 16:28:25 UTC
PR merged by <img
src="https://avatars.githubusercontent.com/u/19864447?v=4"
width="16"/><a href="https://github.com/web-flow"> web-flow</a> at
2024-03-27 16:40:16 UTC

---

PR changed 2 files with 34 additions and 34 deletions.

The PR had the following labels:
- Changes: YML
- Changes: Localization


---

<details open="true"><summary><h1>Original Body</h1></summary>

> ## About the PR
> Moves warp point location out of local strings
> 
> ## Why / Balance
> Code not properly set up to read it. I will leave the local file in
so, in the future we can adjust to use it. But I am too busy and will
not have time to do that any time soon. But this change is holding up
map merges. So, this is the next best.


</details>

---------

Co-authored-by: Fluffiest Floofers <[email protected]>
Co-authored-by: Velcroboy <[email protected]>
Co-authored-by: VMSolidus <[email protected]>
  • Loading branch information
4 people committed May 11, 2024
1 parent 2f6ab4a commit be0115b
Show file tree
Hide file tree
Showing 19 changed files with 359 additions and 52 deletions.
2 changes: 1 addition & 1 deletion Resources/Locale/en-US/deltav/warp-points/warp-points.ftl
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -105,7 +105,7 @@
suffix: Epistemics
components:
- type: WarpPoint
location: warp-point-epistemics
location: Epistemics

#Logistics
- type: entity
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Loading

0 comments on commit be0115b

Please sign in to comment.