Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

McDelivery Shuttle with McCargo shipyard #843

Merged
merged 30 commits into from
Jan 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
f2c106f
McDelivery
dvir001 Jan 6, 2024
44b442e
Merge branch 'new-frontiers-14:master' into 2024-01-05-McDelivery
dvir001 Jan 6, 2024
d70c9ad
McCargo
dvir001 Jan 6, 2024
df1fa51
Update mcdelivery.yml
dvir001 Jan 6, 2024
2997822
Merge branch 'new-frontiers-14:master' into 2024-01-05-McDelivery
dvir001 Jan 6, 2024
07809b4
Merge branch 'new-frontiers-14:master' into 2024-01-05-McDelivery
dvir001 Jan 7, 2024
fd4c98b
Merge branch 'new-frontiers-14:master' into 2024-01-05-McDelivery
dvir001 Jan 7, 2024
914e6e8
Merge branch 'new-frontiers-14:master' into 2024-01-05-McDelivery
dvir001 Jan 7, 2024
471926e
McCargo McFast Meals
dvir001 Jan 7, 2024
f66be9e
Update mcdelivery.yml
dvir001 Jan 7, 2024
4d3efee
Update mcdelivery.yml
dvir001 Jan 8, 2024
41a8dca
Update mcdelivery.yml
dvir001 Jan 8, 2024
beb18fe
Update mcdelivery.yml
dvir001 Jan 8, 2024
a8afe13
Update mcdelivery.yml
dvir001 Jan 9, 2024
fb978b8
Merge branch 'new-frontiers-14:master' into 2024-01-05-McDelivery
dvir001 Jan 9, 2024
3169664
McCargo
dvir001 Jan 9, 2024
c90f13b
Merge branch 'new-frontiers-14:master' into 2024-01-05-McDelivery
dvir001 Jan 9, 2024
5b74121
Compters
dvir001 Jan 9, 2024
17aa978
McCargo Notice Boards
dvir001 Jan 9, 2024
f90798a
Update mccargo.yml
dvir001 Jan 9, 2024
723bcf1
Update mcdelivery.yml
dvir001 Jan 9, 2024
ce9fb4f
Merge branch '2024-01-05-McDelivery' of https://github.com/dvir001/fr…
dvir001 Jan 9, 2024
907c9bb
Missing wires
dvir001 Jan 9, 2024
5d70151
Merge branch 'new-frontiers-14:master' into 2024-01-05-McDelivery
dvir001 Jan 13, 2024
c651768
McUpdate
dvir001 Jan 13, 2024
d8eda38
Update mccargo.yml
dvir001 Jan 13, 2024
c068a30
Update mccargo.yml
dvir001 Jan 13, 2024
5960362
The fries
dvir001 Jan 13, 2024
d4a440a
Merge branch 'master' into 2024-01-05-McDelivery
dvir001 Jan 14, 2024
675c734
Merge branch 'master' into 2024-01-05-McDelivery
dvir001 Jan 15, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2,331 changes: 1,349 additions & 982 deletions Resources/Maps/_NF/Shuttles/mccargo.yml

Large diffs are not rendered by default.

963 changes: 963 additions & 0 deletions Resources/Maps/_NF/Shuttles/mcdelivery.yml

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
startingInventory:
HappyHonk: 10
HappyHonkMime: 4
MysteryFigureBoxBulk: 5
HappyHonkCargo: 10 # Frontier
ClothingHeadHatMcCrown: 10 # Frontier
MysteryFigureBoxBulk: 5 # Frontier
emaggedInventory:
HappyHonkCluwne: 1
HappyHonkNukie: 1
14 changes: 14 additions & 0 deletions Resources/Prototypes/_NF/Entities/Clothing/Head/hats.yml
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,20 @@
tags:
- WhitelistChameleon

- type: entity
parent: ClothingHeadBase
id: ClothingHeadHatMcCrown
name: mccargo crown
description: 'Crowns and tiaras, McCargo King.'
components:
- type: Sprite
sprite: _NF/Clothing/Head/Hoods/mccargocrown.rsi
- type: Clothing
sprite: _NF/Clothing/Head/Hoods/mccargocrown.rsi
- type: Tag
tags:
- WhitelistChameleon

- type: entity
parent: ClothingHeadBase
id: ClothingHeadHatPilot
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
- type: entity
id: HappyHonkCargo
parent: HappyHonk
name: mccargo meal
components:
- type: Sprite
sprite: _NF/Objects/Storage/Happyhonk/cargo.rsi
state: box
- type: Item
sprite: _NF/Objects/Storage/Happyhonk/cargo.rsi
heldPrefix: box
- type: StorageFill
contents:
- id: MysteryFigureBox
orGroup: GiftPool
- id: ClothingHeadHatMcCrown
orGroup: GiftPool
- type: StaticPrice
price: 40
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,16 @@
- Fighter
- Cleric
- Rogue

# The mccargo console
- type: entity
id: McCargoMothershipComputer
name: McCargo delivery ship console
parent: BaseMothershipComputer
components:
- type: ShipyardListing
shuttles:
- McDelivery

# The caduceus console
- type: entity
Expand Down
8 changes: 4 additions & 4 deletions Resources/Prototypes/_NF/Shipyard/mccargo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,21 @@
#

- type: vessel
id: mccargo
id: McCargo
name: DC McCargo
description: "Your very own McCargo :tm: franchisee! comes fully stocked and ready for production of McCargo meals"
price: 72000 # 10% up from sell
price: 68900 # 10% up from sell
category: Medium
group: Civilian
shuttlePath: /Maps/_NF/Shuttles/mccargo.yml

- type: gameMap
id: mccargo
id: McCargo
mapName: 'DC McCargo'
mapPath: /Maps/_NF/Shuttles/mccargo.yml
minPlayers: 0
stations:
mccargo:
McCargo:
stationProto: StandardFrontierVessel
components:
- type: StationNameSetup
Expand Down
33 changes: 33 additions & 0 deletions Resources/Prototypes/_NF/Shipyard/mcdelivery.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# Maintainer Info
# GitHub: dvir001
# Discord: dvir01 (84770870936997888)

# Shuttle Notes:
#

- type: vessel
id: McDelivery
name: DC McDelivery
description: "Fast food fast ship, bring the McCargo meals to the people"
price: 11300
category: Small
group: None
shuttlePath: /Maps/_NF/Shuttles/mcdelivery.yml

- type: gameMap
id: McDelivery
mapName: 'DC McDelivery'
mapPath: /Maps/_NF/Shuttles/mcdelivery.yml
minPlayers: 0
stations:
McDelivery:
stationProto: StandardFrontierVessel
components:
- type: StationNameSetup
mapNameTemplate: 'McDelivery {1}'
nameGenerator:
!type:NanotrasenNameGenerator
prefixCreator: '14'
- type: StationJobs
overflowJobs: []
availableJobs: {}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Made by gentlebutter",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-HELMET",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Made by gentlebutter",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "box"
},
{
"name": "box-open"
},
{
"name": "box-inhand-left",
"directions": 4
},
{
"name": "box-inhand-right",
"directions": 4
}
]
}
Loading