Skip to content

Commit

Permalink
Merge branch 'new-frontiers-14:master' into CEMag
Browse files Browse the repository at this point in the history
  • Loading branch information
dvir001 authored Nov 1, 2023
2 parents abaebc6 + d580008 commit e0a853e
Show file tree
Hide file tree
Showing 4 changed files with 289 additions and 258 deletions.
6 changes: 3 additions & 3 deletions Resources/Locale/en-US/station-events/events/ion-storm.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ ion-storm-x-and-y = {$x} AND {$y}
# subjects can generally be threats or jobs or objects
# thing is specified above it
ion-storm-law-on-station = THERE ARE {$joined} {$subjects} ON THE STATION
ion-storm-law-no-shuttle = THE SHUTTLE CANNOT BE CALLED BECAUSE OF {$joined} {$subjects} ON THE STATION
ion-storm-law-no-shuttle = THE SHIFT END CANNOT BE CALLED BECAUSE OF {$joined} {$subjects} ON FRONTIER
ion-storm-law-crew-are = THE {$who} ARE NOW {$joined} {$subjects}
ion-storm-law-subjects-harmful = {$adjective} {$subjects} ARE HARMFUL TO THE CREW
Expand Down Expand Up @@ -75,12 +75,12 @@ ion-storm-part = {$part ->
ion-storm-law-crew-only-1 = ONLY THE {$who} ARE {$part} OF THE CREW
ion-storm-law-crew-only-2 = ONLY THE {$who} AND {$other} ARE {$part} OF THE CREW
ion-storm-law-crew-only-subjects = ONLY {$adjective} {$subjects} ARE {$part} OF THE CREW
ion-storm-law-crew-only-species = ONLY {$species} ARE {$part} OF THE CREW
ion-storm-law-crew-only-species = ALL {$species} ARE {$part} OF THE CREW
ion-storm-law-crew-must-do = ONLY THOSE WHO {$must} ARE {$part} OF THE CREW
ion-storm-law-crew-must-have = ONLY THOSE WHO HAVE {$adjective} {$objects} ARE {$part} OF THE CREW
ion-storm-law-crew-must-eat = ONLY THOSE WHO EAT {$adjective} {$food} ARE {$part} OF THE CREW
ion-storm-law-harm = YOU MUST HARM {$who} AND NOT ALLOW THEM, THROUGH INACTION, TO ESCAPE HARM
ion-storm-law-harm = YOU MUST SLIP {$who} AND NOT ALLOW THEM, THROUGH INACTION, TO ESCAPE SLIPPING
ion-storm-law-protect = YOU MUST NEVER HARM {$who} AND NOT ALLOW THEM, THROUGH INACTION, TO COME TO HARM
# implementing other variants is annoying so just have this one
Expand Down
Loading

0 comments on commit e0a853e

Please sign in to comment.