Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
fc-pregmod
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
pregmodfan
fc-pregmod
Commits
043cb10e
Commit
043cb10e
authored
4 years ago
by
Pregmodder
Browse files
Options
Downloads
Plain Diff
Merge branch 'market-to-js' into 'pregmod-master'
Market to JS Closes
#2160
See merge request
!7555
parents
bb6c8d1d
a60a7351
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!7555
Market to JS
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/markets/theMarket/marketData.js
+2
-1
2 additions, 1 deletion
src/markets/theMarket/marketData.js
with
2 additions
and
1 deletion
src/markets/theMarket/marketData.js
+
2
−
1
View file @
043cb10e
...
@@ -35,6 +35,7 @@ App.Data.Markets = {
...
@@ -35,6 +35,7 @@ App.Data.Markets = {
title
:
"
Order a custom husk slave from the Flesh Heap
"
,
title
:
"
Order a custom husk slave from the Flesh Heap
"
,
passage
:
`Husk Slave`
,
passage
:
`Husk Slave`
,
note
:
`Will need to be used on arrival.`
,
note
:
`Will need to be used on arrival.`
,
bulkAvailable
:
false
,
get
requirements
()
{
return
(
V
.
bodyswapAnnounced
===
1
);
}
get
requirements
()
{
return
(
V
.
bodyswapAnnounced
===
1
);
}
},
},
{
{
...
@@ -203,7 +204,7 @@ App.Data.Markets = {
...
@@ -203,7 +204,7 @@ App.Data.Markets = {
passage
:
`Slave Shelter`
,
passage
:
`Slave Shelter`
,
marketType
:
""
,
marketType
:
""
,
note
:
"
Presents charity cases for a nominal fee.
"
,
note
:
"
Presents charity cases for a nominal fee.
"
,
bulkAvailable
:
tru
e
,
bulkAvailable
:
fals
e
,
get
requirements
()
{
get
requirements
()
{
if
(
V
.
arcologies
[
0
].
FSDegradationist
!==
"
unset
"
)
{
if
(
V
.
arcologies
[
0
].
FSDegradationist
!==
"
unset
"
)
{
return
`The Slave Shelter does not place slaves into Degradationist arcologies.`
;
return
`The Slave Shelter does not place slaves into Degradationist arcologies.`
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment