Skip to content

Commit

Permalink
Bug Fix
Browse files Browse the repository at this point in the history
  • Loading branch information
dvir001 committed Mar 4, 2024
1 parent 0585304 commit f898981
Show file tree
Hide file tree
Showing 10 changed files with 63 additions and 31 deletions.
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
ent-CrateThruster = { ent-BaseThruster }
.desc = { ent-BaseThruster.desc }
ent-CrateThruster = thruster crate
.desc = A crate with a thruster that allows a shuttle to move.
ent-CrateGyroscope = { ent-Gyroscope }
.desc = { ent-Gyroscope.desc }
ent-CrateGyroscope = gyroscope crate
.desc = A crate with a gyroscope that increases the shuttle's potential angular rotation.
ent-CrateSmallThruster = { ent-SmallThruster }
.desc = { ent-BaseThruster.desc }
ent-CrateSmallThruster = small thruster crate
.desc = A crate with a small thruster that allows a shuttle to move.
ent-CrateSmallGyroscope = { ent-SmallGyroscope }
.desc = { ent-Gyroscope.desc }
ent-CrateSmallGyroscope = small gyroscope crate
.desc = A crate with a small gyroscope that increases the shuttle's potential angular rotation.
1 change: 1 addition & 0 deletions Resources/Prototypes/Catalog/Cargo/cargo_engines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@
# cost: 1200
# category: Engineering
# group: market

- type: cargoProduct
id: EngineTeslaGroundingRod
icon:
Expand Down
77 changes: 54 additions & 23 deletions Resources/Textures/Objects/Devices/nuke.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -1,26 +1,57 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/835fd60545178a19064f5df9981dac6e1b220775/icons/obj/stationobjs.dmi, nukefestive by Alekshhh (Github)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "nuclearbomb_deployed"
},
"license": "CC-BY-SA-3.0",
"copyright": "Taken from Paradise Station",
"states": [
{
"name": "nuclearbomb_base"
},
{
"name": "nuclearbomb_exploding"
},
{
"name": "nuclearbomb_safetyoff"
},
{
"name": "nuclearbomb_timing"
},
{
"name": "nukefestive"
}
]
{
"name": "nuclearbomb_deployed_unlit"
},
{
"name": "nukefestive",
"delays": [
[
0.25,
0.25
]
]
},
{
"name": "nuclearbomb_timing",
"delays": [
[
0.5,
0.5
]
]
},
{
"name": "nuclearbomb_exploding",
"delays": [
[
0.1,
0.1
]
]
},
{
"name": "nuclearbomb_base"
},
{
"name": "nuclearbombc",
"delays": [
[
1,
0.3,
0.3
]
]
}
]
}
Binary file modified Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_base.png
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.
Binary file not shown.
Binary file modified Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_timing.png
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.

0 comments on commit f898981

Please sign in to comment.