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

Adds some spookuary cheer from Bing and Ghost Prince. #2256

Merged
merged 7 commits into from
Oct 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 changes: 2 additions & 0 deletions Content.Server/Holiday/HolidaySystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ private void OnVisualsInit(Entity<HolidayVisualsComponent> ent, ref ComponentIni
}
}

// Frontier: holiday-themed entity replacement
private void OnBeforeRead(BeforeEntityReadEvent ev)
{
foreach (var holiday in _currentHolidays)
Expand All @@ -131,6 +132,7 @@ private void OnBeforeRead(BeforeEntityReadEvent ev)
}
}
}
// End Frontier
}

/// <summary>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
- type: entity
parent: RandomPainting
id: RandomPaintingHalloween
suffix: Halloween
components:
- type: RandomSpawner
offset: 0
prototypes:
- PaintingPersistenceOfMemory
- PaintingTheSonOfMan
- PaintingTheKiss
- PaintingTheScream
- PaintingTheGreatWave
- PaintingCafeTerraceAtNight
- PaintingNightHawks
- PaintingSkeletonCigarette
- PaintingPrayerHands
- PaintingOldGuitarist
- PaintingOlympia
- PaintingSaturn
- PaintingSleepingGypsy
- PaintingRedBlueYellow
- PaintingHelloWorld
- PaintingNightOfThePostGoblin
# Special halloween posters
- PaintingSpookyIan
- PaintingSpookyLady
chance: 1
rarePrototypes:
- PaintingSkeletonBoof
- PaintingEmpty
- PaintingMoony
- PaintingAmogusTriptych
rareChance: 0.01
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,23 @@
- type: Sprite
sprite: _NF/Structures/Wallmounts/paintings.rsi
state: painting0

- type: entity
parent: PaintingBase
id: PaintingSpookyIan
name: Duty Without End
description: Their vigil is eternal.
components:
- type: Sprite
sprite: _NF/Structures/Wallmounts/paintings.rsi
state: painting1

- type: entity
parent: PaintingBase
id: PaintingSpookyLady
name: The Lady and the Banners
description: A woman stands invitingly before a castle of ominous portent. How the windows beckon! How your gaze is arrested!
components:
- type: Sprite
sprite: _NF/Structures/Wallmounts/paintings.rsi
state: painting2
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,46 @@
parent: PaintingDirectionalBase
id: PaintingFireaxeCabinet
name: The Fireaxe Cabinet
description: "Painting is a masterfully designed image of a fireaxe cabinet. The artwork relates to the loss of the masterwork ☼fireaxe☼ in the early winter of 2523. Oil. Canvas. Tears."
description: "This painting is a masterfully designed image of a fireaxe cabinet. The artwork relates to the loss of the masterwork ☼fireaxe☼ in the early winter of 2523. Oil. Canvas. Tears."
components:
- type: Sprite
state: painting_fireaxe
state: painting_fireaxe

- type: entity
parent: PaintingDirectionalBase
id: PaintingGhostHanging
name: festive ghost streamers
description: "Decorative wall streamers! They look like the people you've lost to the void!"
components:
- type: Sprite
drawdepth: Overdoors
state: painting_ghost
- type: Construction
graph: PaintingGhostHangingGraph
node: PaintingGhostHangingNode

- type: entity
parent: PaintingDirectionalBase
id: PaintingBatHanging
name: festive bat streamers
description: "Decorative wall streamers! Bats are scary and also important pollinators!"
components:
- type: Sprite
drawdepth: Overdoors
state: painting_bat
- type: Construction
graph: PaintingBatHangingGraph
node: PaintingBatHangingNode

- type: entity
parent: PaintingDirectionalBase
id: PaintingPumpkinHanging
name: festive pumpkin streamers
description: "Decorative wall streamers! It's decorative gourd season!"
components:
- type: Sprite
drawdepth: Overdoors
state: painting_pumpkin
- type: Construction
graph: PaintingPumpkinHangingGraph
node: PaintingPumpkinHangingNode
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
- type: constructionGraph
id: PaintingGhostHangingGraph
start: start
graph:
- node: start
actions:
- !type:DestroyEntity { }
edges:
- to: PaintingGhostHangingNode
completed:
- !type:SnapToGrid { }
steps:
- material: Paper
amount: 1
doAfter: 2

- node: PaintingGhostHangingNode
entity: PaintingGhostHanging
edges:
- to: start
steps:
- tool: Cutting
doAfter: 2

- type: constructionGraph
id: PaintingBatHangingGraph
start: start
graph:
- node: start
actions:
- !type:DestroyEntity { }
edges:
- to: PaintingBatHangingNode
completed:
- !type:SnapToGrid { }
steps:
- material: Paper
amount: 1
doAfter: 2

- node: PaintingBatHangingNode
entity: PaintingBatHanging
edges:
- to: start
steps:
- tool: Cutting
doAfter: 2

- type: constructionGraph
id: PaintingPumpkinHangingGraph
start: start
graph:
- node: start
actions:
- !type:DestroyEntity { }
edges:
- to: PaintingPumpkinHangingNode
completed:
- !type:SnapToGrid { }
steps:
- material: Paper
amount: 1
doAfter: 2

- node: PaintingPumpkinHangingNode
entity: PaintingPumpkinHanging
edges:
- to: start
steps:
- tool: Cutting
doAfter: 2
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
- type: construction
name: festive ghost streamers
id: PaintingGhostHangingConstruction
graph: PaintingGhostHangingGraph
startNode: start
targetNode: PaintingGhostHangingNode
category: construction-category-misc
description: Decorative wall streamers! They look like the people you've lost to the void!
objectType: Structure
placementMode: SnapgridCenter
canBuildInImpassable: true
icon:
sprite: _NF/Structures/Wallmounts/paintings_directional.rsi
state: painting_ghost

- type: construction
name: festive bat streamers
id: PaintingBatHangingConstruction
graph: PaintingBatHangingGraph
startNode: start
targetNode: PaintingBatHangingNode
category: construction-category-misc
description: Decorative wall streamers! Bats are scary and also important pollinators!
objectType: Structure
placementMode: SnapgridCenter
canBuildInImpassable: true
icon:
sprite: _NF/Structures/Wallmounts/paintings_directional.rsi
state: painting_bat

- type: construction
name: festive pumpkin streamers
id: PaintingPumpkinHangingConstruction
graph: PaintingPumpkinHangingGraph
startNode: start
targetNode: PaintingPumpkinHangingNode
category: construction-category-misc
description: Decorative wall streamers! It's decorative gourd season!
objectType: Structure
placementMode: SnapgridCenter
canBuildInImpassable: true
icon:
sprite: _NF/Structures/Wallmounts/paintings_directional.rsi
state: painting_pumpkin

1 change: 1 addition & 0 deletions Resources/Prototypes/holidays.yml
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,7 @@
entityReplacements: # Frontier
KitchenDeepFryer: KitchenDeepFryerCauldron # Frontier
KitchenDeepFryerPOI: KitchenDeepFryerCauldronPOI # Frontier
RandomPainting: RandomPaintingHalloween # Frontier

- type: holiday
id: VeganDay
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,59 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Created by erhardsteinhauer, gentlebutter & ghostprince",
"license": "CC-BY-NC-SA-4.0",
"copyright": "Created by erhardsteinhauer, gentlebutter & ghostprince, painting1 by gentlebutter, painting2 by ghostprince",
"size": {
"x": 32,
"y": 32
},
"states": [
{ "name": "painting0" }
{ "name": "painting0" },
{
"name": "painting1",
"delays": [
[
300.0,
0.1,
0.1,
0.1,
0.15,
0.35,
0.1,
0.1
]
]
},
{
"name": "painting2",
"delays": [
[
0.25,
0.25,
0.25,
0.25,
0.25,
1.00,
0.25,
0.25,
0.25,
0.25,
0.25,
0.25,
0.25,
0.25,
0.25,
0.25,
0.25,
0.25,
0.25,
1.00,
0.25,
0.25,
0.25,
0.25,
0.25
]
]
}
]
}
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
@@ -1,29 +1,28 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Created by erhardsteinhauer (discord) for NF in commemoration of removal fireaxe cabinet [filled] from NT Liquidator class service ship",
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-NC-SA-4.0",
"copyright": "Created by erhardsteinhauer (discord) for NF in commemoration of removal fireaxe cabinet [filled] from NT Liquidator class service ship, ghost, bat and pumpkin decorations by ghostprince",
"states": [
{
"name": "painting_fireaxe",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
"directions": 4
},
{
"name": "painting_ghost",
"directions": 4
},
{
"name": "painting_bat",
"directions": 4
},
{
"name": "painting_pumpkin",
"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