From 35f4b3e3f53195556ea4b5c0bd743a7a94f9c078 Mon Sep 17 00:00:00 2001 From: Tryded Date: Sun, 12 Jan 2025 14:19:40 -0600 Subject: [PATCH 1/7] Advanced Compact Defib --- .../Objects/Specific/Medical/defib.yml | 33 ++++++++++++++++++ .../_DV/Objectives/stealTargetGroups.yml | 7 ++++ .../Prototypes/_DV/Objectives/traitor.yml | 12 ++++++- .../equipped-BELT.png | Bin 0 -> 589 bytes .../Medical/advancedcompactdefib.rsi/icon.png | Bin 0 -> 255 bytes .../advancedcompactdefib.rsi/inhand-left.png | Bin 0 -> 650 bytes .../advancedcompactdefib.rsi/inhand-right.png | Bin 0 -> 665 bytes .../advancedcompactdefib.rsi/meta.json | 29 +++++++++++++++ .../advancedcompactdefib.rsi/screen.png | Bin 0 -> 139 bytes 9 files changed, 80 insertions(+), 1 deletion(-) create mode 100644 Resources/Prototypes/_DV/Entities/Objects/Specific/Medical/defib.yml create mode 100644 Resources/Textures/_DV/Objects/Medical/advancedcompactdefib.rsi/equipped-BELT.png create mode 100644 Resources/Textures/_DV/Objects/Medical/advancedcompactdefib.rsi/icon.png create mode 100644 Resources/Textures/_DV/Objects/Medical/advancedcompactdefib.rsi/inhand-left.png create mode 100644 Resources/Textures/_DV/Objects/Medical/advancedcompactdefib.rsi/inhand-right.png create mode 100644 Resources/Textures/_DV/Objects/Medical/advancedcompactdefib.rsi/meta.json create mode 100644 Resources/Textures/_DV/Objects/Medical/advancedcompactdefib.rsi/screen.png diff --git a/Resources/Prototypes/_DV/Entities/Objects/Specific/Medical/defib.yml b/Resources/Prototypes/_DV/Entities/Objects/Specific/Medical/defib.yml new file mode 100644 index 00000000000..58d8eb388ba --- /dev/null +++ b/Resources/Prototypes/_DV/Entities/Objects/Specific/Medical/defib.yml @@ -0,0 +1,33 @@ +- type: entity + id: DefibrillatorCompactAdvanced + parent: BaseDefibrillator + name: advanced compact defibrillator + description: A belt-equipped state-of-the-art defibrillator that can be rapidly deployed in all enviroments. Uses an experimental self-charging cell, meaning that it will (probably) never stop working. + components: + - type: Sprite + sprite: DeltaV/Objects/Medical/advancedcompactdefib.rsi + layers: + - state: icon + - state: screen + map: [ "enum.ToggleVisuals.Layer" ] + visible: false + shader: unshaded + - type: Appearance + - type: GenericVisualizer + visuals: + enum.ToggleVisuals.Toggled: + enum.ToggleVisuals.Layer: + True: { visible: true } + False: { visible: false } + - type: Clothing + slots: [belt] + - type: Item + size: Normal + - type: MultiHandedItem + - type: StaticPrice + price: 500 + - type: Tag + tags: + - HighRiskItem + - type: StealTarget + stealGroup: DefibrillatorCompactAdvanced diff --git a/Resources/Prototypes/_DV/Objectives/stealTargetGroups.yml b/Resources/Prototypes/_DV/Objectives/stealTargetGroups.yml index 46aa9581e2c..a1ce1a06308 100644 --- a/Resources/Prototypes/_DV/Objectives/stealTargetGroups.yml +++ b/Resources/Prototypes/_DV/Objectives/stealTargetGroups.yml @@ -40,6 +40,13 @@ sprite: _DV/Mobs/Pets/silvia.rsi state: silvia +- type: stealTargetGroup + id: DefibrillatorCompactAdvanced + name: steal-target-groups-defibrillator-compact-advanced + sprite: + sprite: DeltaV/Objects/Medical/advancedcompactdefib.rsi + state: icon + # Ninja - type: stealTargetGroup diff --git a/Resources/Prototypes/_DV/Objectives/traitor.yml b/Resources/Prototypes/_DV/Objectives/traitor.yml index 1776729bfe6..d94de6e3e42 100644 --- a/Resources/Prototypes/_DV/Objectives/traitor.yml +++ b/Resources/Prototypes/_DV/Objectives/traitor.yml @@ -50,7 +50,17 @@ - type: StealCondition stealGroup: AnimalSilvia owner: job-name-cmo - + +- type: entity + parent: BaseTraitorStealObjective + id: CMODefibStealObjective + components: + - type: NotJobRequirement + job: ChiefMedicalOfficer + - type: StealCondition + stealGroup: DefibrillatorCompactAdvanced + owner: job-name-cmo + # Mystagogue steal objective - type: entity parent: BaseTraitorStealObjective diff --git a/Resources/Textures/_DV/Objects/Medical/advancedcompactdefib.rsi/equipped-BELT.png b/Resources/Textures/_DV/Objects/Medical/advancedcompactdefib.rsi/equipped-BELT.png new file mode 100644 index 0000000000000000000000000000000000000000..bc2218ddc05c1b1f737b8dd3ae09bd8b0da80ca1 GIT binary patch literal 589 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GGLLkg|>2BR01_s9e zo-U3d6>)E8+55FR2psz^IXQgARIV4CTedLrJEZHp$+2zOyH|YUF>jC5-+l`kmPQ4v zJ!3bGVc(3oPy6?L$lb(wn$LK%{SDre=1vP588{ly(1AA`I@>CaZkqPnZ2jR^qF2QI z`EDgAFW-G^ny|6Yq$N>Xo>vN=&RbBzxBlJJe@C}2Ioh76QF}jp?y-{j&vq`1tZr`# zXgFHre{|x{^2f8@)$X<1TvH@;Zj+DIxs4u^LUydvZc+&7cMnvtIWHRdO;P4};?esL zRW{hz3a^?!W$z9(j;xq-g?|cj&%c+G?mtp^M`HVP-#?qrHT=n4TC;6`!=Kuv4n22Y za4T?R&gzr>_5YFVU7HJLYrfgfWi-)yzgal>t@yU@iSjeP)*slA@lckV@b3WAEFF;&jtrb*Up># zM(uy-TBpdx2R^!QTl1@7SMl1j#mr?}mv8_3^V5=Z(z}-3V!7+KGVn$8d~=pXSq(Ya z4F9?=K7AthJLTHPT~BgONT(?sU*%`TZWXsT}ytw yKW?~jU;N4)SH26#JvKEAzR!P>?*XsHWd0&SNb+nI@hwNKKKfv4aBS{{I>U|^#& z55ZK#+_g|h01yTwj)1g4 z;slUGP+CA*AaMkw1rjHKTm_^Bqy-X3;1cDZ=ed1iGMP*ilCAc)+wERw=nq`HNsVR; z{k#6Od0pL3v)yt5K`=U_pKq(PyS~rz_c_!F1-1`45S-Sd*>jo9a$bC@fMgDJiYIOX zI(?)TW)rqRn3?{h`fkCq1E4&ls?HJv@BepIoJC%=T{=Dm2*C92#_E5ZP-Kcum-)w+ zH@o%v^bj1uDLQ9A1bqx>AE0{P#wg>1}H*_V)q0u>WNNt$(FbuZ_p!xbYrB2r*!_S`~@ce>^gQHrJ4S zv|swy)@GAw?zQ7+p?xUOfj~P^Bj#E|_R)Uro(2N64+R_mxDqvDZ8ns(^Pe$j|ImF2 zf@|%N9ZlH${$c-g&+p5gZwJ#}iyglo`w#P5#fAJs0HQB512+(TA29IzV0Z!mgowF- kFo1c1VS2&<2oZCEKU}rA?jtZwumAu607*qoM6N<$g4;?MYybcN literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Medical/advancedcompactdefib.rsi/inhand-right.png b/Resources/Textures/_DV/Objects/Medical/advancedcompactdefib.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..d865cf85935d0213a9ae47d3448a64626f85f093 GIT binary patch literal 665 zcmV;K0%rY*P)Nb+L;NVuKfr0E=UZ_{Qy3oI-2UQx91|Ry~Cke-cKP3WRrfr7Bv`$Btt6=UY`G4XO z%uk#Ajhlx}8=?7O!V>UV2ACAjfpFv&$#_cOs0y{4}qs_k_?Hc$b>ql0442eh*_ z-^8X4{`~5;n7X+*^Y-93HckSl{+}LKO)wpOT4<_6)|?$~4r$ zn6U6uw#l2Y(!fd5O)6f-ireG9EOb`3J5!YeD6g8 zd=A4#5Cw#tKfd>(06vFdBZvaR&L7`e8Mzesn}!WL(>Enej$dC0%o(BHo=>0*<%PF%@Zc!6Q-@SsvX<3<&za+p`g6$Gg0*ntWsGFya%X3v@P4WM0U->?O z)1kXy3y;Ar1nG)F23@fPs literal 0 HcmV?d00001 From a6ee4f6b62b1d978d0ed3c70aed34b4935ab3bc7 Mon Sep 17 00:00:00 2001 From: Tryded Date: Sun, 12 Jan 2025 14:31:19 -0600 Subject: [PATCH 2/7] _DV Namespace fix --- .../Prototypes/_DV/Entities/Objects/Specific/Medical/defib.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_DV/Entities/Objects/Specific/Medical/defib.yml b/Resources/Prototypes/_DV/Entities/Objects/Specific/Medical/defib.yml index 58d8eb388ba..f3a935eb665 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Specific/Medical/defib.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Specific/Medical/defib.yml @@ -5,7 +5,7 @@ description: A belt-equipped state-of-the-art defibrillator that can be rapidly deployed in all enviroments. Uses an experimental self-charging cell, meaning that it will (probably) never stop working. components: - type: Sprite - sprite: DeltaV/Objects/Medical/advancedcompactdefib.rsi + sprite: _DV/Objects/Medical/advancedcompactdefib.rsi layers: - state: icon - state: screen From db8eb206e8f3bd1af1722824e29698f97d050158 Mon Sep 17 00:00:00 2001 From: Tryded Date: Mon, 13 Jan 2025 17:58:23 -0600 Subject: [PATCH 3/7] fixes --- .../Prototypes/_DV/Entities/Objects/Specific/Medical/defib.yml | 2 +- Resources/Prototypes/_DV/Objectives/stealTargetGroups.yml | 2 +- Resources/Prototypes/_DV/Objectives/traitor.yml | 2 +- .../_DV/Objects/Medical/advancedcompactdefib.rsi/meta.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/_DV/Entities/Objects/Specific/Medical/defib.yml b/Resources/Prototypes/_DV/Entities/Objects/Specific/Medical/defib.yml index f3a935eb665..aa42ef748cb 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Specific/Medical/defib.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Specific/Medical/defib.yml @@ -1,6 +1,6 @@ - type: entity - id: DefibrillatorCompactAdvanced parent: BaseDefibrillator + id: DefibrillatorCompactAdvanced name: advanced compact defibrillator description: A belt-equipped state-of-the-art defibrillator that can be rapidly deployed in all enviroments. Uses an experimental self-charging cell, meaning that it will (probably) never stop working. components: diff --git a/Resources/Prototypes/_DV/Objectives/stealTargetGroups.yml b/Resources/Prototypes/_DV/Objectives/stealTargetGroups.yml index a1ce1a06308..142f08deb85 100644 --- a/Resources/Prototypes/_DV/Objectives/stealTargetGroups.yml +++ b/Resources/Prototypes/_DV/Objectives/stealTargetGroups.yml @@ -44,7 +44,7 @@ id: DefibrillatorCompactAdvanced name: steal-target-groups-defibrillator-compact-advanced sprite: - sprite: DeltaV/Objects/Medical/advancedcompactdefib.rsi + sprite: _DV/Objects/Medical/advancedcompactdefib.rsi state: icon # Ninja diff --git a/Resources/Prototypes/_DV/Objectives/traitor.yml b/Resources/Prototypes/_DV/Objectives/traitor.yml index d94de6e3e42..4d99f3c4634 100644 --- a/Resources/Prototypes/_DV/Objectives/traitor.yml +++ b/Resources/Prototypes/_DV/Objectives/traitor.yml @@ -52,7 +52,7 @@ owner: job-name-cmo - type: entity - parent: BaseTraitorStealObjective + parent: BaseCMOStealObjective id: CMODefibStealObjective components: - type: NotJobRequirement diff --git a/Resources/Textures/_DV/Objects/Medical/advancedcompactdefib.rsi/meta.json b/Resources/Textures/_DV/Objects/Medical/advancedcompactdefib.rsi/meta.json index 955a7dafb8c..940a2207a1e 100644 --- a/Resources/Textures/_DV/Objects/Medical/advancedcompactdefib.rsi/meta.json +++ b/Resources/Textures/_DV/Objects/Medical/advancedcompactdefib.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "license": "CC0-1.0", + "license": "CC-BY-SA-3.0", "copyright": "Taken from Paradise Staiton in commit https://github.com/ParadiseSS13/Paradise/pull/15783/commits/7b342f4476bfface771aaa74db5e701dab64131d inhand sprites by Tryded", "size": { "x": 32, From 5ebe4a4018619a490648171b0eaad3ee0dc99f22 Mon Sep 17 00:00:00 2001 From: Tryded Date: Mon, 13 Jan 2025 19:17:56 -0600 Subject: [PATCH 4/7] delete steal objective --- .../Prototypes/_DV/Objectives/stealTargetGroups.yml | 7 ------- Resources/Prototypes/_DV/Objectives/traitor.yml | 10 ---------- 2 files changed, 17 deletions(-) diff --git a/Resources/Prototypes/_DV/Objectives/stealTargetGroups.yml b/Resources/Prototypes/_DV/Objectives/stealTargetGroups.yml index 142f08deb85..46aa9581e2c 100644 --- a/Resources/Prototypes/_DV/Objectives/stealTargetGroups.yml +++ b/Resources/Prototypes/_DV/Objectives/stealTargetGroups.yml @@ -40,13 +40,6 @@ sprite: _DV/Mobs/Pets/silvia.rsi state: silvia -- type: stealTargetGroup - id: DefibrillatorCompactAdvanced - name: steal-target-groups-defibrillator-compact-advanced - sprite: - sprite: _DV/Objects/Medical/advancedcompactdefib.rsi - state: icon - # Ninja - type: stealTargetGroup diff --git a/Resources/Prototypes/_DV/Objectives/traitor.yml b/Resources/Prototypes/_DV/Objectives/traitor.yml index 4d99f3c4634..ae6abfef58a 100644 --- a/Resources/Prototypes/_DV/Objectives/traitor.yml +++ b/Resources/Prototypes/_DV/Objectives/traitor.yml @@ -51,16 +51,6 @@ stealGroup: AnimalSilvia owner: job-name-cmo -- type: entity - parent: BaseCMOStealObjective - id: CMODefibStealObjective - components: - - type: NotJobRequirement - job: ChiefMedicalOfficer - - type: StealCondition - stealGroup: DefibrillatorCompactAdvanced - owner: job-name-cmo - # Mystagogue steal objective - type: entity parent: BaseTraitorStealObjective From 88fdbce8ef1f5e2803106439efab8e3f57eb5536 Mon Sep 17 00:00:00 2001 From: Tryded Date: Wed, 15 Jan 2025 21:14:48 -0600 Subject: [PATCH 5/7] remove objective --- .../_DV/Entities/Objects/Specific/Medical/defib.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/Resources/Prototypes/_DV/Entities/Objects/Specific/Medical/defib.yml b/Resources/Prototypes/_DV/Entities/Objects/Specific/Medical/defib.yml index aa42ef748cb..d3d149808c8 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Specific/Medical/defib.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Specific/Medical/defib.yml @@ -25,9 +25,4 @@ size: Normal - type: MultiHandedItem - type: StaticPrice - price: 500 - - type: Tag - tags: - - HighRiskItem - - type: StealTarget - stealGroup: DefibrillatorCompactAdvanced + price: 500 \ No newline at end of file From 0381fa78ea07fc79945b525e716e65d9856f69b6 Mon Sep 17 00:00:00 2001 From: Tryded Date: Wed, 15 Jan 2025 21:17:08 -0600 Subject: [PATCH 6/7] unindent --- .../Objects/Specific/Medical/defib.yml | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/Resources/Prototypes/_DV/Entities/Objects/Specific/Medical/defib.yml b/Resources/Prototypes/_DV/Entities/Objects/Specific/Medical/defib.yml index d3d149808c8..977accc065a 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Specific/Medical/defib.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Specific/Medical/defib.yml @@ -4,25 +4,25 @@ name: advanced compact defibrillator description: A belt-equipped state-of-the-art defibrillator that can be rapidly deployed in all enviroments. Uses an experimental self-charging cell, meaning that it will (probably) never stop working. components: - - type: Sprite - sprite: _DV/Objects/Medical/advancedcompactdefib.rsi - layers: - - state: icon - - state: screen - map: [ "enum.ToggleVisuals.Layer" ] - visible: false - shader: unshaded - - type: Appearance - - type: GenericVisualizer - visuals: - enum.ToggleVisuals.Toggled: - enum.ToggleVisuals.Layer: - True: { visible: true } - False: { visible: false } - - type: Clothing - slots: [belt] - - type: Item - size: Normal - - type: MultiHandedItem - - type: StaticPrice - price: 500 \ No newline at end of file + - type: Sprite + sprite: _DV/Objects/Medical/advancedcompactdefib.rsi + layers: + - state: icon + - state: screen + map: [ "enum.ToggleVisuals.Layer" ] + visible: false + shader: unshaded + - type: Appearance + - type: GenericVisualizer + visuals: + enum.ToggleVisuals.Toggled: + enum.ToggleVisuals.Layer: + True: { visible: true } + False: { visible: false } + - type: Clothing + slots: [belt] + - type: Item + size: Normal + - type: MultiHandedItem + - type: StaticPrice + price: 500 \ No newline at end of file From bac5aaa86594355f7461e2fa506ea90ca9378b3d Mon Sep 17 00:00:00 2001 From: Tryded Date: Wed, 15 Jan 2025 21:22:13 -0600 Subject: [PATCH 7/7] indent --- .../advancedcompactdefib.rsi/meta.json | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/Resources/Textures/_DV/Objects/Medical/advancedcompactdefib.rsi/meta.json b/Resources/Textures/_DV/Objects/Medical/advancedcompactdefib.rsi/meta.json index 940a2207a1e..684f6bb12f5 100644 --- a/Resources/Textures/_DV/Objects/Medical/advancedcompactdefib.rsi/meta.json +++ b/Resources/Textures/_DV/Objects/Medical/advancedcompactdefib.rsi/meta.json @@ -6,24 +6,24 @@ "x": 32, "y": 32 }, - "states": [ - { - "name": "icon" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "equipped-BELT", - "directions": 4 - }, - { - "name": "screen" - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "screen" + } + ] }