]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Added Tourniquets to stop bleeds (#23198)
authorPoorMansDreams <150595537+PoorMansDreams@users.noreply.github.com>
Sat, 10 Feb 2024 01:57:42 +0000 (17:57 -0800)
committerGitHub <noreply@github.com>
Sat, 10 Feb 2024 01:57:42 +0000 (17:57 -0800)
* Fixed Error with RobustToolbox Edits. Removed the addition of secbelt tag from assault belt.

* Resprite of the monstrosity

* Resprite of the tourniquet NO LONGER PHALLUS SHAPED

* too bright, now darker and edgier

* Tourniquet resprite

* metajson yay

Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml
Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
Resources/Textures/Objects/Specific/Medical/medical.rsi/meta.json
Resources/Textures/Objects/Specific/Medical/medical.rsi/tourniquet.png [new file with mode: 0644]

index 695f7e98afc7cdcf1e0574499aa8aedffe18719d..b1152f42ab9d301bcf9570bad05c83edc548059c 100644 (file)
@@ -8,6 +8,7 @@
     ClusterBangFull: 2
     GrenadeStinger: 4
     Flash: 5
+    Tourniquet: 5
     FlashlightSeclite: 5
     ClothingEyesGlassesSunglasses: 2
     ClothingEyesHudSecurity: 2
index 0165557f83ce6bd0b13b8485a0eb70b8b6a7f048..6cf5f57c1b21824f9e969f25544e631823f2f3c5 100644 (file)
   components:
   - type: Stack
     lingering: true
-
+- type: entity
+  parent: BaseHealingItem
+  id: Tourniquet
+  name: tourniquet
+  description: Stops bleeding! Hopefully.
+  components:
+    - type: Tag
+      tags:
+        - SecBeltEquip
+    - type: Sprite
+      state: tourniquet
+    - type: Healing
+      damageContainers:
+        - Biological
+      damage:
+        groups:
+          Brute: 5 # Tourniquets HURT!
+        types:
+          Asphyxiation: 5 # Essentially Stopping all blood reaching a part of your body
+      bloodlossModifier: -10 # Tourniquets stop bleeding
+      delay: 0.5
+      healingBeginSound:
+        path: "/Audio/Items/Medical/brutepack_begin.ogg"
+      healingEndSound:
+        path: "/Audio/Items/Medical/brutepack_end.ogg"
+        
 - type: entity
   name: roll of gauze
   description: Some sterile gauze to wrap around bloody stumps.
index 79d08e485b9934bbf9d7c97ef468d52ba6514788..e4f039ada9b5d708d5f66c98f0c9feb16b140c09 100644 (file)
@@ -3,6 +3,7 @@
        "license": "CC-BY-SA-3.0",
   "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/740ff31a81313086cf16761f3677cf1e2ab46c93 and Taken from tgstation at https://github.com/tgstation/tgstation/blob/623290915c2292b56da11048deb62d758e1e3fb4/icons/obj/bloodpack.dmi, Blood pack redone by Ubaser",
   "copyright": "Taken from https://github.com/tgstation/tgstation/blob/a3568da5634e756d0849480104afda402c6f1c3c/icons/obj/medical/stack_medical.dmi",
+  "copyright": "Tourniquet Sprite by PoorMansDreams",
        "size": {
                "x": 32,
                "y": 32
@@ -25,6 +26,9 @@
                {
                        "name": "gauze"
                },
+        {
+            "name": "tourniquet"
+        },
                {
                        "name": "morphine"
                },
diff --git a/Resources/Textures/Objects/Specific/Medical/medical.rsi/tourniquet.png b/Resources/Textures/Objects/Specific/Medical/medical.rsi/tourniquet.png
new file mode 100644 (file)
index 0000000..fce355e
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/medical.rsi/tourniquet.png differ