]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Sentry turrets - Part 1: Art assets (#35025)
authorchromiumboy <50505512+chromiumboy@users.noreply.github.com>
Tue, 11 Feb 2025 06:25:30 +0000 (00:25 -0600)
committerGitHub <noreply@github.com>
Tue, 11 Feb 2025 06:25:30 +0000 (00:25 -0600)
* Initial commit

* Updated sprites

* Updated base.png and base_shadow.png

* Updated meta file

24 files changed:
Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi/heavylaser.png
Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi/heavylaser_flash.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi/meta.json
Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi/omnilaser.png
Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi/omnilaser_flash.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Turrets/sentry_turret.rsi/base.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Turrets/sentry_turret.rsi/base_shadow.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Turrets/sentry_turret.rsi/cover_closed.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Turrets/sentry_turret.rsi/cover_closing.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Turrets/sentry_turret.rsi/cover_light_on.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Turrets/sentry_turret.rsi/cover_open.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Turrets/sentry_turret.rsi/cover_opening.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Turrets/sentry_turret.rsi/destroyed.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Turrets/sentry_turret.rsi/lethal.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Turrets/sentry_turret.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Turrets/sentry_turret.rsi/panel.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Turrets/sentry_turret.rsi/stun.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Turrets/sentry_turret.rsi/support.png [new file with mode: 0644]
Resources/Textures/Structures/Wallmounts/turret_controls.rsi/base.png [new file with mode: 0644]
Resources/Textures/Structures/Wallmounts/turret_controls.rsi/lethal.png [new file with mode: 0644]
Resources/Textures/Structures/Wallmounts/turret_controls.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Structures/Wallmounts/turret_controls.rsi/safe.png [new file with mode: 0644]
Resources/Textures/Structures/Wallmounts/turret_controls.rsi/stun.png [new file with mode: 0644]
Resources/Textures/Structures/Wallmounts/turret_controls.rsi/wires.png [new file with mode: 0644]

index 4db201c77cb1642fc0edc27a878319a164e6d7ed..8d84a0e82860c23a20fbeb595f3d3f1bd0e65fb2 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi/heavylaser.png and b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi/heavylaser.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi/heavylaser_flash.png b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi/heavylaser_flash.png
new file mode 100644 (file)
index 0000000..89e765b
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi/heavylaser_flash.png differ
index 19d8b15dcc2ab2e6403e21dccda5f52d04d3d078..d7b6a34f54e7322feeecd3e0f930531f67bc71b9 100644 (file)
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "https://github.com/tgstation/tgstation/tree/88d7dbfc105fbf40284d7b7c4587f8d23c0ac3ac",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/tree/88d7dbfc105fbf40284d7b7c4587f8d23c0ac3ac, modified by chromiumboy.",
   "size": {
     "x": 32,
     "y": 32
@@ -10,6 +10,9 @@
     {
       "name": "omnilaser"
     },
+    {
+      "name": "omnilaser_flash"
+    },
     {
       "name": "omnilaser_greyscale"
     },
@@ -49,6 +52,9 @@
     },
     {
       "name": "heavylaser"
+    },
+    {
+      "name": "heavylaser_flash"
     }
   ]
 }
\ No newline at end of file
index 34ddcc86ba5f7aa04c1a6bd99aa28a9d58f07e7c..94f0b18ca927b4d97a11f97e813736d35f9bf340 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi/omnilaser.png and b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi/omnilaser.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi/omnilaser_flash.png b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi/omnilaser_flash.png
new file mode 100644 (file)
index 0000000..4c00207
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi/omnilaser_flash.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Turrets/sentry_turret.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Turrets/sentry_turret.rsi/base.png
new file mode 100644 (file)
index 0000000..ebe0cac
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Turrets/sentry_turret.rsi/base.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Turrets/sentry_turret.rsi/base_shadow.png b/Resources/Textures/Objects/Weapons/Guns/Turrets/sentry_turret.rsi/base_shadow.png
new file mode 100644 (file)
index 0000000..1d432ab
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Turrets/sentry_turret.rsi/base_shadow.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Turrets/sentry_turret.rsi/cover_closed.png b/Resources/Textures/Objects/Weapons/Guns/Turrets/sentry_turret.rsi/cover_closed.png
new file mode 100644 (file)
index 0000000..e3fa8b0
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Turrets/sentry_turret.rsi/cover_closed.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Turrets/sentry_turret.rsi/cover_closing.png b/Resources/Textures/Objects/Weapons/Guns/Turrets/sentry_turret.rsi/cover_closing.png
new file mode 100644 (file)
index 0000000..60c3ee0
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Turrets/sentry_turret.rsi/cover_closing.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Turrets/sentry_turret.rsi/cover_light_on.png b/Resources/Textures/Objects/Weapons/Guns/Turrets/sentry_turret.rsi/cover_light_on.png
new file mode 100644 (file)
index 0000000..cec748c
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Turrets/sentry_turret.rsi/cover_light_on.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Turrets/sentry_turret.rsi/cover_open.png b/Resources/Textures/Objects/Weapons/Guns/Turrets/sentry_turret.rsi/cover_open.png
new file mode 100644 (file)
index 0000000..475d55b
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Turrets/sentry_turret.rsi/cover_open.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Turrets/sentry_turret.rsi/cover_opening.png b/Resources/Textures/Objects/Weapons/Guns/Turrets/sentry_turret.rsi/cover_opening.png
new file mode 100644 (file)
index 0000000..610a99e
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Turrets/sentry_turret.rsi/cover_opening.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Turrets/sentry_turret.rsi/destroyed.png b/Resources/Textures/Objects/Weapons/Guns/Turrets/sentry_turret.rsi/destroyed.png
new file mode 100644 (file)
index 0000000..b08a630
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Turrets/sentry_turret.rsi/destroyed.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Turrets/sentry_turret.rsi/lethal.png b/Resources/Textures/Objects/Weapons/Guns/Turrets/sentry_turret.rsi/lethal.png
new file mode 100644 (file)
index 0000000..3a43309
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Turrets/sentry_turret.rsi/lethal.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Turrets/sentry_turret.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Turrets/sentry_turret.rsi/meta.json
new file mode 100644 (file)
index 0000000..bb15156
--- /dev/null
@@ -0,0 +1,94 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/blob/04b0e91bac8989d27a504124a0f636b41098d016/icons/obj/turrets.dmi. Modified by chromiumboy.",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "base",
+      "directions": 8
+    },
+    {
+      "name": "base_shadow",
+      "directions": 8
+    },
+    {
+      "name": "stun",
+      "directions": 8
+    },
+    {
+      "name": "lethal",
+      "directions": 8
+    },
+    {
+      "name": "destroyed",
+      "directions": 8
+    },
+    {
+      "name": "support"
+    },
+    {
+      "name": "cover_closed"
+    },
+    {
+      "name": "cover_open"
+    },
+    {
+      "name": "cover_opening",
+      "delays": [
+        [
+          0.07,
+          0.07,
+          0.07,
+          0.07,
+          0.07,
+          0.07,
+          0.07,
+          0.07,
+          0.07,
+          0.07,
+          0.07,
+          0.07,
+          0.07,
+          0.07,
+          0.07,
+          0.07,
+          0.07
+        ]
+      ]
+    },
+    {
+      "name": "cover_closing",
+      "delays": [
+        [
+          0.07,
+          0.07,
+          0.07,
+          0.07,
+          0.07,
+          0.07,
+          0.07,
+          0.07,
+          0.07,
+          0.07,
+          0.07,
+          0.07,
+          0.07,
+          0.07,
+          0.07,
+          0.07,
+          0.07
+        ]
+      ]
+    },
+    {
+      "name": "cover_light_on"
+    },
+    {
+      "name": "panel"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Objects/Weapons/Guns/Turrets/sentry_turret.rsi/panel.png b/Resources/Textures/Objects/Weapons/Guns/Turrets/sentry_turret.rsi/panel.png
new file mode 100644 (file)
index 0000000..e1b36a2
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Turrets/sentry_turret.rsi/panel.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Turrets/sentry_turret.rsi/stun.png b/Resources/Textures/Objects/Weapons/Guns/Turrets/sentry_turret.rsi/stun.png
new file mode 100644 (file)
index 0000000..72ebd8d
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Turrets/sentry_turret.rsi/stun.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Turrets/sentry_turret.rsi/support.png b/Resources/Textures/Objects/Weapons/Guns/Turrets/sentry_turret.rsi/support.png
new file mode 100644 (file)
index 0000000..60da7a8
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Turrets/sentry_turret.rsi/support.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/turret_controls.rsi/base.png b/Resources/Textures/Structures/Wallmounts/turret_controls.rsi/base.png
new file mode 100644 (file)
index 0000000..da7b4e4
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/turret_controls.rsi/base.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/turret_controls.rsi/lethal.png b/Resources/Textures/Structures/Wallmounts/turret_controls.rsi/lethal.png
new file mode 100644 (file)
index 0000000..f204a4d
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/turret_controls.rsi/lethal.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/turret_controls.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/turret_controls.rsi/meta.json
new file mode 100644 (file)
index 0000000..7684d02
--- /dev/null
@@ -0,0 +1,44 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/blob/b4363f59f5feacbc48c29aea4eb7794ad358cd92/icons/obj/device.dmi. Modified by chromiumboy.",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "base"
+    },
+    {
+      "name": "safe",
+      "delays": [
+        [
+          0.2,
+          2.0
+        ]
+      ]
+    },
+    {
+      "name": "stun",
+      "delays": [
+        [
+          0.2,
+          1.0
+        ]
+      ]
+    },
+    {
+      "name": "lethal",
+      "delays": [
+        [
+          0.5,
+          0.5
+        ]
+      ]
+    },
+    {
+      "name": "wires"
+    }
+  ]
+}
diff --git a/Resources/Textures/Structures/Wallmounts/turret_controls.rsi/safe.png b/Resources/Textures/Structures/Wallmounts/turret_controls.rsi/safe.png
new file mode 100644 (file)
index 0000000..f47615f
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/turret_controls.rsi/safe.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/turret_controls.rsi/stun.png b/Resources/Textures/Structures/Wallmounts/turret_controls.rsi/stun.png
new file mode 100644 (file)
index 0000000..1ca04be
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/turret_controls.rsi/stun.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/turret_controls.rsi/wires.png b/Resources/Textures/Structures/Wallmounts/turret_controls.rsi/wires.png
new file mode 100644 (file)
index 0000000..27644f0
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/turret_controls.rsi/wires.png differ