Adds a ton more inhands (#4488)
* Removed useless loc and added inhands for some lamps * Adds a ton of inhands to the game * Actually adds the pill inhand * Update Resources/Textures/Objects/Misc/utensils.rsi/meta.json Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com> * Update Resources/Textures/Objects/Tools/rcd.rsi/meta.json Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com> Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com>
|
Before Width: | Height: | Size: 356 B After Width: | Height: | Size: 395 B |
|
Before Width: | Height: | Size: 364 B After Width: | Height: | Size: 415 B |
|
After Width: | Height: | Size: 300 B |
|
After Width: | Height: | Size: 312 B |
@@ -16,6 +16,14 @@
|
||||
{
|
||||
"name": "brain"
|
||||
},
|
||||
{
|
||||
"name": "brain-inhand-left",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "brain-inhand-right",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "ears"
|
||||
},
|
||||
|
||||
@@ -89,6 +89,14 @@
|
||||
{
|
||||
"name": "popcorn"
|
||||
},
|
||||
{
|
||||
"name": "popcorn-inhand-right",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "popcorn-inhand-left",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "popcorn-trash"
|
||||
},
|
||||
|
||||
|
After Width: | Height: | Size: 478 B |
|
After Width: | Height: | Size: 496 B |
|
Before Width: | Height: | Size: 181 B After Width: | Height: | Size: 181 B |
|
Before Width: | Height: | Size: 514 B After Width: | Height: | Size: 514 B |
33
Resources/Textures/Objects/Misc/Lights/lamp.rsi/meta.json
Normal file
@@ -0,0 +1,33 @@
|
||||
{
|
||||
"version": 1,
|
||||
"license": "CC-BY-SA-3.0",
|
||||
"copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432",
|
||||
"size": {
|
||||
"x": 32,
|
||||
"y": 32
|
||||
},
|
||||
"states": [
|
||||
{
|
||||
"name": "lamp"
|
||||
},
|
||||
{
|
||||
"name": "lamp-on"
|
||||
},
|
||||
{
|
||||
"name": "off-inhand-left",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "off-inhand-right",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "on-inhand-left",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "on-inhand-right",
|
||||
"directions": 4
|
||||
}
|
||||
]
|
||||
}
|
||||
|
After Width: | Height: | Size: 473 B |
|
After Width: | Height: | Size: 459 B |
|
After Width: | Height: | Size: 381 B |
|
After Width: | Height: | Size: 376 B |
|
Before Width: | Height: | Size: 183 B After Width: | Height: | Size: 183 B |
|
Before Width: | Height: | Size: 470 B After Width: | Height: | Size: 470 B |
@@ -0,0 +1,33 @@
|
||||
{
|
||||
"version": 1,
|
||||
"license": "CC-BY-SA-3.0",
|
||||
"copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432",
|
||||
"size": {
|
||||
"x": 32,
|
||||
"y": 32
|
||||
},
|
||||
"states": [
|
||||
{
|
||||
"name": "lampgreen"
|
||||
},
|
||||
{
|
||||
"name": "lampgreen-on"
|
||||
},
|
||||
{
|
||||
"name": "off-inhand-left",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "off-inhand-right",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "on-inhand-left",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "on-inhand-right",
|
||||
"directions": 4
|
||||
}
|
||||
]
|
||||
}
|
||||
|
After Width: | Height: | Size: 544 B |
|
After Width: | Height: | Size: 525 B |
|
After Width: | Height: | Size: 403 B |
|
After Width: | Height: | Size: 403 B |
|
Before Width: | Height: | Size: 664 B After Width: | Height: | Size: 664 B |
|
Before Width: | Height: | Size: 154 B After Width: | Height: | Size: 154 B |
|
Before Width: | Height: | Size: 357 B After Width: | Height: | Size: 357 B |
|
Before Width: | Height: | Size: 381 B After Width: | Height: | Size: 381 B |
|
Before Width: | Height: | Size: 527 B After Width: | Height: | Size: 527 B |
|
Before Width: | Height: | Size: 124 B After Width: | Height: | Size: 124 B |
@@ -24,18 +24,6 @@
|
||||
},
|
||||
{
|
||||
"name": "floodlight_broken"
|
||||
},
|
||||
{
|
||||
"name": "lamp"
|
||||
},
|
||||
{
|
||||
"name": "lamp_on"
|
||||
},
|
||||
{
|
||||
"name": "lampgreen"
|
||||
},
|
||||
{
|
||||
"name": "lampgreen_on"
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -234,6 +234,14 @@
|
||||
{
|
||||
"name": "pen_red"
|
||||
},
|
||||
{
|
||||
"name": "pen-inhand-left",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "pen-inhand-right",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "scrap"
|
||||
},
|
||||
|
||||
|
After Width: | Height: | Size: 283 B |
|
After Width: | Height: | Size: 283 B |
BIN
Resources/Textures/Objects/Misc/utensils.rsi/inhand-left.png
Normal file
|
After Width: | Height: | Size: 330 B |
BIN
Resources/Textures/Objects/Misc/utensils.rsi/inhand-right.png
Normal file
|
After Width: | Height: | Size: 231 B |
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"version": 1,
|
||||
"license": "CC-BY-SA-3.0",
|
||||
"copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432",
|
||||
"copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432 and modified by Swept",
|
||||
"size": {
|
||||
"x": 32,
|
||||
"y": 32
|
||||
@@ -10,9 +10,25 @@
|
||||
{
|
||||
"name": "spoon"
|
||||
},
|
||||
{
|
||||
"name": "spoon-inhand-left",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "spoon-inhand-right",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "fork"
|
||||
},
|
||||
{
|
||||
"name": "inhand-left",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "inhand-right",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "loadedfood"
|
||||
},
|
||||
|
||||
|
After Width: | Height: | Size: 347 B |
|
After Width: | Height: | Size: 271 B |
|
After Width: | Height: | Size: 251 B |
|
After Width: | Height: | Size: 251 B |
@@ -72,6 +72,14 @@
|
||||
},
|
||||
{
|
||||
"name": "pill_canister"
|
||||
},
|
||||
{
|
||||
"name": "inhand-left",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "inhand-right",
|
||||
"directions": 4
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
|
After Width: | Height: | Size: 298 B |
|
After Width: | Height: | Size: 300 B |
|
After Width: | Height: | Size: 316 B |
|
After Width: | Height: | Size: 320 B |
|
After Width: | Height: | Size: 316 B |
|
After Width: | Height: | Size: 320 B |
|
After Width: | Height: | Size: 322 B |
|
After Width: | Height: | Size: 315 B |
|
After Width: | Height: | Size: 321 B |
|
After Width: | Height: | Size: 321 B |
|
Before Width: | Height: | Size: 183 B |
|
Before Width: | Height: | Size: 185 B |
@@ -41,12 +41,44 @@
|
||||
"name": "syringe4"
|
||||
},
|
||||
{
|
||||
"name": "inhand-left",
|
||||
"name": "0-inhand-left",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "inhand-right",
|
||||
"name": "0-inhand-right",
|
||||
"directions": 4
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "1-inhand-left",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "1-inhand-right",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "2-inhand-left",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "2-inhand-right",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "3-inhand-left",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "3-inhand-right",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "4-inhand-left",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "4-inhand-right",
|
||||
"directions": 4
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
|
After Width: | Height: | Size: 352 B |
|
After Width: | Height: | Size: 356 B |
@@ -12,6 +12,14 @@
|
||||
},
|
||||
{
|
||||
"name": "vial"
|
||||
},
|
||||
{
|
||||
"name": "inhand-left",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "inhand-right",
|
||||
"directions": 4
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
@@ -25,6 +25,14 @@
|
||||
{
|
||||
"name": "peel3"
|
||||
},
|
||||
{
|
||||
"name": "peel-inhand-left",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "peel-inhand-right",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "seed"
|
||||
},
|
||||
|
||||
|
After Width: | Height: | Size: 401 B |
|
After Width: | Height: | Size: 417 B |
|
After Width: | Height: | Size: 343 B |
|
After Width: | Height: | Size: 345 B |
@@ -10,6 +10,14 @@
|
||||
{
|
||||
"name": "brutepack"
|
||||
},
|
||||
{
|
||||
"name": "brutepack-inhand-left",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "brutepack-inhand-right",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "cast"
|
||||
},
|
||||
@@ -21,6 +29,14 @@
|
||||
},
|
||||
{
|
||||
"name": "ointment"
|
||||
},
|
||||
{
|
||||
"name": "ointment-inhand-left",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "ointment-inhand-right",
|
||||
"directions": 4
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
|
After Width: | Height: | Size: 363 B |
|
After Width: | Height: | Size: 368 B |
|
Before Width: | Height: | Size: 143 B After Width: | Height: | Size: 686 B |
|
Before Width: | Height: | Size: 144 B After Width: | Height: | Size: 668 B |
BIN
Resources/Textures/Objects/Tools/rcd.rsi/ammo-inhand-left.png
Normal file
|
After Width: | Height: | Size: 237 B |
BIN
Resources/Textures/Objects/Tools/rcd.rsi/ammo-inhand-right.png
Normal file
|
After Width: | Height: | Size: 266 B |
|
Before Width: | Height: | Size: 331 B After Width: | Height: | Size: 331 B |
|
Before Width: | Height: | Size: 157 B After Width: | Height: | Size: 459 B |
|
Before Width: | Height: | Size: 163 B After Width: | Height: | Size: 454 B |
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"version": 1,
|
||||
"license": "CC-BY-SA-3.0",
|
||||
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f07f847706d85b7cfa4b398e5175732212b69a63",
|
||||
"copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/ce025775f73b66934ca96f3a8edc30993ea70b4d and modified by Swept",
|
||||
"size": {
|
||||
"x": 32,
|
||||
"y": 32
|
||||
@@ -11,7 +11,15 @@
|
||||
"name": "icon"
|
||||
},
|
||||
{
|
||||
"name": "rcd_ammo"
|
||||
"name": "ammo"
|
||||
},
|
||||
{
|
||||
"name": "ammo-inhand-left",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "ammo-inhand-right",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "equipped-BELT",
|
||||
|
||||