Space Bear 2 (#14591)

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/bear.yml b/Resources/Prototypes/Entities/Mobs/NPCs/bear.yml
index eebc7b4037a6c84208e4f2ecc3fed40607f8ae6f..8b125fbd6ccd748b39f2da3f52b7c0318646325a 100644 (file)
--- a/Resources/Prototypes/Entities/Mobs/NPCs/bear.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/bear.yml
@@ -13,10 +13,14 @@
     - SimpleHostile
   - type: Sprite
     drawdepth: Mobs
+    netsync: false
+    sprite: Mobs/Animals/bear.rsi
     layers:
     - map: [ "enum.DamageStateVisualLayers.Base" ]
       state: bear
-      sprite: Mobs/Animals/bear.rsi
+    - map: [ "enum.DamageStateVisualLayers.BaseUnshaded" ]
+      state: glow
+      shader: unshaded
   - type: Fixtures
     fixtures:
     - shape:
@@ -27,6 +31,10 @@
       - MobMask
       layer:
       - MobLayer
+  - type: PointLight
+    radius: 1.2
+    energy: 2
+    color: "#4faffb"
   - type: MovementAlwaysTouching
   - type: MobState
     allowedStates:
@@ -43,6 +51,7 @@
     states:
       Alive:
         Base: bear
+        BaseUnshaded: glow
       Critical:
         Base: bear_dead
       Dead:

diff --git a/Resources/Prototypes/Entities/Objects/Materials/materials.yml b/Resources/Prototypes/Entities/Objects/Materials/materials.yml
index b3438c2dafeb1461b6c2d481e1da407de715434f..6d39dfce6f42e0fafdc7fafcc74a3781b2d4512d 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Materials/materials.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/materials.yml
@@ -151,16 +151,28 @@
   name: bear hide
   components:
   - type: Sprite
+    netsync: false
     sprite: Objects/Materials/materials.rsi
-    state: bearpelt
+    layers:
+    - map: [ "enum.DamageStateVisualLayers.Base" ]
+      state: bearpelt
+    - map: [ "enum.DamageStateVisualLayers.BaseUnshaded" ]
+      state: bearpelt_glow
+      shader: unshaded
   - type: Item
     sprite: Clothing/Head/Misc/hides.rsi
     heldPrefix: bear
   - type: Clothing
+    netsync: false
     sprite: Clothing/Head/Misc/hides.rsi
     equippedPrefix: bear
     slots:
       - HEAD
+  - type: PointLight
+    radius: 1.2
+    energy: 1.5
+    color: "#4faffb"
+    slots:
 
 - type: entity
   parent: MaterialBase

diff --git a/Resources/Textures/Clothing/Head/Misc/hides.rsi/bear-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Misc/hides.rsi/bear-equipped-HELMET.png
index ac74db1d7ab6577d0b4da87783586cf6d53b01c4..58946adabd0a3c7b46108f5d4a78778bfadef512 100644 (file)
Binary files a/Resources/Textures/Clothing/Head/Misc/hides.rsi/bear-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Misc/hides.rsi/bear-equipped-HELMET.png differ

diff --git a/Resources/Textures/Clothing/Head/Misc/hides.rsi/bear-inhand-left.png b/Resources/Textures/Clothing/Head/Misc/hides.rsi/bear-inhand-left.png
index a8c181cd785357178138dc8dd21b076de7747a5f..29eddfaf475125e40a38dc7a1aa3259f9cd7de73 100644 (file)
Binary files a/Resources/Textures/Clothing/Head/Misc/hides.rsi/bear-inhand-left.png and b/Resources/Textures/Clothing/Head/Misc/hides.rsi/bear-inhand-left.png differ

diff --git a/Resources/Textures/Clothing/Head/Misc/hides.rsi/bear-inhand-right.png b/Resources/Textures/Clothing/Head/Misc/hides.rsi/bear-inhand-right.png
index afe271106b9527ded14eba805d95009f9333187c..3e6a2c285ca77e1c52e5965d69ea74a0122e8a73 100644 (file)
Binary files a/Resources/Textures/Clothing/Head/Misc/hides.rsi/bear-inhand-right.png and b/Resources/Textures/Clothing/Head/Misc/hides.rsi/bear-inhand-right.png differ

diff --git a/Resources/Textures/Clothing/Head/Misc/hides.rsi/meta.json b/Resources/Textures/Clothing/Head/Misc/hides.rsi/meta.json
index 8ed6b60c1fce635b95c536c485d5c16db97709fa..b58f55cf0562a58f9c463c8b40f0f438f7c67e57 100644 (file)
--- a/Resources/Textures/Clothing/Head/Misc/hides.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Misc/hides.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e , bear pelt remade by Alekshhh",
   "size": {
     "x": 32,
     "y": 32
@@ -9,7 +9,33 @@
   "states": [
     {
       "name": "bear-equipped-HELMET",
-      "directions": 4
+      "directions": 4,
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ]
+      ]
     },
     {
       "name": "bear-inhand-left",

diff --git a/Resources/Textures/Mobs/Animals/bear.rsi/glow.png b/Resources/Textures/Mobs/Animals/bear.rsi/glow.png
new file mode 100644 (file)
index 0000000..8de394e
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/bear.rsi/glow.png differ

diff --git a/Resources/Textures/Mobs/Animals/bear.rsi/meta.json b/Resources/Textures/Mobs/Animals/bear.rsi/meta.json
index f42435e4f28d35c8431f975a1e4032f717b8e46b..73c53d7d89d97c8fc30e3ecdf3503d4d45e44cc9 100644 (file)
--- a/Resources/Textures/Mobs/Animals/bear.rsi/meta.json
+++ b/Resources/Textures/Mobs/Animals/bear.rsi/meta.json
@@ -11,6 +11,36 @@
       "name": "bear",
       "directions": 4
     },
+    {
+      "name": "glow",
+      "directions": 4,
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ]
+      ]
+    },
     {
       "name": "bear_dead"
     }

diff --git a/Resources/Textures/Objects/Materials/materials.rsi/bearpelt.png b/Resources/Textures/Objects/Materials/materials.rsi/bearpelt.png
index 3f6772abfce2639191023b857a2671c2f260db94..d78c72da0df499b542ad8ad025603036db66b638 100644 (file)
Binary files a/Resources/Textures/Objects/Materials/materials.rsi/bearpelt.png and b/Resources/Textures/Objects/Materials/materials.rsi/bearpelt.png differ

diff --git a/Resources/Textures/Objects/Materials/materials.rsi/bearpelt_glow.png b/Resources/Textures/Objects/Materials/materials.rsi/bearpelt_glow.png
new file mode 100644 (file)
index 0000000..9fe7db2
Binary files /dev/null and b/Resources/Textures/Objects/Materials/materials.rsi/bearpelt_glow.png differ

diff --git a/Resources/Textures/Objects/Materials/materials.rsi/meta.json b/Resources/Textures/Objects/Materials/materials.rsi/meta.json
index 354aa4c9b04da8cfe5f5a054a84e8c29090e8ac6..9ce14001b7299a06c8f2a1b476d64ebbefcdc36d 100644 (file)
--- a/Resources/Textures/Objects/Materials/materials.rsi/meta.json
+++ b/Resources/Textures/Objects/Materials/materials.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 , bear pelt remade by Alekshhh",
   "size": {
     "x": 32,
     "y": 32
@@ -19,6 +19,17 @@
     {
       "name": "bearpelt"
     },
+    {
+      "name": "bearpelt_glow",
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ]
+      ]
+    },
     {
       "name": "cathide"
     },