]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Remove brigmedic hypospray (#15426)
authorNemanja <98561806+EmoGarbage404@users.noreply.github.com>
Sat, 15 Apr 2023 15:07:13 +0000 (11:07 -0400)
committerGitHub <noreply@github.com>
Sat, 15 Apr 2023 15:07:13 +0000 (01:07 +1000)
Resources/Prototypes/Catalog/Fills/Lockers/security.yml
Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
Resources/Textures/Objects/Specific/Medical/brigmedichypo.rsi/equipped-BELT.png [deleted file]
Resources/Textures/Objects/Specific/Medical/brigmedichypo.rsi/hypo.png [deleted file]
Resources/Textures/Objects/Specific/Medical/brigmedichypo.rsi/inhand-left.png [deleted file]
Resources/Textures/Objects/Specific/Medical/brigmedichypo.rsi/inhand-right.png [deleted file]
Resources/Textures/Objects/Specific/Medical/brigmedichypo.rsi/meta.json [deleted file]

index 0844fdbf0756ab7cf4a537afdae50fe778710453..bd90f7c6f64da26fc35df9dc903f90745129f905 100644 (file)
@@ -53,7 +53,6 @@
     contents:
       - id: Flash
       - id: WeaponDisabler
-      - id: BrigmedicHypo
       - id: ClothingOuterHardsuitBrigmed
       - id: EncryptionKeyMedical
       - id: BoxSterileMask
@@ -70,8 +69,6 @@
         prob: 0.3
       - id: MedkitBurnFilled
         prob: 0.7
-      - id: OmnizineChemistryBottle
-        prob: 0.1
 
 - type: entity
   id: LockerDetectiveFilled
index bc7108141de1a06abecf12af6866b4fbe6e730bc..41e6a8d0a75a0a22fd2c1b349af4a8fc7a86b0be 100644 (file)
     - id: Hypopen
     sound:
       path: /Audio/Effects/unwrap.ogg
-
-- type: entity
-  name: brigmedic hypospray
-  parent: BaseItem
-  description: An injector (most often) of medicines in liquid form, it has a small inscription on it "PROPERTY OF A BRIGMEDIC, HANDS OFF!"
-  id: BrigmedicHypo
-  components:
-  - type: Sprite
-    sprite: Objects/Specific/Medical/brigmedichypo.rsi
-    state: hypo
-  - type: Item
-    sprite: Objects/Specific/Medical/brigmedichypo.rsi
-  - type: SolutionContainerManager
-    solutions:
-      hypospray:
-        maxVol: 5
-  - type: RefillableSolution
-    solution: hypospray
-  - type: ExaminableSolution
-    solution: hypospray
-  - type: Hypospray
-  - type: UseDelay
-    delay: 2.5
-  - type: StaticPrice
-    price: 550
diff --git a/Resources/Textures/Objects/Specific/Medical/brigmedichypo.rsi/equipped-BELT.png b/Resources/Textures/Objects/Specific/Medical/brigmedichypo.rsi/equipped-BELT.png
deleted file mode 100644 (file)
index dab595c..0000000
Binary files a/Resources/Textures/Objects/Specific/Medical/brigmedichypo.rsi/equipped-BELT.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Specific/Medical/brigmedichypo.rsi/hypo.png b/Resources/Textures/Objects/Specific/Medical/brigmedichypo.rsi/hypo.png
deleted file mode 100644 (file)
index 071b9f0..0000000
Binary files a/Resources/Textures/Objects/Specific/Medical/brigmedichypo.rsi/hypo.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Specific/Medical/brigmedichypo.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Medical/brigmedichypo.rsi/inhand-left.png
deleted file mode 100644 (file)
index d8f2d29..0000000
Binary files a/Resources/Textures/Objects/Specific/Medical/brigmedichypo.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Specific/Medical/brigmedichypo.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Medical/brigmedichypo.rsi/inhand-right.png
deleted file mode 100644 (file)
index d8f2d29..0000000
Binary files a/Resources/Textures/Objects/Specific/Medical/brigmedichypo.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Specific/Medical/brigmedichypo.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/brigmedichypo.rsi/meta.json
deleted file mode 100644 (file)
index c06bee8..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from syndicate station from PR https://github.com/space-syndicate/space-station-14/pull/422, sprite modified by PuroSlavKing (Github)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "hypo"
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "equipped-BELT",
-      "directions": 4
-    }
-  ]
-}