Skip to content
This repository has been archived by the owner on Nov 1, 2024. It is now read-only.

Commit

Permalink
Merge pull request #89 from Corvax-Frontier/update-upstream2804
Browse files Browse the repository at this point in the history 
Update upstream2804
  • Loading branch information
@Vonsant
Vonsant authored Apr 28, 2024
2 parents cb4a682 + 13300ef commit 008f621
Show file tree
Hide file tree
Showing 18 changed files with 2,341 additions and 2 deletions.
12 changes: 12 additions & 0 deletions Resources/Changelog/Changelog.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4329,3 +4329,15 @@ Entries:
message: 'Fixes the plasteel recipe to be lore accurate: Plasteel = Plasma + Steel'
id: 4951
time: '2024-04-27T23:46:34.0000000+00:00'
- author: dvir01
changes:
- type: Tweak
message: Updated conveyor belts sprites.
id: 4952
time: '2024-04-28T03:15:52.0000000+00:00'
- author: MagnusCrowe
changes:
- type: Tweak
message: Rotated Bocakillo.
id: 4953
time: '2024-04-28T06:02:55.0000000+00:00'
2,071 changes: 2,071 additions & 0 deletions Resources/Maps/_NF/Shuttles/BlackMarket/bocakillo.yml
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Structures/conveyor.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
- type: Transform
anchored: true
- type: Sprite
sprite: Structures/conveyor.rsi
sprite: _NF/Structures/conveyor.rsi # Frontier
state: conveyor_started_cw
drawdepth: FloorObjects
- type: ApcPowerReceiver
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Recipes/Construction/Graphs/structures/conveyor.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
steps:
- tag: ConveyorAssembly
icon:
sprite: Structures/conveyor.rsi
sprite: _NF/Structures/conveyor.rsi # Frontier
state: conveyor_loose
name: conveyor belt assembly
doAfter: 2
Expand Down
Binary file added Resources/Textures/_NF/Structures/conveyor.rsi/conveyor_loose.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/_NF/Structures/conveyor.rsi/conveyor_started_ccw.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/_NF/Structures/conveyor.rsi/conveyor_started_ccw_r.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/_NF/Structures/conveyor.rsi/conveyor_started_cw.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/_NF/Structures/conveyor.rsi/conveyor_started_cw_r.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/_NF/Structures/conveyor.rsi/conveyor_stopped_ccw.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/_NF/Structures/conveyor.rsi/conveyor_stopped_cw.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/_NF/Structures/conveyor.rsi/greenlight.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
256 changes: 256 additions & 0 deletions Resources/Textures/_NF/Structures/conveyor.rsi/meta.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,256 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 and modified by Dvir01",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "conveyor_loose"
},
{
"name": "conveyor_started_ccw",
"directions": 8,
"delays": [
[
0.1,
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1,
0.1
]
]
},
{
"name": "conveyor_started_ccw_r",
"directions": 8,
"delays": [
[
0.1,
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1,
0.1
]
]
},
{
"name": "conveyor_started_cw",
"directions": 8,
"delays": [
[
0.1,
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1,
0.1
]
]
},
{
"name": "conveyor_started_cw_r",
"directions": 8,
"delays": [
[
0.1,
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1,
0.1
]
]
},
{
"name": "conveyor_stopped_ccw",
"directions": 8
},
{
"name": "conveyor_stopped_cw",
"directions": 8
},
{
"name": "greenlight"
},
{
"name": "redlight"
},
{
"name": "switch"
},
{
"name": "switch-fwd"
},
{
"name": "switch-off"
},
{
"name": "switch-rev"
}
]
}
Binary file added Resources/Textures/_NF/Structures/conveyor.rsi/redlight.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/_NF/Structures/conveyor.rsi/switch-fwd.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/_NF/Structures/conveyor.rsi/switch-off.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/_NF/Structures/conveyor.rsi/switch-rev.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/_NF/Structures/conveyor.rsi/switch.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 008f621

Please sign in to comment.