Skip to content
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
Binary file modified Resources/Textures/Objects/Devices/cartridge.rsi/cart-log.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Objects/Devices/cartridge.rsi/cart-med.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Objects/Devices/cartridge.rsi/cart-nav.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Objects/Devices/cartridge.rsi/cart-sec.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Objects/Devices/cartridge.rsi/cart-y.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Objects/Devices/cartridge.rsi/cart.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Objects/Devices/communication.rsi/beacon.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.
Binary file modified Resources/Textures/Objects/Devices/communication.rsi/radio.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Objects/Devices/communication.rsi/signaller.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 modified Resources/Textures/Objects/Devices/flatpack.rsi/ame-part.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Objects/Devices/flatpack.rsi/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.
Binary file modified Resources/Textures/Objects/Devices/flatpack.rsi/emitter.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Objects/Devices/flatpack.rsi/fax-machine.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.
2 changes: 1 addition & 1 deletion Resources/Textures/Objects/Devices/flatpack.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC0-1.0",
"copyright": "Created by EmoGarbage404 (github) for SS14, solar-assembly-part taken from tgstation and modified at https://tgstation13.org/wiki/Guide_to_construction#Solar_Panels_and_Trackers, ame-part taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/1b7952787c06c21ef1623e494dcfe7cb1f46e041; singularity-generator, tesla-generator, radiation-collector, containment-field-generator, tesla-coil, grounding-rod inner icons made by lzk228; emitter made by pigeonpeas. fax-machine made by moomoobeef, modified by ps3moira. hydroponics-tray modified by ScarKy0 (Github), Reflector modified by CorruptOmega.",
"copyright": "Created by EmoGarbage404 (github) for SS14, solar-assembly-part taken from tgstation and modified at https://tgstation13.org/wiki/Guide_to_construction#Solar_Panels_and_Trackers, ame-part taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/1b7952787c06c21ef1623e494dcfe7cb1f46e041; singularity-generator, tesla-generator, radiation-collector, containment-field-generator, tesla-coil, grounding-rod inner icons made by lzk228; emitter made by pigeonpeas. fax-machine made by moomoobeef, modified by ps3moira. hydroponics-tray & microwave modified by UmbiMax, Reflector modified by CorruptOmega.",
"size": {
"x": 32,
"y": 32
Expand Down
Binary file modified Resources/Textures/Objects/Devices/flatpack.rsi/microwave.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Objects/Devices/flatpack.rsi/overlay.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.
Binary file modified Resources/Textures/Objects/Devices/flatpack.rsi/tesla-coil.png
Binary file modified Resources/Textures/Objects/Devices/hand_teleporter.rsi/icon.png
46 changes: 5 additions & 41 deletions Resources/Textures/Objects/Devices/hand_teleporter.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "tgstation at 43d3fb991641d0dc73b6ce81cdf4f3f09d6b70a0, inhands by TiniestShark (github)",
"copyright": "Taken from TG https://github.com/tgstation/tgstation/commit/43d3fb991641d0dc73b6ce81cdf4f3f09d6b70a0, inhands by lordgarmalorn (discord)",
"size": {
"x": 32,
"y": 32
Expand All @@ -19,48 +19,12 @@
]
},
{
"name": "inhand-left",
"directions": 4,
"delays": [
[
0.5,
0.5
],
[
0.5,
0.5
],
[
0.5,
0.5
],
[
0.5,
0.5
]
]
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4,
"delays": [
[
0.5,
0.5
],
[
0.5,
0.5
],
[
0.5,
0.5
],
[
0.5,
0.5
]
]
"name": "inhand-right",
"directions": 4
}
]
}
Binary file modified Resources/Textures/Objects/Devices/igniter.rsi/icon.png
2 changes: 1 addition & 1 deletion Resources/Textures/Objects/Devices/igniter.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/9a401d19045574f3ea7f2cf3feebf65989903ccc/icons/obj/assemblies/new_assemblies.dmi, inhands by TiniestShark (github)",
"copyright": "Sprited by SmArtKar and taken from https://github.com/tgstation/tgstation/commit/02b57cf750ab12314f915584e17449ae5f8219ba, inhands by TiniestShark (github)",
"size": {
"x": 32,
"y": 32
Expand Down
2 changes: 1 addition & 1 deletion Resources/Textures/Objects/Devices/nuke.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"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), nuclearbomb_gay by PJB3005",
"copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/59f2a4e10e5ba36033c9734ddebfbbdc6157472d, nukefestive by Alekshhh (Github), nuclearbomb_gay by PJB3005",
"size": {
"x": 32,
"y": 32
Expand Down
Binary file modified Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_base.png
Binary file modified Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_gay.png
Binary file modified Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_timing.png
Binary file modified Resources/Textures/Objects/Devices/nuke.rsi/nuclearbombc.png
Binary file modified Resources/Textures/Objects/Devices/nuke.rsi/nukefestive.png
Binary file modified Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer.png
Binary file modified Resources/Textures/Objects/Devices/signaller.rsi/advanced.png
2 changes: 1 addition & 1 deletion Resources/Textures/Objects/Devices/signaller.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "signaller state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/2c980a1f423f26e990a578bae057d1eca19675ec. inhands & advanced made by Flaregy for Space Station 14. advanced is modified from signaller",
"copyright": "Sprited by SmArtKar and taken from https://github.com/tgstation/tgstation/commit/02b57cf750ab12314f915584e17449ae5f8219ba. inhands & advanced made by Flaregy for Space Station 14. Advanced is modified from signaller by UmbiMax",
"size": {
"x": 32,
"y": 32
Expand Down
Binary file modified Resources/Textures/Objects/Devices/signaller.rsi/signaller.png
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"version": 1,

"license": "CC-BY-SA-3.0",
"copyright": "Taken from https://github.com/tgstation/tgstation/blob/master/icons/obj/assemblies/new_assemblies.dmi",
"copyright": "Sprited by SmArtKar and taken from https://github.com/tgstation/tgstation/commit/02b57cf750ab12314f915584e17449ae5f8219ba. Another color by UmbiMax.",

"size": {
"x": 32,
Expand Down
Binary file modified Resources/Textures/Objects/Devices/station_beacon.rsi/blink.png
Binary file modified Resources/Textures/Objects/Devices/station_beacon.rsi/icon.png
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC0-1.0",
"copyright": "Created by EmoGarbage404 (github) for SS14, based on beacon design from /tg/",
"copyright": "Created by EmoGarbage404 (github) for SS14, based on beacon design from /tg/ // Icon/Blink Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
"size": {
"x": 32,
"y": 32
Expand Down
Binary file modified Resources/Textures/Objects/Devices/tablets.rsi/generic.png
Binary file modified Resources/Textures/Objects/Devices/tablets.rsi/syndie.png
Binary file modified Resources/Textures/Objects/Devices/tablets.rsi/tablet.png
Binary file modified Resources/Textures/Objects/Devices/tablets.rsi/tabletsol.png
4 changes: 2 additions & 2 deletions Resources/Textures/Objects/Devices/timer.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"version": 1,

"license": "CC0-1.0",
"copyright": "Taken from https://github.com/tgstation/tgstation/blob/master/icons/obj/assemblies/new_assemblies.dmi",
"license": "CC-BY-SA-3.0",
"copyright": "Sprited by SmArtKar and taken from https://github.com/tgstation/tgstation/commit/02b57cf750ab12314f915584e17449ae5f8219ba.",

"size": {
"x": 32,
Expand Down
Binary file modified Resources/Textures/Objects/Devices/timer.rsi/timer.png
2 changes: 1 addition & 1 deletion Resources/Textures/Objects/Devices/voice.rsi/meta.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"version": 1,

"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c71e03214013191760284361aaff7af90505aaab",
"copyright": "Sprited by SmArtKar and taken from https://github.com/tgstation/tgstation/commit/02b57cf750ab12314f915584e17449ae5f8219ba.",

"size": {
"x": 32,
Expand Down
Binary file modified Resources/Textures/Objects/Devices/voice.rsi/voice.png
Loading