From ca4c523635a4e223afed4336d6e9825a20b60c13 Mon Sep 17 00:00:00 2001 From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Date: Sat, 15 Apr 2023 11:07:13 -0400 Subject: [PATCH] Remove brigmedic hypospray (#15426) --- .../Catalog/Fills/Lockers/security.yml | 3 -- .../Objects/Specific/Medical/hypospray.yml | 25 ----------------- .../brigmedichypo.rsi/equipped-BELT.png | Bin 570 -> 0 bytes .../Medical/brigmedichypo.rsi/hypo.png | Bin 480 -> 0 bytes .../Medical/brigmedichypo.rsi/inhand-left.png | Bin 513 -> 0 bytes .../brigmedichypo.rsi/inhand-right.png | Bin 513 -> 0 bytes .../Medical/brigmedichypo.rsi/meta.json | 26 ------------------ 7 files changed, 54 deletions(-) delete mode 100644 Resources/Textures/Objects/Specific/Medical/brigmedichypo.rsi/equipped-BELT.png delete mode 100644 Resources/Textures/Objects/Specific/Medical/brigmedichypo.rsi/hypo.png delete mode 100644 Resources/Textures/Objects/Specific/Medical/brigmedichypo.rsi/inhand-left.png delete mode 100644 Resources/Textures/Objects/Specific/Medical/brigmedichypo.rsi/inhand-right.png delete mode 100644 Resources/Textures/Objects/Specific/Medical/brigmedichypo.rsi/meta.json diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml index 0844fdbf07..bd90f7c6f6 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml @@ -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 diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml index bc7108141d..41e6a8d0a7 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml @@ -264,28 +264,3 @@ - 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 index dab595ca54dcd41150a79b08cd8dd243fd0acc39..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 570 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GG!XV7ZFl&wk0|Vn5 zPZ!6KiaBp*Df%CF5IO!oKhjCSn?T9kc1PYxmPh28M9d;?&MMmz^ZxIhNy~oT*DtRv-|l{fXZA@?_6csR9#G;~ z730s3@-8fC=L9cmob>k9TDw2Z;nKm`ZC||;oEVIw)l-rVZ1b&mnBKq@z<7yqNg#+g zdA{z+?5MThwjTdlJO5Ju=l^GHnb|Z7H%7QzEe$M|* zCR(w74|D&f;*<{Egn}*2TaPt=%(g%BtJXn>amwk1Tg!W%sF+rigO9d^cYpq3$n#r*4CupZG-Qo*Ui?az=YuHnnk0;8W-&lJH&guOV~B zJ>v-;491J&)+a9wU|_g2|L2`I3ro8ybLf~zopr0H$f|XaE2J 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 index 071b9f0b1a53efac843c7382b1a25e576192bfa1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 480 zcmV<60U!Q}P)fMk zFqlNpU^JLSY-$$NW*WFAh})PZFSw0eoa0%Xdj5gCchec}+aCAc@Avur<%Cj-ZmOrN z-UEOD;6DI_++GwykWZu(!0hGew|CC627s8z6*~`*Po&g%d>C_Yi_ys`$G1wQ3_yHg z9zf+chnUC}MMnW1DwQt|KdNe3>@FVxuyIimD(B9waJval#%2H%K&o88l+xk6R)2Ct z?AEU947^GJ><^5PDi_{7e0J_duBRY*eeO8hb^}vNY`dZB8}Lv9A>Mra5mgUuqK7egEC@m%dD5bZlT9&UecrHPxw@-z`5o)U| z3?3c>{-!`1pgo4|3_Q1*f71h>WlBjn9MOL7bq_f7Q}kZsD+9LOAVY+;-k7!xZGijY z9nI_}(?&ml(uMHd19RymUl2M|0H88B8*kd^7gzO1c3MxsFO1=Dsq4RF0YCr{0K5Rr W|D_k8)hwp~00007XSaVsysxHmXN5m468E-J<=rBY#^s**!Z`jC?!)PYfpnKpL(+1WX z5e(ZHW}jqlSoN=h@xZcGC85(^?Y(X$oNKH&``G2QMfa*>r!LJ~<<zuL+ zZ$CA-1}40-W!O=D&w=UAoobyfrrS>$m&^XzzV}xc1H+nAL5vH|vM5J0W*Gnc#QrP1 zf%`3|mH9UFKl#7D*)5i9Qd(3R+n@A(%erjQi5b^dFjUT4{Mw4g(vVs3;=0!po>zV` z3}pPa*_7cyg^k^p^v7?u&tJQ6eSYBaBmejc-k;a!ul<~Er|h!Z?_c|bTJAeHA3xlH z;UQ`612}#CY!So4kDqma+O6`heditS@aM-*FQ&!6w)`=Zd#`L#x6kx?-05SF|EC%V z?e Q0T`zYp00i_>zopr0QTM3E&u=k 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 index d8f2d290e4a47ca8129d30383ba3c57f0480417d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 513 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GG!XV7ZFl&wk0|Vn` zPZ!6KiaBp*9n3xCAmI9c8PgW0Y5Z-ITa}i)JjiuJc1hnB7w&yUi`p(QxR)F5Y|#k1 zc2Y{ruJ5_0Os>7XSaVsysxHmXN5m468E-J<=rBY#^s**!Z`jC?!)PYfpnKpL(+1WX z5e(ZHW}jqlSoN=h@xZcGC85(^?Y(X$oNKH&``G2QMfa*>r!LJ~<<zuL+ zZ$CA-1}40-W!O=D&w=UAoobyfrrS>$m&^XzzV}xc1H+nAL5vH|vM5J0W*Gnc#QrP1 zf%`3|mH9UFKl#7D*)5i9Qd(3R+n@A(%erjQi5b^dFjUT4{Mw4g(vVs3;=0!po>zV` z3}pPa*_7cyg^k^p^v7?u&tJQ6eSYBaBmejc-k;a!ul<~Er|h!Z?_c|bTJAeHA3xlH z;UQ`612}#CY!So4kDqma+O6`heditS@aM-*FQ&!6w)`=Zd#`L#x6kx?-05SF|EC%V z?e Q0T`zYp00i_>zopr0QTM3E&u=k 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 index c06bee8412..0000000000 --- a/Resources/Textures/Objects/Specific/Medical/brigmedichypo.rsi/meta.json +++ /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 - } - ] -} -- 2.51.2