tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

inhands for Syndicate Things (and thief beacon) (#37682)

Browse Source 
* initial

* splitting this b

* thief bacon 1 handed

* why is test fail

* dont fail please

* "requires"

* evil tests
This commit is contained in:
mubururu_
2025-05-21 10:39:29 -05:00
committed by GitHub
parent 83f1131f19
commit 588bc52f26
16 changed files with 189 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
View File

@@ -2311,6 +2311,7 @@
Brute: 5 Brute: 5
- type: Item - type: Item
size: Normal size: Normal
sprite: Mobs/Animals/grenadepenguin.rsi
- type: OnUseTimerTrigger - type: OnUseTimerTrigger
delay: 10 delay: 10
beepSound: beepSound:

2
Resources/Prototypes/Entities/Objects/Power/powersink.yml
View File

@@ -1,4 +1,4 @@
- type: entity - type: entity
id: PowerSink id: PowerSink
parent: [BaseMachine, BaseSyndicateContraband] parent: [BaseMachine, BaseSyndicateContraband]
name: power sink name: power sink

3
Resources/Prototypes/Entities/Objects/Weapons/Bombs/funny.yml
View File

@@ -11,7 +11,8 @@
- state: icon - state: icon
map: ["base"] map: ["base"]
- type: Item - type: Item
sprite: Objects/Weapons/Bombs/hot_potato.rsi sprite: Objects/Specific/Hydroponics/potato.rsi
heldPrefix: produce
size: Small size: Small
- type: AmbientSound - type: AmbientSound
enabled: false enabled: false

BIN
Resources/Textures/Mobs/Animals/grenadepenguin.rsi/inhand-left.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 766 B

BIN
Resources/Textures/Mobs/Animals/grenadepenguin.rsi/inhand-right.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 798 B

80
Resources/Textures/Mobs/Animals/grenadepenguin.rsi/meta.json
View File

@@ -1,21 +1,65 @@
{ {
"version": 1, "version": 1,
"license": "CC-BY-SA-3.0", "license": "CC-BY-SA-3.0",
"copyright": "Created by EmoGarbage404", "copyright": "Created by EmoGarbage404, inhands by mubururu_ (github)",
"size": { "size": {
"x": 32, "x": 32,
"y": 32 "y": 32
},
"states": [
{
"name": "icon"
}, },
{ "states": [
"name": "penguin", {
"directions": 4 "name": "icon"
}, },
{ {
"name": "dead" "name": "inhand-left",
} "directions": 4,
] "delays": [
[
0.1,
0.1
],
[
0.1,
0.1
],
[
0.1,
0.1
],
[
0.1,
0.1
]
]
},
{
"name": "inhand-right",
"directions": 4,
"delays": [
[
0.1,
0.1
],
[
0.1,
0.1
],
[
0.1,
0.1
],
[
0.1,
0.1
]
]
},
{
"name": "penguin",
"directions": 4
},
{
"name": "dead"
}
]
} }

BIN
Resources/Textures/Objects/Devices/singularity_beacon.rsi/inhand-left.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
Resources/Textures/Objects/Devices/singularity_beacon.rsi/inhand-right.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

81
Resources/Textures/Objects/Devices/singularity_beacon.rsi/meta.json
View File

@@ -1,20 +1,65 @@
{ {
"version": 1, "version": 1,
"license": "CC-BY-SA-3.0", "license": "CC-BY-SA-3.0",
"copyright": "tgstation at https://github.com/tgstation/tgstation/blob/c46d689e2b300bdc8c5b153855b1a5bbb2c5b168/icons/obj/singularity.dmi", "copyright": "tgstation at https://github.com/tgstation/tgstation/blob/c46d689e2b300bdc8c5b153855b1a5bbb2c5b168/icons/obj/singularity.dmi, inhands by mubururu_ (github)",
"size": { "size": {
"x": 32, "x": 32,
"y": 32 "y": 32
}, },
"states": [ "states": [
{ {
"name": "icon", "name": "icon",
"delays": [ "delays": [
[ [
0.1, 0.1,
0.1 0.1
] ]
] ]
} },
] {
"name": "inhand-left",
"directions": 4,
"delays": [
[
0.1,
0.1
],
[
0.1,
0.1
],
[
0.1,
0.1
],
[
0.1,
0.1
]
]
},
{
"name": "inhand-right",
"directions": 4,
"delays": [
[
0.1,
0.1
],
[
0.1,
0.1
],
[
0.1,
0.1
],
[
0.1,
0.1
]
]
}
]
} }

BIN
Resources/Textures/Objects/Power/powersink.rsi/inhand-left.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
Resources/Textures/Objects/Power/powersink.rsi/inhand-right.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

33
Resources/Textures/Objects/Power/powersink.rsi/meta.json
View File

@@ -1,14 +1,23 @@
{ {
"version": 1, "version": 1,
"license": "CC-BY-NC-SA-3.0", "license": "CC-BY-NC-SA-3.0",
"copyright": "Drawn by Ubaser.", "copyright": "Drawn by Ubaser. inhands by mubururu_ (github)",
"size": { "size": {
"x": 32, "x": 32,
"y": 32 "y": 32
}, },
"states": [ "states": [
{
"name": "powersink" {
} "name": "inhand-left",
] "directions": 4
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "powersink"
}
]
} }

BIN
Resources/Textures/Objects/Tools/thief_beacon.rsi/folded_extraction.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 681 B

After

Width:  |  Height:  |  Size: 460 B

BIN
Resources/Textures/Objects/Tools/thief_beacon.rsi/inhand-left.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 605 B

BIN
Resources/Textures/Objects/Tools/thief_beacon.rsi/inhand-right.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 624 B

69
Resources/Textures/Objects/Tools/thief_beacon.rsi/meta.json
View File

@@ -1,32 +1,41 @@
{ {
"version": 1, "version": 1,
"license": "CC-BY-SA-3.0", "license": "CC-BY-SA-3.0",
"copyright": "Taken from https://github.com/austation/austation/commit/e2a4fefd01e702f48d3d4cc8d6a2686d54d104fa and edited by TheShuEd", "copyright": "Taken from https://github.com/austation/austation/commit/e2a4fefd01e702f48d3d4cc8d6a2686d54d104fa and edited by TheShuEd, folded sprite modified by mubururu_, inhands by mubururu_ (github)",
"size": { "size": {
"x": 32, "x": 32,
"y": 32 "y": 32
},
"states": [
{
"name": "folded_extraction"
}, },
{ "states": [
"name": "extraction_point", {
"delays": [ "name": "folded_extraction"
[ },
0.5, {
0.5 "name": "extraction_point",
] "delays": [
] [
}, 0.5,
{ 0.5
"name": "extraction_point_light", ]
"delays": [ ]
[ },
0.5, {
0.5 "name": "extraction_point_light",
] "delays": [
] [
} 0.5,
] 0.5
} ]
]
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}