From 6629bae9250c2f47ac66fed1ba71c38b1de52292 Mon Sep 17 00:00:00 2001 From: Lonkuk Date: Wed, 7 Aug 2024 19:56:16 +0300 Subject: [PATCH] fix drones --- .../ADT/Drones/Drone-Antags/DroneAntag.yml | 12 ++++---- .../Drones/Drone-Antags/DroneAntag_IPC.yml | 9 +++--- .../Drone-Antags/DroneAntag_Spawner.yml | 8 +++--- .../ertleader_cyb.rsi/equipped-BACKPACK.png | Bin 0 -> 109 bytes .../Clothing/Back/ertleader_cyb.rsi/icon.png | Bin 0 -> 400 bytes .../Back/ertleader_cyb.rsi/inhand-left.png | Bin 0 -> 701 bytes .../Back/ertleader_cyb.rsi/inhand-right.png | Bin 0 -> 762 bytes .../Clothing/Back/ertleader_cyb.rsi/meta.json | 26 ++++++++++++++++++ 8 files changed, 40 insertions(+), 15 deletions(-) create mode 100644 Resources/Textures/ADT/Clothing/Back/ertleader_cyb.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/ADT/Clothing/Back/ertleader_cyb.rsi/icon.png create mode 100644 Resources/Textures/ADT/Clothing/Back/ertleader_cyb.rsi/inhand-left.png create mode 100644 Resources/Textures/ADT/Clothing/Back/ertleader_cyb.rsi/inhand-right.png create mode 100644 Resources/Textures/ADT/Clothing/Back/ertleader_cyb.rsi/meta.json diff --git a/Resources/Prototypes/ADT/Drones/Drone-Antags/DroneAntag.yml b/Resources/Prototypes/ADT/Drones/Drone-Antags/DroneAntag.yml index c07576a562e..0eec50986ac 100644 --- a/Resources/Prototypes/ADT/Drones/Drone-Antags/DroneAntag.yml +++ b/Resources/Prototypes/ADT/Drones/Drone-Antags/DroneAntag.yml @@ -350,8 +350,8 @@ doAfterDelay: 5 - type: UserInterface interfaces: - - key: enum.StrippingUiKey.Key - type: StrippableBoundUserInterface + enum.StrippingUiKey.Key: + type: StrippableBoundUserInterface - type: Inventory templateId: droneantaginventory @@ -508,8 +508,8 @@ doAfterDelay: 5 - type: UserInterface interfaces: - - key: enum.StrippingUiKey.Key - type: StrippableBoundUserInterface + enum.StrippingUiKey.Key: + type: StrippableBoundUserInterface - type: Inventory templateId: droneantaginventory @@ -667,8 +667,8 @@ doAfterDelay: 5 - type: UserInterface interfaces: - - key: enum.StrippingUiKey.Key - type: StrippableBoundUserInterface + enum.StrippingUiKey.Key: + type: StrippableBoundUserInterface - type: Inventory templateId: droneantaginventory diff --git a/Resources/Prototypes/ADT/Drones/Drone-Antags/DroneAntag_IPC.yml b/Resources/Prototypes/ADT/Drones/Drone-Antags/DroneAntag_IPC.yml index 754aaf02c0a..b87045f964a 100644 --- a/Resources/Prototypes/ADT/Drones/Drone-Antags/DroneAntag_IPC.yml +++ b/Resources/Prototypes/ADT/Drones/Drone-Antags/DroneAntag_IPC.yml @@ -270,11 +270,11 @@ - type: Strippable - type: UserInterface interfaces: - - key: enum.VoiceMaskUIKey.Key + enum.VoiceMaskUIKey.Key: type: VoiceMaskBoundUserInterface - - key: enum.HumanoidMarkingModifierKey.Key + enum.HumanoidMarkingModifierKey.Key: type: HumanoidMarkingModifierBoundUserInterface - - key: enum.StrippingUiKey.Key + enum.StrippingUiKey.Key: type: StrippableBoundUserInterface - type: StandingState - type: CanEscapeInventory @@ -340,6 +340,7 @@ allowed: - Stun - type: Blindable + #- type: ComplexInteraction - type: entity id: ADTDroneAntagIPC @@ -434,7 +435,6 @@ Alive: BorgHealth Critical: BorgCrit Dead: BorgDead - allowRevives: true # Для воскрешения достаточно починить урон. - ss220. - type: NpcFactionMember factions: @@ -575,7 +575,6 @@ shortscale: 0.9 - type: StaticPrice price: 2525 - # damage modifier set - type: damageModifierSet diff --git a/Resources/Prototypes/ADT/Drones/Drone-Antags/DroneAntag_Spawner.yml b/Resources/Prototypes/ADT/Drones/Drone-Antags/DroneAntag_Spawner.yml index 172b3c1368e..9a9bb0c0986 100644 --- a/Resources/Prototypes/ADT/Drones/Drone-Antags/DroneAntag_Spawner.yml +++ b/Resources/Prototypes/ADT/Drones/Drone-Antags/DroneAntag_Spawner.yml @@ -5,7 +5,7 @@ components: - type: Sprite layers: - - sprite: ADT/Markers/job.rsi + - sprite: ADT/Markers/jobs.rsi state: green - sprite: ADT/Mobs/Silicon/AntagDrones/drone-miner.rsi state: mineshell @@ -20,7 +20,7 @@ components: - type: Sprite layers: - - sprite: ADT/Markers/job.rsi + - sprite: ADT/Markers/jobs.rsi state: green - sprite: ADT/Mobs/Silicon/AntagDrones/drone-engineer.rsi state: engshell @@ -35,7 +35,7 @@ components: - type: Sprite layers: - - sprite: ADT/Markers/job.rsi + - sprite: ADT/Markers/jobs.rsi state: green - sprite: ADT/Mobs/Silicon/AntagDrones/drone-charger.rsi state: chargeshell @@ -51,7 +51,7 @@ components: - type: Sprite layers: - - sprite: ADT/Markers/job.rsi + - sprite: ADT/Markers/jobs.rsi state: green - sprite: ADT/Mobs/Silicon/AntagDrones/drone-ipc-soldier.rsi state: ipc_icon diff --git a/Resources/Textures/ADT/Clothing/Back/ertleader_cyb.rsi/equipped-BACKPACK.png b/Resources/Textures/ADT/Clothing/Back/ertleader_cyb.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000000000000000000000000000000000..2975c479be7566a6c59a7aca4e20778aa850feb7 GIT binary patch literal 109 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|)ID7sLn`LH rJ;=xlwOr9UK@K`#+rw1POb(`njxgN@xNA?@buF literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Back/ertleader_cyb.rsi/icon.png b/Resources/Textures/ADT/Clothing/Back/ertleader_cyb.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..d560a0d5b93233f1e0a1fc84bc6991759e9f5582 GIT binary patch literal 400 zcmV;B0dM|^P)GhjqwGZ`x>8zBiWsf3l6g{UJ0R9wo^ z(n=f^kOayF#Y@}~0!k_^E-o$V2m#JXDoQF!(-CGUX-;x?nyH9Tq2Z)iSgC|$s8-7& zcc&$dZ~@MlGrW|vJRA}3a#876wW0+fz$K#M;pO2ua{^psp%YNR#Y+KIz-tMT)16ut uE@^Q=a_LN$juy|E2$wQ2DFFe)paK9WT_woKl9k&40000Px%cS%G+RCt{2+A(X}Ko|z#*Co(Fw-mz($>5=&skyqF^$@|`QVMrNs6m}1>@+cw`$;75J&SC~NO$MEPsVxy#u#IaF~%5Uj4{Su zjf;zmqU~$EYx@Gbj_J_p`DKwLNoxafLUp1vO$%!+0O0-T3m(_E)fNDxl#R}Jc6D9g z&rkFRLu?-;wANHj-9s_}X_{8wkdzW9gCRbAzQM1}4{RSK%7LjXNs?mw{TuQy#P9nB zMH62{HUq4+2!a6Kdwks70h>GY0o;3!AP8WsMV{xi&*!~I9LHF#RuDo^HS-@N1F&2! zdr=e>&N&DnkY!ml7y#g$0|3NvTs}N^MV{vnLO^TXqiE-I$cms40zwEl=ir>f zWHPB-DeKvS@bzJ~Je=t1id0-t+vk3jc5TCx@ z9DPl)8PH{@fijCgx&*oiHBe^}$d-WCx@U|*7oi5qECT5a=ql6z>=(K+i%{-wl1U;h zf?b3fsIv%U1JGrtfijCgIs>{0H7KPp8jTKqrb!mzO+L1sPNzkdWmO#r!w|+80I1e~ j-6H%Z2cX1R1Ok5n3x`|)PE`fr00000NkvXXu0mjfhMF+k literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Clothing/Back/ertleader_cyb.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Back/ertleader_cyb.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..ac2c36bf285a9ec648f2671495fa0643c62799f7 GIT binary patch literal 762 zcmVPx%v`IukRCt{2+A(X}Koke?zl)*6-BJv9LWMSTdD@lRy^-Gz2OTWT=d^go17;7_QSDi7gqWR$@849~j4yqPu&(cLLu72qAh5czZxV`y>>2CoS zm?pZuzIKDOj4|N*7XScb3`!{*MbTUk3THr;WnhfK7=!-J1#okL4uIGgFvgH&8ImM< zw1F%uilUZM%I0|v0FY9aUON|n^Yio8#>R%t^BkOWgkk7|0RZl%K@dDf-)rN7AcR01 z$Cykeg(>i&=pg4DoO9%Pjy%t?ySwZEcITQr17_{)?3A7>Oab8jLN^+Xz&ZEFo4gL( z<-W8yj!UnZn*mBG3joF#2qB=ghA{?OYX~8HDl|O>94RHFlzv>Z3RA!h)EI*_O`)|$ znx_8Px^T0$-|v?`y5~|rYmFcXaCUZ9dSfBP!t+hx9(z|;SEbj?&4AO>)0SJ{7-RR& zxzAaaq3D^qjusB0C~uz2zzHFQ5JCtcgb+dqA!KP!Q8Q3?8>L%gvzk;huyt^3UAxQv zN?o`!G;6kIpwsQ)_4^Zay1geI_}+(47JzTJj