Merge remote-tracking branch 'upstream/stable' into ed-27-05-2025-upstream-sync
# Conflicts: # .github/CODEOWNERS # Content.Client/Guidebook/Controls/GuideReagentReaction.xaml.cs # Content.IntegrationTests/Tests/Chemistry/TryAllReactionsTest.cs # Content.Server/Procedural/DungeonJob/DungeonJob.OreDunGen.cs # Resources/Prototypes/Entities/Effects/chemistry_effects.yml # Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml # Resources/Prototypes/GameRules/meteorswarms.yml # Resources/Prototypes/Procedural/dungeon_configs.yml
|
After Width: | Height: | Size: 268 B |
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"version": 1,
|
||||
"license": "CC-BY-SA-3.0",
|
||||
"copyright": "Added by Phunny",
|
||||
"copyright": "Added by Phunny, dragon taco modified from beef taco by MisterImp (GitHub)",
|
||||
"size": {
|
||||
"x": 32,
|
||||
"y": 32
|
||||
@@ -24,6 +24,9 @@
|
||||
},
|
||||
{
|
||||
"name": "rattaco"
|
||||
},
|
||||
{
|
||||
"name": "dragontaco"
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
|
After Width: | Height: | Size: 1.1 KiB |
|
After Width: | Height: | Size: 1.1 KiB |
@@ -1,20 +1,65 @@
|
||||
{
|
||||
"version": 1,
|
||||
"license": "CC-BY-SA-3.0",
|
||||
"copyright": "tgstation at https://github.com/tgstation/tgstation/blob/c46d689e2b300bdc8c5b153855b1a5bbb2c5b168/icons/obj/singularity.dmi",
|
||||
"size": {
|
||||
"x": 32,
|
||||
"y": 32
|
||||
},
|
||||
"states": [
|
||||
{
|
||||
"name": "icon",
|
||||
"delays": [
|
||||
[
|
||||
0.1,
|
||||
0.1
|
||||
]
|
||||
]
|
||||
}
|
||||
]
|
||||
"version": 1,
|
||||
"license": "CC-BY-SA-3.0",
|
||||
"copyright": "tgstation at https://github.com/tgstation/tgstation/blob/c46d689e2b300bdc8c5b153855b1a5bbb2c5b168/icons/obj/singularity.dmi, inhands by mubururu_ (github)",
|
||||
"size": {
|
||||
"x": 32,
|
||||
"y": 32
|
||||
},
|
||||
"states": [
|
||||
{
|
||||
"name": "icon",
|
||||
"delays": [
|
||||
[
|
||||
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
|
||||
]
|
||||
]
|
||||
}
|
||||
|
||||
]
|
||||
}
|
||||
|
||||
|
Before Width: | Height: | Size: 274 B After Width: | Height: | Size: 6.6 KiB |
|
Before Width: | Height: | Size: 411 B After Width: | Height: | Size: 6.2 KiB |
|
Before Width: | Height: | Size: 365 B After Width: | Height: | Size: 7.2 KiB |
|
Before Width: | Height: | Size: 378 B After Width: | Height: | Size: 7.3 KiB |
@@ -1,11 +1,11 @@
|
||||
{
|
||||
"version": 1,
|
||||
"license": "CC-BY-SA-3.0",
|
||||
"copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13 at 8d9c91e19cb52713c7f7f1804c2b6f7203f8d331, Modified by Archee1 (github)",
|
||||
"size": {
|
||||
"x": 32,
|
||||
"y": 32
|
||||
},
|
||||
"license": "CC-BY-SA-3.0",
|
||||
"copyright": "https://github.com/vgstation-coders/vgstation13 at 8d9c91e19cb52713c7f7f1804c2b6f7203f8d331",
|
||||
"states": [
|
||||
{
|
||||
"name": "icon"
|
||||
|
||||
|
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 7.9 KiB |
|
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 7.5 KiB |
|
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 8.6 KiB |
|
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 8.6 KiB |
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"version": 1,
|
||||
"license": "CC-BY-SA-3.0",
|
||||
"copyright": "Made by brainfood1183 (github) for ss14",
|
||||
"copyright": "Made by brainfood1183 (github) for ss14, Modified by Archee1 (github)",
|
||||
"size": {
|
||||
"x": 32,
|
||||
"y": 32
|
||||
|
||||
|
Before Width: | Height: | Size: 274 B After Width: | Height: | Size: 6.3 KiB |
|
Before Width: | Height: | Size: 286 B After Width: | Height: | Size: 5.7 KiB |
|
Before Width: | Height: | Size: 391 B After Width: | Height: | Size: 6.7 KiB |
|
Before Width: | Height: | Size: 407 B After Width: | Height: | Size: 6.8 KiB |
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"version": 1,
|
||||
"license": "CC-BY-SA-3.0",
|
||||
"copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/125c975f1b3bf9826b37029e9ab5a5f89e975a7e",
|
||||
"copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/125c975f1b3bf9826b37029e9ab5a5f89e975a7e, Modified by Archee1 (github)",
|
||||
"size": {
|
||||
"x": 32,
|
||||
"y": 32
|
||||
|
||||
|
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 7.0 KiB |
|
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 6.4 KiB |
|
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 7.5 KiB |
|
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 7.4 KiB |
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"version": 1,
|
||||
"license": "CC-BY-SA-3.0",
|
||||
"copyright": "Made by brainfood1183 (github) for ss14",
|
||||
"copyright": "Made by brainfood1183 (github) for ss14, Modified by Archee1 (github)",
|
||||
"size": {
|
||||
"x": 32,
|
||||
"y": 32
|
||||
|
||||
|
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 7.7 KiB |
|
Before Width: | Height: | Size: 2.1 KiB After Width: | Height: | Size: 6.1 KiB |
|
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 7.9 KiB |
|
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 7.6 KiB |
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"version": 1,
|
||||
"license": "CC-BY-SA-3.0",
|
||||
"copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/125c975f1b3bf9826b37029e9ab5a5f89e975a7e. Modified by brainfood1183 (github) for ss14",
|
||||
"copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/125c975f1b3bf9826b37029e9ab5a5f89e975a7e. Modified by brainfood1183 (github) for ss14 and later modified by Archee1 (github)",
|
||||
"size": {
|
||||
"x": 32,
|
||||
"y": 32
|
||||
|
||||
|
Before Width: | Height: | Size: 293 B After Width: | Height: | Size: 442 B |
|
Before Width: | Height: | Size: 299 B After Width: | Height: | Size: 409 B |
|
Before Width: | Height: | Size: 409 B After Width: | Height: | Size: 551 B |
|
Before Width: | Height: | Size: 432 B After Width: | Height: | Size: 585 B |
@@ -1,26 +1,26 @@
|
||||
{
|
||||
"version": 1,
|
||||
"license": "CC0-1.0",
|
||||
"copyright": "Made by Thinbug for ss14 :33",
|
||||
"license": "CC-BY-SA-3.0",
|
||||
"copyright": "sprites by mubururu_ (github)",
|
||||
"size": {
|
||||
"x": 32,
|
||||
"y": 32
|
||||
"x": 32,
|
||||
"y": 32
|
||||
},
|
||||
"states": [
|
||||
{
|
||||
"name": "icon"
|
||||
},
|
||||
{
|
||||
"name": "equipped-BELT",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "inhand-left",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "inhand-right",
|
||||
"directions": 4
|
||||
}
|
||||
{
|
||||
"name": "icon"
|
||||
},
|
||||
{
|
||||
"name": "equipped-BELT",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "inhand-left",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "inhand-right",
|
||||
"directions": 4
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
|
Before Width: | Height: | Size: 4.8 KiB After Width: | Height: | Size: 786 B |
|
Before Width: | Height: | Size: 4.7 KiB After Width: | Height: | Size: 790 B |
@@ -1,284 +1,284 @@
|
||||
{
|
||||
"version": 1,
|
||||
"license": "CC-BY-SA-3.0",
|
||||
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e idcluwne made by brainfood1183 (github) for ss14, idbrigmedic made by PuroSlavKing (Github), pirate made by brainfood1183 (github), idadmin made by Arimah (github), idvisitor by IProduceWidgets (Github), idintern-service by spanky-spanky (Github) | service icons darkened by frobnic8 (Discord and Github), wizard and idwizard by ScarKy0",
|
||||
"size": {
|
||||
"x": 32,
|
||||
"y": 32
|
||||
},
|
||||
"states": [
|
||||
{
|
||||
"name": "default"
|
||||
},
|
||||
{
|
||||
"name": "centcom"
|
||||
},
|
||||
{
|
||||
"name": "admin"
|
||||
},
|
||||
{
|
||||
"name": "ert_chaplain"
|
||||
},
|
||||
{
|
||||
"name": "ert_commander"
|
||||
},
|
||||
{
|
||||
"name": "ert_engineer"
|
||||
},
|
||||
{
|
||||
"name": "ert_janitor"
|
||||
},
|
||||
{
|
||||
"name": "ert_medic"
|
||||
},
|
||||
{
|
||||
"name": "ert_security"
|
||||
},
|
||||
{
|
||||
"name": "gold"
|
||||
},
|
||||
{
|
||||
"name": "idpassenger"
|
||||
},
|
||||
{
|
||||
"name": "idatmospherictechnician"
|
||||
},
|
||||
{
|
||||
"name": "idbartender"
|
||||
},
|
||||
{
|
||||
"name": "idbotanist"
|
||||
},
|
||||
{
|
||||
"name": "idboxer"
|
||||
},
|
||||
{
|
||||
"name": "idcaptain"
|
||||
},
|
||||
{
|
||||
"name": "idcargotechnician"
|
||||
},
|
||||
{
|
||||
"name": "idcentcom"
|
||||
},
|
||||
{
|
||||
"name": "idchaplain"
|
||||
},
|
||||
{
|
||||
"name": "idchemist"
|
||||
},
|
||||
{
|
||||
"name": "idchiefengineer"
|
||||
},
|
||||
{
|
||||
"name": "idchiefmedicalofficer"
|
||||
},
|
||||
{
|
||||
"name": "idclown"
|
||||
},
|
||||
{
|
||||
"name": "idcook"
|
||||
},
|
||||
{
|
||||
"name": "idcurator"
|
||||
},
|
||||
{
|
||||
"name": "iddetective"
|
||||
},
|
||||
{
|
||||
"name": "idgeneticist"
|
||||
},
|
||||
{
|
||||
"name": "idheadofpersonnel"
|
||||
},
|
||||
{
|
||||
"name": "idheadofsecurity"
|
||||
},
|
||||
{
|
||||
"name": "idbrigmedic"
|
||||
},
|
||||
{
|
||||
"name": "idjanitor"
|
||||
},
|
||||
{
|
||||
"name": "idlawyer"
|
||||
},
|
||||
{
|
||||
"name": "idmedicaldoctor"
|
||||
},
|
||||
{
|
||||
"name": "idmime"
|
||||
},
|
||||
{
|
||||
"name": "idparamedic"
|
||||
},
|
||||
{
|
||||
"name": "idpsychologist"
|
||||
},
|
||||
{
|
||||
"name": "idreporter"
|
||||
},
|
||||
{
|
||||
"name": "idprisoner"
|
||||
},
|
||||
{
|
||||
"name": "idquartermaster"
|
||||
},
|
||||
{
|
||||
"name": "idresearchdirector"
|
||||
},
|
||||
{
|
||||
"name": "idroboticist"
|
||||
},
|
||||
{
|
||||
"name": "idscientist"
|
||||
},
|
||||
{
|
||||
"name": "idsecurityofficer"
|
||||
},
|
||||
{
|
||||
"name": "idshaftminer"
|
||||
},
|
||||
{
|
||||
"name": "idstationengineer"
|
||||
},
|
||||
{
|
||||
"name": "idunknown"
|
||||
},
|
||||
{
|
||||
"name": "idvirologist"
|
||||
},
|
||||
{
|
||||
"name": "idvisitor"
|
||||
},
|
||||
{
|
||||
"name": "idwarden"
|
||||
},
|
||||
{
|
||||
"name": "idmusician"
|
||||
},
|
||||
{
|
||||
"name": "idzookeeper"
|
||||
},
|
||||
{
|
||||
"name": "idintern-sci"
|
||||
},
|
||||
{
|
||||
"name": "idintern-cadet"
|
||||
},
|
||||
{
|
||||
"name": "idintern-med"
|
||||
},
|
||||
{
|
||||
"name": "idintern-service"
|
||||
},
|
||||
{
|
||||
"name": "idintern-tech"
|
||||
},
|
||||
{
|
||||
"name": "idadmin"
|
||||
},
|
||||
{
|
||||
"name": "orange"
|
||||
},
|
||||
{
|
||||
"name": "pirate"
|
||||
},
|
||||
{
|
||||
"name": "prisoner_001"
|
||||
},
|
||||
{
|
||||
"name": "prisoner_002"
|
||||
},
|
||||
{
|
||||
"name": "prisoner_003"
|
||||
},
|
||||
{
|
||||
"name": "prisoner_004"
|
||||
},
|
||||
{
|
||||
"name": "prisoner_005"
|
||||
},
|
||||
{
|
||||
"name": "prisoner_006"
|
||||
},
|
||||
{
|
||||
"name": "prisoner_007"
|
||||
},
|
||||
{
|
||||
"name": "silver"
|
||||
},
|
||||
{
|
||||
"name": "syndie"
|
||||
},
|
||||
{
|
||||
"name": "idcluwne"
|
||||
},
|
||||
{
|
||||
"name": "idseniorengineer"
|
||||
},
|
||||
{
|
||||
"name": "idseniorresearcher"
|
||||
},
|
||||
{
|
||||
"name": "idseniorphysician"
|
||||
},
|
||||
{
|
||||
"name": "idseniorofficer"
|
||||
},
|
||||
{
|
||||
"name": "wizard"
|
||||
},
|
||||
{
|
||||
"name": "idwizard"
|
||||
},
|
||||
{
|
||||
"name": "gold-inhand-left",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "gold-inhand-right",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "default-inhand-left",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "default-inhand-right",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "silver-inhand-left",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "silver-inhand-right",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "orange-inhand-left",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "orange-inhand-right",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "blue-inhand-left",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "blue-inhand-right",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "green-inhand-left",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "green-inhand-right",
|
||||
"directions": 4
|
||||
}
|
||||
]
|
||||
"version": 1,
|
||||
"license": "CC-BY-SA-3.0",
|
||||
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e idcluwne made by brainfood1183 (github) for ss14, idbrigmedic made by PuroSlavKing (Github), pirate made by brainfood1183 (github), idadmin made by Arimah (github), idvisitor by IProduceWidgets (Github), idintern-service by spanky-spanky (Github) | service icons darkened by frobnic8 (Discord and Github), wizard and idwizard by ScarKy0 | idboxer and idlawyer recoloured by K-Dynamic (github).",
|
||||
"size": {
|
||||
"x": 32,
|
||||
"y": 32
|
||||
},
|
||||
"states": [
|
||||
{
|
||||
"name": "default"
|
||||
},
|
||||
{
|
||||
"name": "centcom"
|
||||
},
|
||||
{
|
||||
"name": "admin"
|
||||
},
|
||||
{
|
||||
"name": "ert_chaplain"
|
||||
},
|
||||
{
|
||||
"name": "ert_commander"
|
||||
},
|
||||
{
|
||||
"name": "ert_engineer"
|
||||
},
|
||||
{
|
||||
"name": "ert_janitor"
|
||||
},
|
||||
{
|
||||
"name": "ert_medic"
|
||||
},
|
||||
{
|
||||
"name": "ert_security"
|
||||
},
|
||||
{
|
||||
"name": "gold"
|
||||
},
|
||||
{
|
||||
"name": "idpassenger"
|
||||
},
|
||||
{
|
||||
"name": "idatmospherictechnician"
|
||||
},
|
||||
{
|
||||
"name": "idbartender"
|
||||
},
|
||||
{
|
||||
"name": "idbotanist"
|
||||
},
|
||||
{
|
||||
"name": "idboxer"
|
||||
},
|
||||
{
|
||||
"name": "idcaptain"
|
||||
},
|
||||
{
|
||||
"name": "idcargotechnician"
|
||||
},
|
||||
{
|
||||
"name": "idcentcom"
|
||||
},
|
||||
{
|
||||
"name": "idchaplain"
|
||||
},
|
||||
{
|
||||
"name": "idchemist"
|
||||
},
|
||||
{
|
||||
"name": "idchiefengineer"
|
||||
},
|
||||
{
|
||||
"name": "idchiefmedicalofficer"
|
||||
},
|
||||
{
|
||||
"name": "idclown"
|
||||
},
|
||||
{
|
||||
"name": "idcook"
|
||||
},
|
||||
{
|
||||
"name": "idcurator"
|
||||
},
|
||||
{
|
||||
"name": "iddetective"
|
||||
},
|
||||
{
|
||||
"name": "idgeneticist"
|
||||
},
|
||||
{
|
||||
"name": "idheadofpersonnel"
|
||||
},
|
||||
{
|
||||
"name": "idheadofsecurity"
|
||||
},
|
||||
{
|
||||
"name": "idbrigmedic"
|
||||
},
|
||||
{
|
||||
"name": "idjanitor"
|
||||
},
|
||||
{
|
||||
"name": "idlawyer"
|
||||
},
|
||||
{
|
||||
"name": "idmedicaldoctor"
|
||||
},
|
||||
{
|
||||
"name": "idmime"
|
||||
},
|
||||
{
|
||||
"name": "idparamedic"
|
||||
},
|
||||
{
|
||||
"name": "idpsychologist"
|
||||
},
|
||||
{
|
||||
"name": "idreporter"
|
||||
},
|
||||
{
|
||||
"name": "idprisoner"
|
||||
},
|
||||
{
|
||||
"name": "idquartermaster"
|
||||
},
|
||||
{
|
||||
"name": "idresearchdirector"
|
||||
},
|
||||
{
|
||||
"name": "idroboticist"
|
||||
},
|
||||
{
|
||||
"name": "idscientist"
|
||||
},
|
||||
{
|
||||
"name": "idsecurityofficer"
|
||||
},
|
||||
{
|
||||
"name": "idshaftminer"
|
||||
},
|
||||
{
|
||||
"name": "idstationengineer"
|
||||
},
|
||||
{
|
||||
"name": "idunknown"
|
||||
},
|
||||
{
|
||||
"name": "idvirologist"
|
||||
},
|
||||
{
|
||||
"name": "idvisitor"
|
||||
},
|
||||
{
|
||||
"name": "idwarden"
|
||||
},
|
||||
{
|
||||
"name": "idmusician"
|
||||
},
|
||||
{
|
||||
"name": "idzookeeper"
|
||||
},
|
||||
{
|
||||
"name": "idintern-sci"
|
||||
},
|
||||
{
|
||||
"name": "idintern-cadet"
|
||||
},
|
||||
{
|
||||
"name": "idintern-med"
|
||||
},
|
||||
{
|
||||
"name": "idintern-service"
|
||||
},
|
||||
{
|
||||
"name": "idintern-tech"
|
||||
},
|
||||
{
|
||||
"name": "idadmin"
|
||||
},
|
||||
{
|
||||
"name": "orange"
|
||||
},
|
||||
{
|
||||
"name": "pirate"
|
||||
},
|
||||
{
|
||||
"name": "prisoner_001"
|
||||
},
|
||||
{
|
||||
"name": "prisoner_002"
|
||||
},
|
||||
{
|
||||
"name": "prisoner_003"
|
||||
},
|
||||
{
|
||||
"name": "prisoner_004"
|
||||
},
|
||||
{
|
||||
"name": "prisoner_005"
|
||||
},
|
||||
{
|
||||
"name": "prisoner_006"
|
||||
},
|
||||
{
|
||||
"name": "prisoner_007"
|
||||
},
|
||||
{
|
||||
"name": "silver"
|
||||
},
|
||||
{
|
||||
"name": "syndie"
|
||||
},
|
||||
{
|
||||
"name": "idcluwne"
|
||||
},
|
||||
{
|
||||
"name": "idseniorengineer"
|
||||
},
|
||||
{
|
||||
"name": "idseniorresearcher"
|
||||
},
|
||||
{
|
||||
"name": "idseniorphysician"
|
||||
},
|
||||
{
|
||||
"name": "idseniorofficer"
|
||||
},
|
||||
{
|
||||
"name": "wizard"
|
||||
},
|
||||
{
|
||||
"name": "idwizard"
|
||||
},
|
||||
{
|
||||
"name": "gold-inhand-left",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "gold-inhand-right",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "default-inhand-left",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "default-inhand-right",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "silver-inhand-left",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "silver-inhand-right",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "orange-inhand-left",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "orange-inhand-right",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "blue-inhand-left",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "blue-inhand-right",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "green-inhand-left",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "green-inhand-right",
|
||||
"directions": 4
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
BIN
Resources/Textures/Objects/Misc/meteor.rsi/clown_pixel.png
Normal file
|
After Width: | Height: | Size: 3.7 KiB |
BIN
Resources/Textures/Objects/Misc/meteor.rsi/cow_pixel.png
Normal file
|
After Width: | Height: | Size: 3.7 KiB |
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"version": 1,
|
||||
"license": "CC-BY-SA-3.0",
|
||||
"copyright": "Taken from vgstation13 at https://github.com/vgstation-coders/vgstation13/blob/31dd6749bfe32810c46e7913efc99a187479cd51/icons/obj/meteor.dmi",
|
||||
"copyright": "Taken from vgstation13 at https://github.com/vgstation-coders/vgstation13/blob/31dd6749bfe32810c46e7913efc99a187479cd51/icons/obj/meteor.dmi. cow_pixel - taken from https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b and modified by B_Kirill. potato by Chaoticaa (GitHub), modified by B_Kirill. clown_pixel - assembly of [Human sprite - taken from https://github.com/tgstation/tgstation/blob/8024397cc81c5f47f74cf4279e35728487d0a1a7/icons/mob/human_parts_greyscale.dmi and modified by DrSmugleaf ; Clown wig and mask - taken from https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e ; Clown suit - taken from https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039 ; Clown shoes - taken from https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe ; Giggles von honkerton - taken from https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1] by B_Kirill.",
|
||||
"size": {
|
||||
"x": 32,
|
||||
"y": 32
|
||||
@@ -266,6 +266,43 @@
|
||||
},
|
||||
{
|
||||
"name": "firework"
|
||||
},
|
||||
{
|
||||
"name": "cow_pixel",
|
||||
"delays": [
|
||||
[
|
||||
0.1,
|
||||
0.1,
|
||||
0.1,
|
||||
0.1
|
||||
]
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "clown_pixel",
|
||||
"delays": [
|
||||
[
|
||||
0.1,
|
||||
0.1,
|
||||
0.1,
|
||||
0.1
|
||||
]
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "potato",
|
||||
"delays": [
|
||||
[
|
||||
0.1,
|
||||
0.1,
|
||||
0.1,
|
||||
0.1,
|
||||
0.1,
|
||||
0.1,
|
||||
0.1,
|
||||
0.1
|
||||
]
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
BIN
Resources/Textures/Objects/Misc/meteor.rsi/potato.png
Normal file
|
After Width: | Height: | Size: 3.8 KiB |
BIN
Resources/Textures/Objects/Power/powersink.rsi/inhand-left.png
Normal file
|
After Width: | Height: | Size: 1.5 KiB |
BIN
Resources/Textures/Objects/Power/powersink.rsi/inhand-right.png
Normal file
|
After Width: | Height: | Size: 1.5 KiB |
@@ -1,14 +1,23 @@
|
||||
{
|
||||
"version": 1,
|
||||
"license": "CC-BY-NC-SA-3.0",
|
||||
"copyright": "Drawn by Ubaser.",
|
||||
"size": {
|
||||
"x": 32,
|
||||
"y": 32
|
||||
},
|
||||
"states": [
|
||||
{
|
||||
"name": "powersink"
|
||||
}
|
||||
]
|
||||
"version": 1,
|
||||
"license": "CC-BY-NC-SA-3.0",
|
||||
"copyright": "Drawn by Ubaser. inhands by mubururu_ (github)",
|
||||
"size": {
|
||||
"x": 32,
|
||||
"y": 32
|
||||
},
|
||||
"states": [
|
||||
|
||||
{
|
||||
"name": "inhand-left",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "inhand-right",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "powersink"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
|
Before Width: | Height: | Size: 7.1 KiB After Width: | Height: | Size: 7.1 KiB |
@@ -43,7 +43,7 @@
|
||||
"name": "bomb"
|
||||
},
|
||||
{
|
||||
"name": "bomb-unshaded",
|
||||
"name": "bomb_unshaded",
|
||||
"delays": [
|
||||
[
|
||||
0.2,
|
||||
|
||||
|
Before Width: | Height: | Size: 6.7 KiB After Width: | Height: | Size: 6.7 KiB |
@@ -43,7 +43,7 @@
|
||||
"name": "bomb"
|
||||
},
|
||||
{
|
||||
"name": "bomb-unshaded",
|
||||
"name": "bomb_unshaded",
|
||||
"delays": [
|
||||
[
|
||||
0.125,
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"version": 1,
|
||||
"license": "CC-BY-SA-3.0",
|
||||
"copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/ca674eff9d23e04357b7609ef7e07eadfc1a993f and modified by Flareguy (github), encryptokey was taken from Baystation12 at https://github.com/infinitystation/Baystation12/blob/073f678cdce92edb8fcd55f9ffc9f0523bf31506/icons/obj/radio.dmi and modified by lapatison. boxwidetoy, shelltoy, swab, flare, inflatable, trashbag, magazine, holo and forensic created by potato1234x (github) for ss14 based on toys.rsi, mouth_swab.rsi, flare.rsi, inflatable_wall.rsi, trashbag.rsi, caseless_pistol_mag.rsi, guardians.rsi and bureaucracy.rsi respectively, candle and darts created by TheShuEd for ss14, throwing_knives and vials was drawn by Ubaser, evidence_markers by moomoobeef, nitrogentank modified from extendedtank by Errant, agrichemkit by Cerol, modified by ps3moira (github). sechud renamed to secglasses, new sechud, sunglasses by K-Dynamic (github).",
|
||||
"copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/ca674eff9d23e04357b7609ef7e07eadfc1a993f and modified by Flareguy (github), encryptokey was taken from Baystation12 at https://github.com/infinitystation/Baystation12/blob/073f678cdce92edb8fcd55f9ffc9f0523bf31506/icons/obj/radio.dmi and modified by lapatison. boxwidetoy, shelltoy, swab, flare, inflatable, trashbag, magazine, holo and forensic created by potato1234x (github) for ss14 based on toys.rsi, mouth_swab.rsi, flare.rsi, inflatable_wall.rsi, trashbag.rsi, caseless_pistol_mag.rsi, guardians.rsi and bureaucracy.rsi respectively, candle and darts created by TheShuEd for ss14, throwing_knives and vials was drawn by Ubaser, evidence_markers by moomoobeef, nitrogentank modified from extendedtank by Errant, agrichemkit by Cerol, modified by ps3moira (github). sechud renamed to secglasses, new sechud, sunglasses by K-Dynamic (github). utensils by gentleman-bird (github)",
|
||||
"size": {
|
||||
"x": 32,
|
||||
"y": 32
|
||||
@@ -151,6 +151,9 @@
|
||||
{
|
||||
"name": "trashbag"
|
||||
},
|
||||
{
|
||||
"name": "utensils"
|
||||
},
|
||||
{
|
||||
"name": "writing"
|
||||
},
|
||||
@@ -200,7 +203,7 @@
|
||||
{
|
||||
"name": "france"
|
||||
},
|
||||
{
|
||||
{
|
||||
"name": "agrichemkit"
|
||||
}
|
||||
]
|
||||
|
||||
BIN
Resources/Textures/Objects/Storage/boxes.rsi/utensils.png
Normal file
|
After Width: | Height: | Size: 157 B |
|
Before Width: | Height: | Size: 681 B After Width: | Height: | Size: 460 B |
|
After Width: | Height: | Size: 605 B |
|
After Width: | Height: | Size: 624 B |
@@ -1,32 +1,41 @@
|
||||
{
|
||||
"version": 1,
|
||||
"license": "CC-BY-SA-3.0",
|
||||
"copyright": "Taken from https://github.com/austation/austation/commit/e2a4fefd01e702f48d3d4cc8d6a2686d54d104fa and edited by TheShuEd",
|
||||
"size": {
|
||||
"x": 32,
|
||||
"y": 32
|
||||
},
|
||||
"states": [
|
||||
{
|
||||
"name": "folded_extraction"
|
||||
"version": 1,
|
||||
"license": "CC-BY-SA-3.0",
|
||||
"copyright": "Taken from https://github.com/austation/austation/commit/e2a4fefd01e702f48d3d4cc8d6a2686d54d104fa and edited by TheShuEd, folded sprite modified by mubururu_, inhands by mubururu_ (github)",
|
||||
"size": {
|
||||
"x": 32,
|
||||
"y": 32
|
||||
},
|
||||
{
|
||||
"name": "extraction_point",
|
||||
"delays": [
|
||||
[
|
||||
0.5,
|
||||
0.5
|
||||
]
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "extraction_point_light",
|
||||
"delays": [
|
||||
[
|
||||
0.5,
|
||||
0.5
|
||||
]
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
"states": [
|
||||
{
|
||||
"name": "folded_extraction"
|
||||
},
|
||||
{
|
||||
"name": "extraction_point",
|
||||
"delays": [
|
||||
[
|
||||
0.5,
|
||||
0.5
|
||||
]
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "extraction_point_light",
|
||||
"delays": [
|
||||
[
|
||||
0.5,
|
||||
0.5
|
||||
]
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "inhand-left",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "inhand-right",
|
||||
"directions": 4
|
||||
}
|
||||
|
||||
]
|
||||
}
|
||||
|
||||
|
After Width: | Height: | Size: 905 B |
|
After Width: | Height: | Size: 229 B |
BIN
Resources/Textures/Objects/Weapons/Grenades/airboom.rsi/icon.png
Normal file
|
After Width: | Height: | Size: 306 B |
|
After Width: | Height: | Size: 363 B |
|
After Width: | Height: | Size: 378 B |
@@ -0,0 +1,44 @@
|
||||
{
|
||||
"version": 1,
|
||||
"license": "CC0-1.0",
|
||||
"copyright": "Created by EmoGarbage404 (github) for Space Station 14",
|
||||
"size": {
|
||||
"x": 32,
|
||||
"y": 32
|
||||
},
|
||||
"states": [
|
||||
{
|
||||
"name": "icon"
|
||||
},
|
||||
{
|
||||
"name": "primed"
|
||||
},
|
||||
{
|
||||
"name": "active",
|
||||
"delays": [
|
||||
[
|
||||
0.1,
|
||||
0.1,
|
||||
0.1,
|
||||
0.1,
|
||||
0.1
|
||||
]
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "spent"
|
||||
},
|
||||
{
|
||||
"name": "equipped-BELT",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "inhand-left",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "inhand-right",
|
||||
"directions": 4
|
||||
}
|
||||
]
|
||||
}
|
||||
|
After Width: | Height: | Size: 299 B |
|
After Width: | Height: | Size: 350 B |
|
Before Width: | Height: | Size: 149 B After Width: | Height: | Size: 4.2 KiB |
|
Before Width: | Height: | Size: 152 B After Width: | Height: | Size: 4.2 KiB |
|
Before Width: | Height: | Size: 161 B After Width: | Height: | Size: 4.2 KiB |
|
Before Width: | Height: | Size: 166 B After Width: | Height: | Size: 4.2 KiB |
|
Before Width: | Height: | Size: 149 B After Width: | Height: | Size: 4.2 KiB |
|
Before Width: | Height: | Size: 152 B After Width: | Height: | Size: 4.2 KiB |
|
Before Width: | Height: | Size: 155 B After Width: | Height: | Size: 4.2 KiB |
|
Before Width: | Height: | Size: 159 B After Width: | Height: | Size: 4.2 KiB |
|
Before Width: | Height: | Size: 162 B After Width: | Height: | Size: 4.2 KiB |
|
Before Width: | Height: | Size: 347 B After Width: | Height: | Size: 4.2 KiB |
|
Before Width: | Height: | Size: 355 B After Width: | Height: | Size: 4.2 KiB |
|
After Width: | Height: | Size: 247 B |
@@ -55,6 +55,9 @@
|
||||
},
|
||||
{
|
||||
"name": "heavylaser_flash"
|
||||
},
|
||||
{
|
||||
"name": "ice"
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||