diff --git a/Resources/Textures/Objects/Devices/cartridge.rsi/cart-log.png b/Resources/Textures/Objects/Devices/cartridge.rsi/cart-log.png index cedafb3f8eb..5a12ece5ece 100644 Binary files a/Resources/Textures/Objects/Devices/cartridge.rsi/cart-log.png and b/Resources/Textures/Objects/Devices/cartridge.rsi/cart-log.png differ diff --git a/Resources/Textures/Objects/Devices/cartridge.rsi/cart-med.png b/Resources/Textures/Objects/Devices/cartridge.rsi/cart-med.png index 69be9eb42e1..3cefd8b74fa 100644 Binary files a/Resources/Textures/Objects/Devices/cartridge.rsi/cart-med.png and b/Resources/Textures/Objects/Devices/cartridge.rsi/cart-med.png differ diff --git a/Resources/Textures/Objects/Devices/cartridge.rsi/cart-nav.png b/Resources/Textures/Objects/Devices/cartridge.rsi/cart-nav.png index 427129da0ed..698a86f41d0 100644 Binary files a/Resources/Textures/Objects/Devices/cartridge.rsi/cart-nav.png and b/Resources/Textures/Objects/Devices/cartridge.rsi/cart-nav.png differ diff --git a/Resources/Textures/Objects/Devices/cartridge.rsi/cart-sec.png b/Resources/Textures/Objects/Devices/cartridge.rsi/cart-sec.png index 6a3197004cb..0dae4355f88 100644 Binary files a/Resources/Textures/Objects/Devices/cartridge.rsi/cart-sec.png and b/Resources/Textures/Objects/Devices/cartridge.rsi/cart-sec.png differ diff --git a/Resources/Textures/Objects/Devices/cartridge.rsi/cart-y.png b/Resources/Textures/Objects/Devices/cartridge.rsi/cart-y.png index fea965a3919..705646df7ac 100644 Binary files a/Resources/Textures/Objects/Devices/cartridge.rsi/cart-y.png and b/Resources/Textures/Objects/Devices/cartridge.rsi/cart-y.png differ diff --git a/Resources/Textures/Objects/Devices/cartridge.rsi/cart.png b/Resources/Textures/Objects/Devices/cartridge.rsi/cart.png index b9e61ec5bfc..f7f41919a95 100644 Binary files a/Resources/Textures/Objects/Devices/cartridge.rsi/cart.png and b/Resources/Textures/Objects/Devices/cartridge.rsi/cart.png differ diff --git a/Resources/Textures/Objects/Devices/communication.rsi/beacon.png b/Resources/Textures/Objects/Devices/communication.rsi/beacon.png index fa3d280d0b7..cd94b9738a0 100644 Binary files a/Resources/Textures/Objects/Devices/communication.rsi/beacon.png and b/Resources/Textures/Objects/Devices/communication.rsi/beacon.png differ diff --git a/Resources/Textures/Objects/Devices/communication.rsi/beacon_dead.png b/Resources/Textures/Objects/Devices/communication.rsi/beacon_dead.png index 64e7a30d49f..7e25d7455d6 100644 Binary files a/Resources/Textures/Objects/Devices/communication.rsi/beacon_dead.png and b/Resources/Textures/Objects/Devices/communication.rsi/beacon_dead.png differ diff --git a/Resources/Textures/Objects/Devices/communication.rsi/old-radio-urist.png b/Resources/Textures/Objects/Devices/communication.rsi/old-radio-urist.png index 3cdf1c61bf0..424d5a0c9ea 100644 Binary files a/Resources/Textures/Objects/Devices/communication.rsi/old-radio-urist.png and b/Resources/Textures/Objects/Devices/communication.rsi/old-radio-urist.png differ diff --git a/Resources/Textures/Objects/Devices/communication.rsi/radio.png b/Resources/Textures/Objects/Devices/communication.rsi/radio.png index eb57264b858..bbc73c505e5 100644 Binary files a/Resources/Textures/Objects/Devices/communication.rsi/radio.png and b/Resources/Textures/Objects/Devices/communication.rsi/radio.png differ diff --git a/Resources/Textures/Objects/Devices/communication.rsi/signaller.png b/Resources/Textures/Objects/Devices/communication.rsi/signaller.png index 1b14a3a1360..d6b68cba775 100644 Binary files a/Resources/Textures/Objects/Devices/communication.rsi/signaller.png and b/Resources/Textures/Objects/Devices/communication.rsi/signaller.png differ diff --git a/Resources/Textures/Objects/Devices/communication.rsi/walkietalkie-off.png b/Resources/Textures/Objects/Devices/communication.rsi/walkietalkie-off.png index 70e2b3a2a56..50f3927824f 100644 Binary files a/Resources/Textures/Objects/Devices/communication.rsi/walkietalkie-off.png and b/Resources/Textures/Objects/Devices/communication.rsi/walkietalkie-off.png differ diff --git a/Resources/Textures/Objects/Devices/communication.rsi/walkietalkie-on.png b/Resources/Textures/Objects/Devices/communication.rsi/walkietalkie-on.png index 0bf04a782db..da72f40e03f 100644 Binary files a/Resources/Textures/Objects/Devices/communication.rsi/walkietalkie-on.png and b/Resources/Textures/Objects/Devices/communication.rsi/walkietalkie-on.png differ diff --git a/Resources/Textures/Objects/Devices/communication.rsi/walkietalkie.png b/Resources/Textures/Objects/Devices/communication.rsi/walkietalkie.png index 0799b3f9c8b..e5ebc2a36cf 100644 Binary files a/Resources/Textures/Objects/Devices/communication.rsi/walkietalkie.png and b/Resources/Textures/Objects/Devices/communication.rsi/walkietalkie.png differ diff --git a/Resources/Textures/Objects/Devices/flatpack.rsi/ame-part.png b/Resources/Textures/Objects/Devices/flatpack.rsi/ame-part.png index 3116c6c6e55..29315b8f0a4 100644 Binary files a/Resources/Textures/Objects/Devices/flatpack.rsi/ame-part.png and b/Resources/Textures/Objects/Devices/flatpack.rsi/ame-part.png differ diff --git a/Resources/Textures/Objects/Devices/flatpack.rsi/base.png b/Resources/Textures/Objects/Devices/flatpack.rsi/base.png index fc8002fa437..1d5bb624c06 100644 Binary files a/Resources/Textures/Objects/Devices/flatpack.rsi/base.png and b/Resources/Textures/Objects/Devices/flatpack.rsi/base.png differ diff --git a/Resources/Textures/Objects/Devices/flatpack.rsi/containment-field-generator.png b/Resources/Textures/Objects/Devices/flatpack.rsi/containment-field-generator.png index 83d334c6e71..d3a000231ed 100644 Binary files a/Resources/Textures/Objects/Devices/flatpack.rsi/containment-field-generator.png and b/Resources/Textures/Objects/Devices/flatpack.rsi/containment-field-generator.png differ diff --git a/Resources/Textures/Objects/Devices/flatpack.rsi/emitter.png b/Resources/Textures/Objects/Devices/flatpack.rsi/emitter.png index d1b4191052f..32d17787eed 100644 Binary files a/Resources/Textures/Objects/Devices/flatpack.rsi/emitter.png and b/Resources/Textures/Objects/Devices/flatpack.rsi/emitter.png differ diff --git a/Resources/Textures/Objects/Devices/flatpack.rsi/fax-machine.png b/Resources/Textures/Objects/Devices/flatpack.rsi/fax-machine.png index c7872e1916e..41c04125fea 100644 Binary files a/Resources/Textures/Objects/Devices/flatpack.rsi/fax-machine.png and b/Resources/Textures/Objects/Devices/flatpack.rsi/fax-machine.png differ diff --git a/Resources/Textures/Objects/Devices/flatpack.rsi/grounding-rod.png b/Resources/Textures/Objects/Devices/flatpack.rsi/grounding-rod.png index e4b67a0966e..9bb4bcaadcb 100644 Binary files a/Resources/Textures/Objects/Devices/flatpack.rsi/grounding-rod.png and b/Resources/Textures/Objects/Devices/flatpack.rsi/grounding-rod.png differ diff --git a/Resources/Textures/Objects/Devices/flatpack.rsi/hydroponics-tray.png b/Resources/Textures/Objects/Devices/flatpack.rsi/hydroponics-tray.png index 9aad5920d83..1f41bdda8f1 100644 Binary files a/Resources/Textures/Objects/Devices/flatpack.rsi/hydroponics-tray.png and b/Resources/Textures/Objects/Devices/flatpack.rsi/hydroponics-tray.png differ diff --git a/Resources/Textures/Objects/Devices/flatpack.rsi/icon-default.png b/Resources/Textures/Objects/Devices/flatpack.rsi/icon-default.png index a7aa8023f3e..19e68033b7b 100644 Binary files a/Resources/Textures/Objects/Devices/flatpack.rsi/icon-default.png and b/Resources/Textures/Objects/Devices/flatpack.rsi/icon-default.png differ diff --git a/Resources/Textures/Objects/Devices/flatpack.rsi/meta.json b/Resources/Textures/Objects/Devices/flatpack.rsi/meta.json index 05c7722fa62..8b217b3278b 100644 --- a/Resources/Textures/Objects/Devices/flatpack.rsi/meta.json +++ b/Resources/Textures/Objects/Devices/flatpack.rsi/meta.json @@ -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 diff --git a/Resources/Textures/Objects/Devices/flatpack.rsi/microwave.png b/Resources/Textures/Objects/Devices/flatpack.rsi/microwave.png index 9eb23c25d32..5b7bb043fff 100644 Binary files a/Resources/Textures/Objects/Devices/flatpack.rsi/microwave.png and b/Resources/Textures/Objects/Devices/flatpack.rsi/microwave.png differ diff --git a/Resources/Textures/Objects/Devices/flatpack.rsi/overlay.png b/Resources/Textures/Objects/Devices/flatpack.rsi/overlay.png index e9dfa58efb3..b4cdca5d415 100644 Binary files a/Resources/Textures/Objects/Devices/flatpack.rsi/overlay.png and b/Resources/Textures/Objects/Devices/flatpack.rsi/overlay.png differ diff --git a/Resources/Textures/Objects/Devices/flatpack.rsi/radiation-collector.png b/Resources/Textures/Objects/Devices/flatpack.rsi/radiation-collector.png index 40cf75ad491..ee3c93ea05b 100644 Binary files a/Resources/Textures/Objects/Devices/flatpack.rsi/radiation-collector.png and b/Resources/Textures/Objects/Devices/flatpack.rsi/radiation-collector.png differ diff --git a/Resources/Textures/Objects/Devices/flatpack.rsi/singularity-generator.png b/Resources/Textures/Objects/Devices/flatpack.rsi/singularity-generator.png index 62449e68911..6681992d130 100644 Binary files a/Resources/Textures/Objects/Devices/flatpack.rsi/singularity-generator.png and b/Resources/Textures/Objects/Devices/flatpack.rsi/singularity-generator.png differ diff --git a/Resources/Textures/Objects/Devices/flatpack.rsi/solar-assembly-part.png b/Resources/Textures/Objects/Devices/flatpack.rsi/solar-assembly-part.png index bb68ec126cf..c060b12eb35 100644 Binary files a/Resources/Textures/Objects/Devices/flatpack.rsi/solar-assembly-part.png and b/Resources/Textures/Objects/Devices/flatpack.rsi/solar-assembly-part.png differ diff --git a/Resources/Textures/Objects/Devices/flatpack.rsi/tesla-coil.png b/Resources/Textures/Objects/Devices/flatpack.rsi/tesla-coil.png index 3fde6b84882..b23489253fa 100644 Binary files a/Resources/Textures/Objects/Devices/flatpack.rsi/tesla-coil.png and b/Resources/Textures/Objects/Devices/flatpack.rsi/tesla-coil.png differ diff --git a/Resources/Textures/Objects/Devices/flatpack.rsi/tesla-generator.png b/Resources/Textures/Objects/Devices/flatpack.rsi/tesla-generator.png index 627270da41d..3f367a3cdd0 100644 Binary files a/Resources/Textures/Objects/Devices/flatpack.rsi/tesla-generator.png and b/Resources/Textures/Objects/Devices/flatpack.rsi/tesla-generator.png differ diff --git a/Resources/Textures/Objects/Devices/hand_teleporter.rsi/icon.png b/Resources/Textures/Objects/Devices/hand_teleporter.rsi/icon.png index c5cb0de69ff..556afbcebdb 100644 Binary files a/Resources/Textures/Objects/Devices/hand_teleporter.rsi/icon.png and b/Resources/Textures/Objects/Devices/hand_teleporter.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Devices/hand_teleporter.rsi/inhand-left.png b/Resources/Textures/Objects/Devices/hand_teleporter.rsi/inhand-left.png index b4c903c317e..ee8787838f4 100644 Binary files a/Resources/Textures/Objects/Devices/hand_teleporter.rsi/inhand-left.png and b/Resources/Textures/Objects/Devices/hand_teleporter.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Devices/hand_teleporter.rsi/inhand-right.png b/Resources/Textures/Objects/Devices/hand_teleporter.rsi/inhand-right.png index cbc4892adaf..be95829ca2f 100644 Binary files a/Resources/Textures/Objects/Devices/hand_teleporter.rsi/inhand-right.png and b/Resources/Textures/Objects/Devices/hand_teleporter.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Devices/hand_teleporter.rsi/meta.json b/Resources/Textures/Objects/Devices/hand_teleporter.rsi/meta.json index 39dec20320b..f3d84f26398 100644 --- a/Resources/Textures/Objects/Devices/hand_teleporter.rsi/meta.json +++ b/Resources/Textures/Objects/Devices/hand_teleporter.rsi/meta.json @@ -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 @@ -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 } ] } diff --git a/Resources/Textures/Objects/Devices/igniter.rsi/icon.png b/Resources/Textures/Objects/Devices/igniter.rsi/icon.png index 4074df00879..2e0fe24d693 100644 Binary files a/Resources/Textures/Objects/Devices/igniter.rsi/icon.png and b/Resources/Textures/Objects/Devices/igniter.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Devices/igniter.rsi/meta.json b/Resources/Textures/Objects/Devices/igniter.rsi/meta.json index 57cc6b47e9c..e0955b2ac89 100644 --- a/Resources/Textures/Objects/Devices/igniter.rsi/meta.json +++ b/Resources/Textures/Objects/Devices/igniter.rsi/meta.json @@ -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 diff --git a/Resources/Textures/Objects/Devices/nuke.rsi/meta.json b/Resources/Textures/Objects/Devices/nuke.rsi/meta.json index 5ba8a2d753c..f6b6e988bc2 100644 --- a/Resources/Textures/Objects/Devices/nuke.rsi/meta.json +++ b/Resources/Textures/Objects/Devices/nuke.rsi/meta.json @@ -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 diff --git a/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_base.png b/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_base.png index f0b41b5bf17..cc1da909915 100644 Binary files a/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_base.png and b/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_base.png differ diff --git a/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_deployed.png b/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_deployed.png index 4a01cf2d68f..afd4a1b1bb0 100644 Binary files a/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_deployed.png and b/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_deployed.png differ diff --git a/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_deployed_unlit.png b/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_deployed_unlit.png index bcc758ba58b..76124285f3b 100644 Binary files a/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_deployed_unlit.png and b/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_deployed_unlit.png differ diff --git a/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_exploding.png b/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_exploding.png index d7e07d88802..568980bfdae 100644 Binary files a/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_exploding.png and b/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_exploding.png differ diff --git a/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_gay.png b/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_gay.png index 4a653dfc7b0..499adff8c2a 100644 Binary files a/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_gay.png and b/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_gay.png differ diff --git a/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_timing.png b/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_timing.png index b59fac42b86..ea2fe649797 100644 Binary files a/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_timing.png and b/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_timing.png differ diff --git a/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbombc.png b/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbombc.png index ebeb77e2d29..a094f35d969 100644 Binary files a/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbombc.png and b/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbombc.png differ diff --git a/Resources/Textures/Objects/Devices/nuke.rsi/nukefestive.png b/Resources/Textures/Objects/Devices/nuke.rsi/nukefestive.png index f9c58ac8e64..260a9ce1ad8 100644 Binary files a/Resources/Textures/Objects/Devices/nuke.rsi/nukefestive.png and b/Resources/Textures/Objects/Devices/nuke.rsi/nukefestive.png differ diff --git a/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-crew.png b/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-crew.png index 26b5c3b3dc6..ab1c55633ae 100644 Binary files a/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-crew.png and b/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-crew.png differ diff --git a/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-crewprox.png b/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-crewprox.png index 4424d1aba7e..c479e5fd768 100644 Binary files a/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-crewprox.png and b/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-crewprox.png differ diff --git a/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-station.png b/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-station.png index d1f10db2dda..6c174d54981 100644 Binary files a/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-station.png and b/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-station.png differ diff --git a/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-syndicate.png b/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-syndicate.png index f1d53a88598..4bc192b18eb 100644 Binary files a/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-syndicate.png and b/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-syndicate.png differ diff --git a/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-way.png b/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-way.png index b11dcbff9cc..f6e91447d74 100644 Binary files a/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-way.png and b/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-way.png differ diff --git a/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer.png b/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer.png index 86fb1f2380c..5b758777a57 100644 Binary files a/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer.png and b/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer.png differ diff --git a/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer_thief.png b/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer_thief.png index 5e62b9ef8d2..6963c53c728 100644 Binary files a/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer_thief.png and b/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer_thief.png differ diff --git a/Resources/Textures/Objects/Devices/securityhandy.rsi/walkietalkie-off.png b/Resources/Textures/Objects/Devices/securityhandy.rsi/walkietalkie-off.png index 2afdf8d962f..44ad7697151 100644 Binary files a/Resources/Textures/Objects/Devices/securityhandy.rsi/walkietalkie-off.png and b/Resources/Textures/Objects/Devices/securityhandy.rsi/walkietalkie-off.png differ diff --git a/Resources/Textures/Objects/Devices/securityhandy.rsi/walkietalkie-on.png b/Resources/Textures/Objects/Devices/securityhandy.rsi/walkietalkie-on.png index dfd79a64416..3a31caea3f0 100644 Binary files a/Resources/Textures/Objects/Devices/securityhandy.rsi/walkietalkie-on.png and b/Resources/Textures/Objects/Devices/securityhandy.rsi/walkietalkie-on.png differ diff --git a/Resources/Textures/Objects/Devices/securityhandy.rsi/walkietalkie.png b/Resources/Textures/Objects/Devices/securityhandy.rsi/walkietalkie.png index 12aaa3f2f09..83dbb7b5084 100644 Binary files a/Resources/Textures/Objects/Devices/securityhandy.rsi/walkietalkie.png and b/Resources/Textures/Objects/Devices/securityhandy.rsi/walkietalkie.png differ diff --git a/Resources/Textures/Objects/Devices/signaller.rsi/advanced.png b/Resources/Textures/Objects/Devices/signaller.rsi/advanced.png index 2383bf5e213..5893782b0d4 100644 Binary files a/Resources/Textures/Objects/Devices/signaller.rsi/advanced.png and b/Resources/Textures/Objects/Devices/signaller.rsi/advanced.png differ diff --git a/Resources/Textures/Objects/Devices/signaller.rsi/meta.json b/Resources/Textures/Objects/Devices/signaller.rsi/meta.json index 97bbc401624..daf28bfe5c9 100644 --- a/Resources/Textures/Objects/Devices/signaller.rsi/meta.json +++ b/Resources/Textures/Objects/Devices/signaller.rsi/meta.json @@ -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 diff --git a/Resources/Textures/Objects/Devices/signaller.rsi/signaller.png b/Resources/Textures/Objects/Devices/signaller.rsi/signaller.png index 68ff28ad161..a39e07a27b1 100644 Binary files a/Resources/Textures/Objects/Devices/signaller.rsi/signaller.png and b/Resources/Textures/Objects/Devices/signaller.rsi/signaller.png differ diff --git a/Resources/Textures/Objects/Devices/signaltrigger.rsi/meta.json b/Resources/Textures/Objects/Devices/signaltrigger.rsi/meta.json index 2254d9a7915..edbf9a42016 100644 --- a/Resources/Textures/Objects/Devices/signaltrigger.rsi/meta.json +++ b/Resources/Textures/Objects/Devices/signaltrigger.rsi/meta.json @@ -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, diff --git a/Resources/Textures/Objects/Devices/signaltrigger.rsi/signaltrigger.png b/Resources/Textures/Objects/Devices/signaltrigger.rsi/signaltrigger.png index 5641b818b9a..402a31713c3 100644 Binary files a/Resources/Textures/Objects/Devices/signaltrigger.rsi/signaltrigger.png and b/Resources/Textures/Objects/Devices/signaltrigger.rsi/signaltrigger.png differ diff --git a/Resources/Textures/Objects/Devices/station_beacon.rsi/blink.png b/Resources/Textures/Objects/Devices/station_beacon.rsi/blink.png index 53fabd17147..cd94b9738a0 100644 Binary files a/Resources/Textures/Objects/Devices/station_beacon.rsi/blink.png and b/Resources/Textures/Objects/Devices/station_beacon.rsi/blink.png differ diff --git a/Resources/Textures/Objects/Devices/station_beacon.rsi/icon.png b/Resources/Textures/Objects/Devices/station_beacon.rsi/icon.png index 67f3f53eb50..15c1e94221d 100644 Binary files a/Resources/Textures/Objects/Devices/station_beacon.rsi/icon.png and b/Resources/Textures/Objects/Devices/station_beacon.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Devices/station_beacon.rsi/meta.json b/Resources/Textures/Objects/Devices/station_beacon.rsi/meta.json index 771ce4c261a..96aaf12a24a 100644 --- a/Resources/Textures/Objects/Devices/station_beacon.rsi/meta.json +++ b/Resources/Textures/Objects/Devices/station_beacon.rsi/meta.json @@ -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 diff --git a/Resources/Textures/Objects/Devices/tablets.rsi/generic.png b/Resources/Textures/Objects/Devices/tablets.rsi/generic.png index 22225d775ee..5e1130fcc1c 100644 Binary files a/Resources/Textures/Objects/Devices/tablets.rsi/generic.png and b/Resources/Textures/Objects/Devices/tablets.rsi/generic.png differ diff --git a/Resources/Textures/Objects/Devices/tablets.rsi/syndie.png b/Resources/Textures/Objects/Devices/tablets.rsi/syndie.png index 1c288c8bf65..19c457d059a 100644 Binary files a/Resources/Textures/Objects/Devices/tablets.rsi/syndie.png and b/Resources/Textures/Objects/Devices/tablets.rsi/syndie.png differ diff --git a/Resources/Textures/Objects/Devices/tablets.rsi/tablet.png b/Resources/Textures/Objects/Devices/tablets.rsi/tablet.png index 5fb920e7824..417d44fbcc0 100644 Binary files a/Resources/Textures/Objects/Devices/tablets.rsi/tablet.png and b/Resources/Textures/Objects/Devices/tablets.rsi/tablet.png differ diff --git a/Resources/Textures/Objects/Devices/tablets.rsi/tabletsol.png b/Resources/Textures/Objects/Devices/tablets.rsi/tabletsol.png index 8a336405382..f79a25da853 100644 Binary files a/Resources/Textures/Objects/Devices/tablets.rsi/tabletsol.png and b/Resources/Textures/Objects/Devices/tablets.rsi/tabletsol.png differ diff --git a/Resources/Textures/Objects/Devices/timer.rsi/meta.json b/Resources/Textures/Objects/Devices/timer.rsi/meta.json index 3e267819030..31d1f882df6 100644 --- a/Resources/Textures/Objects/Devices/timer.rsi/meta.json +++ b/Resources/Textures/Objects/Devices/timer.rsi/meta.json @@ -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, diff --git a/Resources/Textures/Objects/Devices/timer.rsi/timer.png b/Resources/Textures/Objects/Devices/timer.rsi/timer.png index 39b15b076db..91b6da67c2e 100644 Binary files a/Resources/Textures/Objects/Devices/timer.rsi/timer.png and b/Resources/Textures/Objects/Devices/timer.rsi/timer.png differ diff --git a/Resources/Textures/Objects/Devices/voice.rsi/meta.json b/Resources/Textures/Objects/Devices/voice.rsi/meta.json index 5910911a76f..14c2b6c5636 100644 --- a/Resources/Textures/Objects/Devices/voice.rsi/meta.json +++ b/Resources/Textures/Objects/Devices/voice.rsi/meta.json @@ -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, diff --git a/Resources/Textures/Objects/Devices/voice.rsi/voice.png b/Resources/Textures/Objects/Devices/voice.rsi/voice.png index 42defce8d44..e46eeb0fb94 100644 Binary files a/Resources/Textures/Objects/Devices/voice.rsi/voice.png and b/Resources/Textures/Objects/Devices/voice.rsi/voice.png differ