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

resprite of the nukie chemvend, the syndiejuice #1097

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
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
Original file line number Diff line number Diff line change
Expand Up @@ -2219,7 +2219,7 @@
parent: VendingMachineChemicals
id: VendingMachineChemicalsSyndicate
name: SyndieJuice
description: Not made with freshly squeezed syndies I hope.
description: Not made with freshly squeezed syndies, I hope.
components:
- type: VendingMachine
pack: ChemVendInventorySyndicate
Expand All @@ -2228,6 +2228,15 @@
normalState: normal
denyState: deny
ejectDelay: 2
- type: Sprite
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you should indicate that this is an altered upstream file with a comment (# imp)

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the meta.json should have this? if that didnt get pushed im going to be annoyed

Copy link

@hivehum hivehum Dec 22, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this specific comment was on the syndiejuice prototype. this is an upstream prototype you are modifying, so it should be indicated as such, so that the changes aren't lost in the case of upstream modifying this prototype

sprite: Structures/Machines/VendingMachines/syndiejuice.rsi
layers:
- state: "off"
map: ["enum.VendingMachineVisualLayers.Base"]
- state: "off"
map: ["enum.VendingMachineVisualLayers.BaseUnshaded"]
- state: panel
map: ["enum.WiresVisualLayers.MaintenancePanel"]
- type: AccessReader
access: [["SyndicateAgent"]]

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.
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this rsi file needs to be in our file structure

Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tg at https://github.com/tgstation/tgstation/commit/245b29599acbb6bba24f005095e7798e954fc81c",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "broken"
},
{
"name": "deny",
"delays": [
[
0.5,
0.5
]
]
},
{
"name": "normal",
"delays": [
[
0.5,
0.5
]
]
},
{
"name": "off"
},
{
"name": "panel"
}
]
}
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