Merge branch 'master' into air-alarm-fixup

Resources/Textures/Clothing/Head/Soft/qmsoft.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/Clothing/Head/Soft/qmsoft_flipped.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/Decals/ss14sign.rsi/meta.json

@@ -0,0 +1,32 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "tgstation at 606005645d3a14c4439e5ce14785650121b22678, modified by EmoGarbage404",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "ss14sign1"
+    },
+    {
+      "name": "ss14sign2"
+    },
+    {
+      "name": "ss14sign3"
+    },
+    {
+      "name": "ss14sign4"
+    },
+    {
+      "name": "ss14sign5"
+    },
+    {
+      "name": "ss14sign6"
+    },
+    {
+      "name": "ss14sign7"
+    }
+  ]
+}

Resources/Textures/Mobs/Aliens/Carps/holo.rsi/meta.json

@@ -11,7 +11,7 @@
       "name": "icon"
     },
     {
-      "name": "dead",
+      "name": "base_dead",
       "delays": [
         [
           0.1,

Resources/Textures/Mobs/Aliens/Carps/magic.rsi/meta.json

@@ -11,7 +11,7 @@
       "name": "icon"
     },
     {
-      "name": "dead"
+      "name": "base_dead"
     },
     {
       "name": "base",

Resources/Textures/Objects/Misc/module.rsi/meta.json

@@ -1 +1 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/tgstation/tgstation at 0d9c9a8233dfc3fc55edc538955a761a6328bee0", "states": [{"name": "abductor_mod", "delays": [[1.0]]}, {"name": "airalarm_electronics", "delays": [[1.0]]}, {"name": "ash_plating", "delays": [[1.0]]}, {"name": "beaker_holder", "delays": [[1.0]]}, {"name": "blank_mod", "delays": [[1.0]]}, {"name": "bluespacearray", "delays": [[1.0]]}, {"name": "boris", "delays": [[0.1, 0.1]]}, {"name": "boris_recharging", "delays": [[1.0, 1.0]]}, {"name": "card_mini", "delays": [[1.0]]}, {"name": "card_mod", "delays": [[1.0]]}, {"name": "cargodisk", "delays": [[1.0]]}, {"name": "cart_connector", "delays": [[1.0]]}, {"name": "cddrive", "delays": [[1.0]]}, {"name": "cell", "delays": [[1.0]]}, {"name": "cell_con", "delays": [[1.0]]}, {"name": "cell_con_micro", "delays": [[1.0]]}, {"name": "cell_micro", "delays": [[1.0]]}, {"name": "cell_mini", "delays": [[1.0]]}, {"name": "charger_APC", "delays": [[1.0]]}, {"name": "charger_lambda", "delays": [[1.0]]}, {"name": "charger_pda", "delays": [[1.0]]}, {"name": "charger_wire", "delays": [[1.0]]}, {"name": "clock_mod", "delays": [[0.6, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "command", "delays": [[1.0]]}, {"name": "cpu", "delays": [[1.0]]}, {"name": "cpu_adv", "delays": [[1.0]]}, {"name": "cpu_super", "delays": [[0.1, 0.1]]}, {"name": "cpuboard", "delays": [[1.0]]}, {"name": "cpuboard_adv", "delays": [[1.0]]}, {"name": "cpuboard_super", "delays": [[0.1, 0.1]]}, {"name": "cyborg_upgrade", "delays": [[1.0]]}, {"name": "cyborg_upgrade1", "delays": [[1.0]]}, {"name": "cyborg_upgrade2", "delays": [[1.0]]}, {"name": "cyborg_upgrade3", "delays": [[1.0]]}, {"name": "cyborg_upgrade4", "delays": [[1.0]]}, {"name": "cyborg_upgrade5", "delays": [[1.0]]}, {"name": "datadisk0", "delays": [[1.0]]}, {"name": "datadisk1", "delays": [[1.0]]}, {"name": "datadisk2", "delays": [[1.0]]}, {"name": "datadisk3", "delays": [[1.0]]}, {"name": "datadisk4", "delays": [[1.0]]}, {"name": "datadisk5", "delays": [[1.0]]}, {"name": "datadisk6", "delays": [[1.0]]}, {"name": "datadisk_gene", "delays": [[0.1, 0.1, 0.1]]}, {"name": "datadisk_hydro", "delays": [[0.1, 0.1, 0.1]]}, {"name": "depositbox", "delays": [[1.0]]}, {"name": "door_electronics", "delays": [[1.0]]}, {"name": "engineering", "delays": [[1.0]]}, {"name": "flopdrive", "delays": [[1.0]]}, {"name": "generic", "delays": [[1.0]]}, {"name": "harddisk", "delays": [[1.0]]}, {"name": "harddisk_micro", "delays": [[1.0]]}, {"name": "harddisk_mini", "delays": [[1.0]]}, {"name": "holodisk", "delays": [[0.1, 0.1]]}, {"name": "id_mod", "delays": [[1.0]]}, {"name": "mainboard", "delays": [[1.0]]}, {"name": "mcontroller", "delays": [[1.0]]}, {"name": "medical", "delays": [[1.0]]}, {"name": "net_wired", "delays": [[1.0]]}, {"name": "nucleardisk", "delays": [[0.1, 0.1]]}, {"name": "power_mod", "delays": [[1.0]]}, {"name": "printer", "delays": [[1.0]]}, {"name": "printer_mini", "delays": [[1.0]]}, {"name": "prizevendor", "delays": [[1.0]]}, {"name": "radio", "delays": [[1.0]]}, {"name": "radio_micro", "delays": [[1.0]]}, {"name": "radio_mini", "delays": [[1.0]]}, {"name": "ram", "delays": [[1.0]]}, {"name": "rndmajordisk", "delays": [[1.0]]}, {"name": "science", "delays": [[1.0]]}, {"name": "secmodschematic", "delays": [[1.0]]}, {"name": "security", "delays": [[1.0]]}, {"name": "selfrepair_off", "delays": [[1.0]]}, {"name": "selfrepair_on", "delays": [[0.1, 0.1, 0.1, 0.1]]}, {"name": "service", "delays": [[1.0]]}, {"name": "servo", "delays": [[1.0]]}, {"name": "ssd", "delays": [[1.0]]}, {"name": "ssd_large", "delays": [[1.0]]}, {"name": "ssd_micro", "delays": [[1.0]]}, {"name": "ssd_mini", "delays": [[1.0]]}, {"name": "std_mod", "delays": [[1.0]]}, {"name": "supply", "delays": [[1.0]]}]}
+{"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": "datadisk0"}, {"name": "datadisk1"}, {"name": "datadisk2"}, {"name": "datadisk3"}, {"name": "datadisk4"}, {"name": "datadisk5"}, {"name": "datadisk6"}, {"name": "datadisk_gene", "delays": [[0.1, 0.1, 0.1]]}, {"name": "datadisk_hydro", "delays": [[0.1, 0.1, 0.1]]}, {"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": "nucleardisk", "delays": [[0.1, 0.1]]}, {"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"}]}

Resources/Textures/Shaders/dim.swsl

@@ -0,0 +1,12 @@
+uniform highp float DAMAGE_AMOUNT;
+
+void fragment() {
+
+     // Higher exponent -> stronger blinding effect
+
+     // Gradually mixes between the texture mix and a full-white texture, causing the "blinding" effect
+     highp vec4 mixed = mix(vec4(1.0, 1.0, 1.0, 1.0), vec4(1.0, 1.0, 1.0, 1.0), DAMAGE_AMOUNT);
+
+     COLOR = vec4(mixed.rgb, DAMAGE_AMOUNT);
+}
+