Skip to content

Commit

Permalink
Merge branch 'DeltaV-Station:master' into why
Browse files Browse the repository at this point in the history
  • Loading branch information
DinoWattz authored Mar 28, 2024
2 parents 29bf53f + b432789 commit 8348652
Show file tree
Hide file tree
Showing 5 changed files with 867 additions and 251 deletions.
7 changes: 7 additions & 0 deletions Resources/Changelog/DeltaVChangelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1960,3 +1960,10 @@
id: 298
time: '2024-03-28T15:27:57.0000000+00:00'
url: https://github.com/DeltaV-Station/Delta-v/pull/1022
- author: FluffiestFloof
changes:
- message: Felinids, Harpies and Vulpkanin should now Weh accordingly.
type: Fix
id: 299
time: '2024-03-28T18:27:42.0000000+00:00'
url: https://github.com/DeltaV-Station/Delta-v/pull/992
16 changes: 8 additions & 8 deletions Resources/Locale/en-US/deltav/navmap-beacons/station-beacons.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,31 @@ station-beacon-epistemics = Epistemics
station-beacon-mystagogue = Mystagogue
station-beacon-logistics = Logistics
station-beacon-logistics-reception = Logistics Reception
station-beacon-logistics-reception = Logistics
station-beacon-lo = LO
station-beacon-conference-room = Conference Room
station-beacon-virology = Virology
station-beacon-metempsychosis = Metempsychosis
station-beacon-exam = Exam Room
station-beacon-exam = Exam
station-beacon-med-outpost = Med Outpost
station-beacon-psych = Psychologist
station-beacon-psych = Psych
station-beacon-glimmer-prober = Glimmer Prober
station-beacon-forensic-mantis = Forensic Mantis
station-beacon-glimmer-prober = Prober
station-beacon-forensic-mantis = Mantis
station-beacon-mailroom = Mail
station-beacon-engi-outpost = Engi Outpost
station-beacon-janitor-office = Jani Office
station-beacon-janitor-closet = Jani closet
station-beacon-janitor-closet = Jani Closet
station-beacon-reporter = Reporter
station-beacon-camera-servers = Camera Servers
station-beacon-camera-servers = Cameras
station-beacon-boxing-ring = Boxing Ring
station-beacon-boxing-ring = Boxing
station-beacon-park = Park
station-beacon-corpsman = Corpsman
Loading

0 comments on commit 8348652

Please sign in to comment.