Merge branch 'master' into bow-and-quiver

This commit is contained in:
Ed
2025-01-22 00:01:44 +03:00
committed by GitHub
570 changed files with 420393 additions and 87210 deletions

View File

@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "PixelTK leaves his mark on upstream, BackeTako made the gay, autism pins by Terraspark",
"copyright": "PixelTK leaves his mark on upstream, BackeTako made the gay, autism pins by Terraspark, omnisexual pin by juliangiebel",
"size": {
"x": 32,
"y": 32
@@ -90,6 +90,13 @@
{
"name": "trans-equipped-NECK",
"directions": 4
},
{
"name": "omni"
},
{
"name": "omni-equipped-NECK",
"directions": 4
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 183 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 287 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 51 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 188 B

After

Width:  |  Height:  |  Size: 4.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 194 B

After

Width:  |  Height:  |  Size: 4.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 185 B

After

Width:  |  Height:  |  Size: 4.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 163 B

After

Width:  |  Height:  |  Size: 4.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 209 B

After

Width:  |  Height:  |  Size: 4.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 183 B

After

Width:  |  Height:  |  Size: 4.6 KiB

View File

@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi | Brigmedic icon made by PuroSlavKing (Github) | Zombie icon made by RamZ | Zookeper by netwy (discort) | Rev and Head Rev icon taken from https://tgstation13.org/wiki/HUD and edited by coolmankid12345 (Discord) | Mindshield icon taken from https://github.com/tgstation/tgstation/blob/ce6beb8a4d61235d9a597a7126c407160ed674ea/icons/mob/huds/hud.dmi | Admin recolored from MedicalIntern by TsjipTsjip | StationAi resprite to 8x8 size by lunarcomets | Service Worker resprite by anno_midi (Discord) and spanky-spanky (Github)",
"copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi | Brigmedic icon made by PuroSlavKing (Github) | Zombie icon made by RamZ | Zookeper by netwy (discort) | Rev and Head Rev icon taken from https://tgstation13.org/wiki/HUD and edited by coolmankid12345 (Discord) | Mindshield icon taken from https://github.com/tgstation/tgstation/blob/ce6beb8a4d61235d9a597a7126c407160ed674ea/icons/mob/huds/hud.dmi | Admin recolored from MedicalIntern by TsjipTsjip | StationAi resprite to 8x8 size by lunarcomets | Service Worker resprite by anno_midi (Discord) and spanky-spanky (Github) | service icons darkened by frobnic8 (Discord and Github)",
"size": {
"x": 8,

Binary file not shown.

After

Width:  |  Height:  |  Size: 54 KiB

View File

@@ -4,7 +4,7 @@
"x": 32,
"y": 32
},
"copyright": "Taken from https://github.com/tgstation/tgstation/blob/05ec94e46349c35e29ca91e5e97d0c88ae26ad44/icons/mob/species/human/human_face.dmi ,resprited by Alekshhh, a modified by potato1234x, uneven and tailed is drawn by Ubaser, doublebun_long by Emisse, longbundled and bob5 sprited by github:DreamlyJack(624946166152298517)",
"copyright": "Taken from https://github.com/tgstation/tgstation/blob/05ec94e46349c35e29ca91e5e97d0c88ae26ad44/icons/mob/species/human/human_face.dmi ,resprited by Alekshhh, a modified by potato1234x, uneven and tailed is drawn by Ubaser, doublebun_long by Emisse, longbundled and bob5 sprited by github:DreamlyJack(624946166152298517), pulato.png made by DreamlyJack for SS14",
"license": "CC-BY-SA-3.0",
"states": [
{
@@ -567,6 +567,10 @@
"name": "protagonist",
"directions": 4
},
{
"name": "pulato",
"directions": 4
},
{
"name": "quiff",
"directions": 4

Binary file not shown.

After

Width:  |  Height:  |  Size: 761 B

View File

@@ -6,6 +6,7 @@
},
"license": "CC-BY-SA-3.0",
"copyright": "Created by Alekshhh for SS14.",
"metaAtlas": false,
"states": [
{
"name": "honkmother",

View File

@@ -6,6 +6,7 @@
},
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/b44fcdedfb7c7d8425bd75b9caf71644a86375d1/icons/obj/antags/cult/narsie.dmi",
"metaAtlas": false,
"states": [
{
"name": "narsie",

View File

@@ -6,6 +6,7 @@
"x": 512,
"y": 512
},
"metaAtlas": false,
"states": [
{
"name": "ratvar",
@@ -39,19 +40,19 @@
0.25,
0.25,
1,
0.3,
0.3,
0.2,
0.1,
0.05,
0.05,
0.05,
0.05,
0.05,
0.05,
0.05,
0.05,
0.05,
@@ -60,4 +61,4 @@
]
}
]
}
}

View File

@@ -7,6 +7,7 @@
"x": 288,
"y": 288
},
"metaAtlas": false,
"states": [
{
"name": "tabletop"

View File

@@ -7,6 +7,7 @@
"x": 288,
"y": 288
},
"metaAtlas": false,
"states": [
{
"name": "tabletop"

View File

@@ -7,6 +7,7 @@
"x": 288,
"y": 288
},
"metaAtlas": false,
"states": [
{
"name": "tabletop"

View File

@@ -7,6 +7,7 @@
"x": 543,
"y": 543
},
"metaAtlas": false,
"states": [
{
"name": "tabletop"

View File

@@ -7,6 +7,7 @@
"x": 288,
"y": 288
},
"metaAtlas": false,
"states": [
{
"name": "tabletop"

View File

@@ -6,6 +6,7 @@
"x": 550,
"y": 410
},
"metaAtlas": false,
"states": [
{
"name": "backgammonBoard"

View File

@@ -6,6 +6,7 @@
"x": 274,
"y": 274
},
"metaAtlas": false,
"states": [
{
"name": "chessboard_tabletop"

View File

@@ -6,6 +6,7 @@
"x": 548,
"y": 548
},
"metaAtlas": false,
"states": [
{
"name": "board"

View File

@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432, orb, orb-inhand-left and orb-inhand-right created by Pancake, plushie_diona and plushie_diona1 created by discord user Deos#5630, toy-mouse-equipped-HELMET is a resprited 1-equipped-HELMET in mouse.rsi by PuroSlavKing (Github), plushie_xeno by LinkUyx#6557, plushie_hampter by RenLou#4333, beachball taken from https://github.com/ss220-space/Paradise/commit/662c08272acd7be79531550919f56f846726eabb, beachb-inhand by ;3#1161, bee hat and in-hand sprites drawn by Ubaser, plushie_penguin by netwy, plushie_arachnid by PixelTheKermit (github), plushie human by TheShuEd, NanoTrasen Balloon by MACMAN2003, holoplush and magicplush modified by deltanedas (github), lizard hat sprite made by Cinder, rubber_chicken by xprospero, in-hand lizard plushie sprites by KieueCaprie, plushie_lizard_inversed and inhand sprites modified from plushie_lizard_mirrored and plushielizard-inhand-left, plushielizard-inhand-right by ArtisticRoomba",
"copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432, orb, orb-inhand-left and orb-inhand-right created by Pancake, plushie_diona and plushie_diona1 created by discord user Deos#5630, toy-mouse-equipped-HELMET is a resprited 1-equipped-HELMET in mouse.rsi by PuroSlavKing (Github), plushie_xeno by LinkUyx#6557, plushie_hampter by RenLou#4333, beachball taken from https://github.com/ss220-space/Paradise/commit/662c08272acd7be79531550919f56f846726eabb, beachb-inhand by ;3#1161, bee hat and in-hand sprites drawn by Ubaser, plushie_penguin by netwy, plushie_arachnid by PixelTheKermit (github), plushie human by TheShuEd, NanoTrasen Balloon by MACMAN2003, holoplush and magicplush modified by deltanedas (github), lizard hat sprite made by Cinder, rubber_chicken by xprospero, in-hand lizard plushie sprites by KieueCaprie, plushie_lizard_inversed and inhand sprites modified from plushie_lizard_mirrored and plushielizard-inhand-left, plushielizard-inhand-right by ArtisticRoomba, rainbowcarplush and inhand sprites modified from carpplush and inhand sprites by ArtisticRoomba",
"size": {
"x": 32,
"y": 32
@@ -76,6 +76,17 @@
"name": "rainbowcarpplush-inhand-right",
"directions": 4
},
{
"name": "rainbowlizardplush"
},
{
"name": "rainbowlizardplush-inhand-left",
"directions": 4
},
{
"name": "rainbowlizardplush-inhand-right",
"directions": 4
},
{
"name": "narplush"
},

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 433 B

View File

@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/0ec86b44b11f5e2f45137d9f6c851b8942a26aa3, sheetbrigmedic sprited by RudeyCoolLeet#3875",
"copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/0ec86b44b11f5e2f45137d9f6c851b8942a26aa3, sheetbrigmedic sprited by RudeyCoolLeet#3875, sheetce sheethop sheethos sheetrd are adaptations of the original sprites and were created by Alpaccalypse",
"size": {
"x": 32,
"y": 32

Binary file not shown.

Before

Width:  |  Height:  |  Size: 706 B

After

Width:  |  Height:  |  Size: 607 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 684 B

After

Width:  |  Height:  |  Size: 456 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 663 B

After

Width:  |  Height:  |  Size: 477 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 672 B

After

Width:  |  Height:  |  Size: 470 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 169 B

After

Width:  |  Height:  |  Size: 4.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 175 B

After

Width:  |  Height:  |  Size: 4.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 171 B

After

Width:  |  Height:  |  Size: 4.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 197 B

After

Width:  |  Height:  |  Size: 4.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 170 B

After

Width:  |  Height:  |  Size: 4.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 233 B

After

Width:  |  Height:  |  Size: 4.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 200 B

After

Width:  |  Height:  |  Size: 4.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 189 B

After

Width:  |  Height:  |  Size: 4.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 179 B

After

Width:  |  Height:  |  Size: 4.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 190 B

After

Width:  |  Height:  |  Size: 4.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 245 B

After

Width:  |  Height:  |  Size: 4.7 KiB

View File

@@ -1,7 +1,7 @@
{
"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)",
"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)",
"size": {
"x": 32,
"y": 32

Binary file not shown.

After

Width:  |  Height:  |  Size: 435 B

View File

@@ -1 +1,352 @@
{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/tgstation/tgstation at 0d9c9a8233dfc3fc55edc538955a761a6328bee0, generic, service, command, science, security, medical, supply, and engineering taken from shiptest at https://github.com/shiptest-ss13/Shiptest/pull/1473, additional sprites created by EmoGarbage404", "states": [{"name": "abductor_mod"}, {"name": "airalarm_electronics"}, {"name": "ash_plating"}, {"name": "beaker_holder"}, {"name": "blank_mod"}, {"name": "bluespacearray"}, {"name": "boris"}, {"name": "boris_recharging", "delays": [[1.0, 1.0]]}, {"name": "card_mini"}, {"name": "card_mod"}, {"name": "cargodisk"}, {"name": "cart_connector"}, {"name": "cddrive"}, {"name": "cell"}, {"name": "cell_con"}, {"name": "cell_con_micro"}, {"name": "cell_micro"}, {"name": "cell_mini"}, {"name": "charger_APC"}, {"name": "charger_lambda"}, {"name": "charger_pda"}, {"name": "charger_wire"}, {"name": "clock_mod", "delays": [[0.6, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "command"}, {"name": "cpu"}, {"name": "cpu_adv"}, {"name": "cpu_command"}, {"name": "cpu_engineering"}, {"name": "cpu_medical"}, {"name": "cpu_science"}, {"name": "cpu_security"}, {"name": "cpu_service"}, {"name": "cpu_super", "delays": [[0.1, 0.1]]}, {"name": "cpu_supply"}, {"name": "cpuboard"}, {"name": "cpuboard_adv"}, {"name": "cpuboard_super", "delays": [[0.1, 0.1]]}, {"name": "cyborg_upgrade"}, {"name": "cyborg_upgrade1"}, {"name": "cyborg_upgrade2"}, {"name": "cyborg_upgrade3"}, {"name": "cyborg_upgrade4"}, {"name": "cyborg_upgrade5"}, {"name": "datadisk_base"}, {"name": "datadisk_gene", "delays": [[0.1, 0.1, 0.1]]}, {"name": "datadisk_encrypted", "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "datadisk_hydro", "delays": [[0.1, 0.1, 0.1]]}, {"name": "datadisk_label"}, {"name": "depositbox"}, {"name": "door_electronics"}, {"name": "engineering"}, {"name": "flopdrive"}, {"name": "generic"}, {"name": "harddisk"}, {"name": "harddisk_micro"}, {"name": "harddisk_mini"}, {"name": "holodisk", "delays": [[0.1, 0.1]]}, {"name": "id_mod"}, {"name": "mainboard"}, {"name": "mcontroller"}, {"name": "medical"}, {"name": "net_wired"}, {"name": "power_mod"}, {"name": "printer"}, {"name": "printer_mini"}, {"name": "prizevendor"}, {"name": "radio"}, {"name": "radio_micro"}, {"name": "radio_mini"}, {"name": "ram"}, {"name": "rndmajordisk"}, {"name": "science"}, {"name": "secmodschematic"}, {"name": "security"}, {"name": "selfrepair_off"}, {"name": "selfrepair_on", "delays": [[0.1, 0.1, 0.1, 0.1]]}, {"name": "service"}, {"name": "servo"}, {"name": "ssd"}, {"name": "ssd_large"}, {"name": "ssd_micro"}, {"name": "ssd_mini"}, {"name": "std_mod"}, {"name": "supply"}]}
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from https://github.com/tgstation/tgstation at 0d9c9a8233dfc3fc55edc538955a761a6328bee0, generic, service, command, science, security, medical, supply, and engineering taken from shiptest at https://github.com/shiptest-ss13/Shiptest/pull/1473, additional sprites created by EmoGarbage404, cpu_syndicate sprite derived from previous examples and created by Alpaccalypse at https://github.com/space-wizards/space-station-14/pull/34104",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "abductor_mod"
},
{
"name": "airalarm_electronics"
},
{
"name": "ash_plating"
},
{
"name": "beaker_holder"
},
{
"name": "blank_mod"
},
{
"name": "bluespacearray"
},
{
"name": "boris"
},
{
"name": "boris_recharging",
"delays": [
[
1.0,
1.0
]
]
},
{
"name": "card_mini"
},
{
"name": "card_mod"
},
{
"name": "cargodisk"
},
{
"name": "cart_connector"
},
{
"name": "cddrive"
},
{
"name": "cell"
},
{
"name": "cell_con"
},
{
"name": "cell_con_micro"
},
{
"name": "cell_micro"
},
{
"name": "cell_mini"
},
{
"name": "charger_APC"
},
{
"name": "charger_lambda"
},
{
"name": "charger_pda"
},
{
"name": "charger_wire"
},
{
"name": "clock_mod",
"delays": [
[
0.6,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
]
]
},
{
"name": "command"
},
{
"name": "cpu"
},
{
"name": "cpu_adv"
},
{
"name": "cpu_command"
},
{
"name": "cpu_engineering"
},
{
"name": "cpu_medical"
},
{
"name": "cpu_science"
},
{
"name": "cpu_security"
},
{
"name": "cpu_service"
},
{
"name": "cpu_super",
"delays": [
[
0.1,
0.1
]
]
},
{
"name": "cpu_supply"
},
{
"name": "cpu_syndicate"
},
{
"name": "cpuboard"
},
{
"name": "cpuboard_adv"
},
{
"name": "cpuboard_super",
"delays": [
[
0.1,
0.1
]
]
},
{
"name": "cyborg_upgrade"
},
{
"name": "cyborg_upgrade1"
},
{
"name": "cyborg_upgrade2"
},
{
"name": "cyborg_upgrade3"
},
{
"name": "cyborg_upgrade4"
},
{
"name": "cyborg_upgrade5"
},
{
"name": "datadisk_base"
},
{
"name": "datadisk_gene",
"delays": [
[
0.1,
0.1,
0.1
]
]
},
{
"name": "datadisk_encrypted",
"delays": [
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
]
]
},
{
"name": "datadisk_hydro",
"delays": [
[
0.1,
0.1,
0.1
]
]
},
{
"name": "datadisk_label"
},
{
"name": "depositbox"
},
{
"name": "door_electronics"
},
{
"name": "engineering"
},
{
"name": "flopdrive"
},
{
"name": "generic"
},
{
"name": "harddisk"
},
{
"name": "harddisk_micro"
},
{
"name": "harddisk_mini"
},
{
"name": "holodisk",
"delays": [
[
0.1,
0.1
]
]
},
{
"name": "id_mod"
},
{
"name": "mainboard"
},
{
"name": "mcontroller"
},
{
"name": "medical"
},
{
"name": "net_wired"
},
{
"name": "power_mod"
},
{
"name": "printer"
},
{
"name": "printer_mini"
},
{
"name": "prizevendor"
},
{
"name": "radio"
},
{
"name": "radio_micro"
},
{
"name": "radio_mini"
},
{
"name": "ram"
},
{
"name": "rndmajordisk"
},
{
"name": "science"
},
{
"name": "secmodschematic"
},
{
"name": "security"
},
{
"name": "selfrepair_off"
},
{
"name": "selfrepair_on",
"delays": [
[
0.1,
0.1,
0.1,
0.1
]
]
},
{
"name": "service"
},
{
"name": "servo"
},
{
"name": "ssd"
},
{
"name": "ssd_large"
},
{
"name": "ssd_micro"
},
{
"name": "ssd_mini"
},
{
"name": "std_mod"
},
{
"name": "supply"
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

View File

@@ -0,0 +1,31 @@
{
"version": 1,
"license": "CC-BY-SA-4.0",
"copyright": "The art belongs to Woods#1999 on discord",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "broken"
},
{
"name": "off"
},
{
"name": "panel"
},
{
"name": "normal-unshaded",
"delays": [
[
1.5,
0.1,
1.5,
0.1
]
]
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 912 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 190 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.4 KiB

View File

@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/a879151ef04192ae2a791278ee882c1bce7c5062, cola and any sprite modified by potato1234x (github) for ss14",
"copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/a879151ef04192ae2a791278ee882c1bce7c5062, cola and any sprite modified by potato1234x (github) for ss14, clothing by Southbridge_fur (github) for SS14",
"size": {
"x": 32,
"y": 32
@@ -15,6 +15,9 @@
},
{
"name": "any"
},
{
"name": "clothing"
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 511 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 436 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 888 B

View File

@@ -0,0 +1,56 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Created by Alpaccalypse for SS14",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "normal-unshaded",
"delays": [
[
2.5,
0.1,
3.4,
0.1
]
]
},
{
"name": "broken"
},
{
"name": "normal"
},
{
"name": "deny-unshaded",
"delays": [
[
0.1,
0.1,
0.1
]
]
},
{
"name": "eject-unshaded",
"delays": [
[
0.5,
0.1,
1.0,
0.1,
0.1
]
]
},
{
"name": "off"
},
{
"name": "panel"
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 532 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 496 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 481 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 150 B

View File

@@ -5,7 +5,7 @@
"y":32
},
"license":"CC-BY-SA-3.0",
"copyright":"Taken from https://github.com/tgstation/tgstation at commit 57cd1d59ca019dd0e7811ac451f295f818e573da. Signal valve is a digital valve modified by deltanedas.",
"copyright":"Taken from https://github.com/tgstation/tgstation at commit 57cd1d59ca019dd0e7811ac451f295f818e573da. Signal valve is a digital valve modified by deltanedas. Manual valve modified by Deerstop at https://github.com/space-wizards/space-station-14/pull/34378",
"states":[
{
"name":"pumpDigitalValve",

Binary file not shown.

Before

Width:  |  Height:  |  Size: 489 B

After

Width:  |  Height:  |  Size: 540 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 493 B

After

Width:  |  Height:  |  Size: 543 B

View File

@@ -9,219 +9,63 @@
"states": [
{
"name": "condisposal",
"directions": 1,
"delays": [
[
1.0
]
]
"directions": 1
},
{
"name": "conmailing",
"directions": 1,
"delays": [
[
1.0
]
]
"directions": 1
},
{
"name": "conpipe-c",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
"directions": 4
},
{
"name": "conpipe-j1",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
"directions": 4
},
{
"name": "conpipe-j1s",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
"directions": 4
},
{
"name": "conpipe-j2",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
"directions": 4
},
{
"name": "conpipe-j2s",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
"directions": 4
},
{
"name": "conpipe-s",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
"directions": 4
},
{
"name": "conpipe-t",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
"directions": 4
},
{
"name": "conpipe-tagger",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
"directions": 4
},
{
"name": "conpipe-y",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
"directions": 4
},
{
"name": "disposal",
"directions": 1,
"delays": [
[
1.0
]
]
"directions": 1
},
{
"name": "mailing",
"directions": 1,
"delays": [
[
1.0
]
]
"directions": 1
},
{
"name": "disposal-charging",
"directions": 1,
"delays": [
[
1.0
]
]
"directions": 1
},
{
"name": "mailing-charging",
"directions": 1,
"delays": [
[
1.0
]
]
"directions": 1
},
{
"name": "disposal-flush",
@@ -285,48 +129,19 @@
},
{
"name": "dispover-handle",
"directions": 1,
"delays": [
[
1.0
]
]
"directions": 1
},
{
"name": "mailover-handle",
"directions": 1,
"delays": [
[
1.0
]
]
"directions": 1
},
{
"name": "dispover-ready",
"directions": 1,
"delays": [
[
1.0
]
]
"directions": 1
},
{
"name": "intake",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
"directions": 4
},
{
"name": "intake-closing",
@@ -376,21 +191,7 @@
},
{
"name": "outlet",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
"directions": 4
},
{
"name": "outlet-open",
@@ -440,471 +241,107 @@
},
{
"name": "pipe-b",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
"directions": 4
},
{
"name": "pipe-bf",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
"directions": 4
},
{
"name": "pipe-c",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
"directions": 4
},
{
"name": "pipe-cf",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
"directions": 4
},
{
"name": "pipe-d",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
"directions": 4
},
{
"name": "pipe-j1",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
"directions": 4
},
{
"name": "pipe-j1f",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
"directions": 4
},
{
"name": "pipe-j1s",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
"directions": 4
},
{
"name": "pipe-j1sf",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
"directions": 4
},
{
"name": "pipe-j2",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
"directions": 4
},
{
"name": "pipe-j2f",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
"directions": 4
},
{
"name": "pipe-j2s",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
"directions": 4
},
{
"name": "pipe-j2sf",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
"directions": 4
},
{
"name": "pipe-s",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
"directions": 4
},
{
"name": "pipe-sf",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
"directions": 4
},
{
"name": "pipe-t",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
"directions": 4
},
{
"name": "pipe-tagger",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
"directions": 4
},
{
"name": "pipe-tagger-partial",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
"directions": 4
},
{
"name": "pipe-tf",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
"directions": 4
},
{
"name": "pipe-u",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
"directions": 4
},
{
"name": "pipe-y",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
"directions": 4
},
{
"name": "pipe-yf",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
"directions": 4
},
{
"name": "signal-router",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
"directions": 4
},
{
"name": "signal-router-free",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
"directions": 4
},
{
"name": "signal-router-flipped",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
"directions": 4
},
{
"name": "signal-router-flipped-free",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
"directions": 4
}
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.9 KiB

After

Width:  |  Height:  |  Size: 5.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.5 KiB

After

Width:  |  Height:  |  Size: 5.9 KiB

View File

@@ -1 +1 @@
{"version":1,"size":{"x":32,"y":32},"copyright":"Taken from https://github.com/vgstation-coders/vgstation13/blob/8eef5a676f66551bd0fb40d506486a6b3b2b0f1a/icons/obj/singularity.dmi","license":"CC-BY-SA-3.0","states":[{"name":"singularity_1","directions":1,"delays":[[0.1,0.1,0.1,0.1,0.1,0.1,0.1,0.1]]}]}
{"version":1,"size":{"x":32,"y":32},"copyright":"Taken from https://github.com/vgstation-coders/vgstation13/blob/8eef5a676f66551bd0fb40d506486a6b3b2b0f1a/icons/obj/singularity.dmi","license":"CC-BY-SA-3.0","metaAtlas": false,"states":[{"name":"singularity_1","directions":1,"delays":[[0.1,0.1,0.1,0.1,0.1,0.1,0.1,0.1]]}]}

View File

@@ -1 +1 @@
{"version":1,"size":{"x":96,"y":96},"copyright":"Taken from https://github.com/vgstation-coders/vgstation13/blob/8eef5a676f66551bd0fb40d506486a6b3b2b0f1a/icons/effects/96x96.dmi","license":"CC-BY-SA-3.0","states":[{"name":"singularity_2","directions":1,"delays":[[0.1,0.1,0.1,0.1,0.1,0.1,0.1,0.1]]}]}
{"version":1,"size":{"x":96,"y":96},"copyright":"Taken from https://github.com/vgstation-coders/vgstation13/blob/8eef5a676f66551bd0fb40d506486a6b3b2b0f1a/icons/effects/96x96.dmi","license":"CC-BY-SA-3.0","metaAtlas": false,"states":[{"name":"singularity_2","directions":1,"delays":[[0.1,0.1,0.1,0.1,0.1,0.1,0.1,0.1]]}]}

View File

@@ -1 +1 @@
{"version":1,"size":{"x":160,"y":160},"copyright":"Taken from https://github.com/vgstation-coders/vgstation13/blob/8eef5a676f66551bd0fb40d506486a6b3b2b0f1a/icons/effects/160x160.dmi","license":"CC-BY-SA-3.0","states":[{"name":"singularity_3","directions":1,"delays":[[0.1,0.1,0.1,0.1,0.1,0.1,0.1,0.1]]}]}
{"version":1,"size":{"x":160,"y":160},"copyright":"Taken from https://github.com/vgstation-coders/vgstation13/blob/8eef5a676f66551bd0fb40d506486a6b3b2b0f1a/icons/effects/160x160.dmi","license":"CC-BY-SA-3.0","metaAtlas": false,"states":[{"name":"singularity_3","directions":1,"delays":[[0.1,0.1,0.1,0.1,0.1,0.1,0.1,0.1]]}]}

View File

@@ -1 +1 @@
{"version":1,"size":{"x":224,"y":224},"copyright":"Taken from https://github.com/vgstation-coders/vgstation13/blob/8eef5a676f66551bd0fb40d506486a6b3b2b0f1a/icons/effects/224x224.dmi","license":"CC-BY-SA-3.0","states":[{"name":"singularity_4","directions":1,"delays":[[0.1,0.1,0.1,0.1,0.1,0.1,0.1,0.1]]}]}
{"version":1,"size":{"x":224,"y":224},"copyright":"Taken from https://github.com/vgstation-coders/vgstation13/blob/8eef5a676f66551bd0fb40d506486a6b3b2b0f1a/icons/effects/224x224.dmi","license":"CC-BY-SA-3.0","metaAtlas": false,"states":[{"name":"singularity_4","directions":1,"delays":[[0.1,0.1,0.1,0.1,0.1,0.1,0.1,0.1]]}]}

View File

@@ -1 +1 @@
{"version":1,"size":{"x":288,"y":288},"copyright":"Taken from https://github.com/vgstation-coders/vgstation13/blob/8eef5a676f66551bd0fb40d506486a6b3b2b0f1a/icons/effects/288x288.dmi","license":"CC-BY-SA-3.0","states":[{"name":"singularity_5","directions":1,"delays":[[0.1,0.1,0.1,0.1,0.1,0.1,0.1,0.1]]}]}
{"version":1,"size":{"x":288,"y":288},"copyright":"Taken from https://github.com/vgstation-coders/vgstation13/blob/8eef5a676f66551bd0fb40d506486a6b3b2b0f1a/icons/effects/288x288.dmi","license":"CC-BY-SA-3.0","metaAtlas": false,"states":[{"name":"singularity_5","directions":1,"delays":[[0.1,0.1,0.1,0.1,0.1,0.1,0.1,0.1]]}]}

View File

@@ -1 +1 @@
{"version":1,"size":{"x":352,"y":352},"copyright":"Taken from https://github.com/vgstation-coders/vgstation13/blob/8eef5a676f66551bd0fb40d506486a6b3b2b0f1a/icons/effects/352x352.dmi","license":"CC-BY-SA-3.0","states":[{"name":"singularity_6","directions":1,"delays":[[0.1,0.1,0.1,0.1,0.1,0.1,0.1,0.1,0.1,0.1,0.1,0.1,0.1,0.1,0.1,0.1]]}]}
{"version":1,"size":{"x":352,"y":352},"copyright":"Taken from https://github.com/vgstation-coders/vgstation13/blob/8eef5a676f66551bd0fb40d506486a6b3b2b0f1a/icons/effects/352x352.dmi","license":"CC-BY-SA-3.0","metaAtlas": false,"states":[{"name":"singularity_6","directions":1,"delays":[[0.1,0.1,0.1,0.1,0.1,0.1,0.1,0.1,0.1,0.1,0.1,0.1,0.1,0.1,0.1,0.1]]}]}

View File

@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from at commit https://github.com/tgstation/tgstation/commit/f01de25493e2bd2706ef9b0303cb0d7b5e3e471b. poster52_contraband, poster53_contraband and poster54_contraband taken from https://github.com/vgstation-coders/vgstation13/blob/435ed5f2a7926e91cc31abac3a0d47d7e9ad7ed4/icons/obj/posters.dmi. originmap, poster55_contraband, poster56_contraband, poster57_contraband and poster39_legit by discord brainfood#7460, poster63_contraband by discord foboscheshir_, poster52_legit by SlamBamActionman, poster53_legit and the original version by @RCOI on discord.",
"copyright": "Taken from at commit https://github.com/tgstation/tgstation/commit/f01de25493e2bd2706ef9b0303cb0d7b5e3e471b. poster52_contraband, poster53_contraband and poster54_contraband taken from https://github.com/vgstation-coders/vgstation13/blob/435ed5f2a7926e91cc31abac3a0d47d7e9ad7ed4/icons/obj/posters.dmi. originmap, poster55_contraband, poster56_contraband, poster57_contraband and poster39_legit by discord brainfood#7460, poster63_contraband by discord foboscheshir_, poster52_legit by SlamBamActionman, poster53_legit and the original version by @RCOI on discord, modified by Spessmann.",
"size": {
"x": 32,
"y": 32

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 423 B

View File

@@ -5,7 +5,7 @@
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit 4e0bbe682d0a00192d24708fdb7031008aa03f18 and bee station at commit https://github.com/BeeStation/BeeStation-Hornet/commit/13dd5ac712385642574138f6d7b30eea7c2fab9c, Job signs by EmoGarbage404 (github) with inspiration from yogstation and tgstation, 'direction_exam' and 'direction_icu' made by rosieposieeee (github), 'direction_atmos' made by SlamBamActionman. 'vox' based on sprites taken from vgstation13 at https://github.com/vgstation-coders/vgstation13/blob/e7f005f8b8d3f7d89cbee3b87f76c23f9e951c27/icons/obj/decals.dmi",
"copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit 4e0bbe682d0a00192d24708fdb7031008aa03f18 and bee station at commit https://github.com/BeeStation/BeeStation-Hornet/commit/13dd5ac712385642574138f6d7b30eea7c2fab9c, Job signs by EmoGarbage404 (github) with inspiration from yogstation and tgstation, 'direction_exam' and 'direction_icu' made by rosieposieeee (github), 'direction_atmos' made by SlamBamActionman, 'vox' based on sprites taken from vgstation13 at https://github.com/vgstation-coders/vgstation13/blob/e7f005f8b8d3f7d89cbee3b87f76c23f9e951c27/icons/obj/decals.dmi, 'direction_pods' derived by WarPigeon from existing directional signs.",
"states": [
{
"name": "ai"
@@ -218,6 +218,10 @@
"name": "direction_wash",
"directions": 4
},
{
"name": "direction_pods",
"directions": 4
},
{
"name": "dock"
},

View File

@@ -27,15 +27,6 @@
},
{
"name": "cheese_wheel"
},
{
"name": "plate1"
},
{
"name": "plate2"
},
{
"name": "plate3"
}
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 214 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 216 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 212 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 446 B

After

Width:  |  Height:  |  Size: 488 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 297 B

View File

@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CLA",
"copyright": "bun_cooked bun_cooked_slice_bottom bun_cooked_slice_top dough_medium Created by Artista.rar, bread_cooked dough_large dough_medium_flat created by TheShuEd",
"copyright": "bun_cooked bun_cooked_slice_bottom bun_cooked_slice_top dough_medium Created by Artista.rar, bread_cooked by perzonaz (discord) & resprited by omsoyk dough_large dough_medium_flat created by TheShuEd",
"size": {
"x": 32,
"y": 32
@@ -10,6 +10,9 @@
{
"name": "bread_cooked"
},
{
"name": "bread_slice"
},
{
"name": "bun_cooked"
},

Binary file not shown.

Before

Width:  |  Height:  |  Size: 390 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 371 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 141 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 140 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 140 B

Some files were not shown because too many files have changed in this diff Show More