From 7066f0cf3cb9334d6da23765e7b1a1dd4aca50d0 Mon Sep 17 00:00:00 2001 From: SpicyDarkFox Date: Mon, 26 Aug 2024 16:40:31 +0300 Subject: [PATCH 1/3] =?UTF-8?q?=D0=BE=D1=87=D0=B5=D1=80=D0=B5=D0=B4=D0=BD?= =?UTF-8?q?=D1=8B=D0=B5=20=D1=84=D0=B8=D0=BA=D1=81=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_LostParadise/Supermatter/Supermatter.ftl | 7 -- .../Prototypes/Catalog/uplink_catalog.yml | 10 +-- .../Weapons/Guns/Projectiles/projectiles.yml | 11 +-- .../Entities/Structures/Machines/lathe.yml | 3 +- .../Prototypes/_LostParadise/Action/ai.yml | 10 +++ .../Specific/Supermatter/supermatter.yml | 64 ------------------ .../Head/Hardsuits/atmospherics.rsi/meta.json | 6 ++ .../Head/Hardsuits/capspace.rsi/meta.json | 3 + .../Hardsuits/basic.rsi/meta.json | 2 +- .../Hardsuits/brigmedic.rsi/meta.json | 6 +- .../Projectiles/projectiles.rsi/meta.json | 9 +++ .../projectiles.rsi/scatterlaser.png | Bin 0 -> 1832 bytes .../Structures/Storage/closet.rsi/meta.json | 6 ++ .../Storage/closet.rsi/sec_eng_door.png | Bin 0 -> 452 bytes .../Storage/closet.rsi/sec_engi.png | Bin 0 -> 354 bytes .../Supermatter/supermatter.rsi/meta.json | 14 ---- .../supermatter.rsi/supermatter.png | Bin 2702 -> 0 bytes 17 files changed, 51 insertions(+), 100 deletions(-) delete mode 100644 Resources/Locale/ru-RU/_LostParadise/Supermatter/Supermatter.ftl delete mode 100644 Resources/Prototypes/_LostParadise/Entities/Structures/Specific/Supermatter/supermatter.yml create mode 100644 Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/scatterlaser.png create mode 100644 Resources/Textures/Structures/Storage/closet.rsi/sec_eng_door.png create mode 100644 Resources/Textures/Structures/Storage/closet.rsi/sec_engi.png delete mode 100644 Resources/Textures/_LostParadise/Supermatter/supermatter.rsi/meta.json delete mode 100644 Resources/Textures/_LostParadise/Supermatter/supermatter.rsi/supermatter.png diff --git a/Resources/Locale/ru-RU/_LostParadise/Supermatter/Supermatter.ftl b/Resources/Locale/ru-RU/_LostParadise/Supermatter/Supermatter.ftl deleted file mode 100644 index 2ce945b5dc..0000000000 --- a/Resources/Locale/ru-RU/_LostParadise/Supermatter/Supermatter.ftl +++ /dev/null @@ -1,7 +0,0 @@ -supermatter-self = Суперматерия -supermatter-danger-message = Опасность! Нарушение целостности кристаллической гиперструктуры! Целостность: { $integrity }% -supermatter-warning-message = ВНИМАНИЕ! Целостность кристаллической гиперструктуры достигает критических уровней! Целостность: { $integrity }% -supermatter-safe-alert = Кристаллическая гиперструктура возвращается к безопасным рабочим параметрам. Система защиты от сбоев отключена. Целостность: { $integrity }% -supermatter-delamination-overmass = Суперматерия достигла критической массы разрушения. Неизбежное формирование сингулярности! -supermatter-delamination-default = Целостность Суперматерии достигла критической точки. Активировано поле дестабилизации аварийной причинно-следственной связи. -supermatter-seconds-before-delam = { $Seconds } секунд до расслаивания. diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index 4dff2a3c81..64a878862c 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -1714,7 +1714,7 @@ id: LPPUplinkGlaive name: Кроваво красная глефа description: Модифицированная версия глефы, усовершенствованная каким-то больным утилизатором... - icon: { sprite: /Textures/LPP/Objects/Weapons/Melee/syndie_glaive.rsi, state: icon } + icon: { sprite: /Textures/_LostParadise/Objects/Weapons/Melee/syndie_glaive.rsi, state: icon } productEntity: LPPWeaponSyndieGlaive cost: Telecrystal: 8 @@ -1725,7 +1725,7 @@ id: LPPUplinkupgrwebbing name: разгрузочный жилет "Хомяк" description: Комплект из карманов, сумок и прочей лабуды предоставляет кучу места для ваших всевозможных вещей, что вы сюда запихнёте. Выглядит крайне громоздко однако. - icon: { sprite: /Textures/LPP/Clothing/Belt/upgrwebbing.rsi, state: icon } + icon: { sprite: /Textures/_LostParadise/Clothing/Belt/upgrwebbing.rsi, state: icon } productEntity: LPPClothingBeltMaximumWebbing cost: Telecrystal: 2 @@ -1736,7 +1736,7 @@ id: LPPUplinkAcientHardsuitSyndie name: древний скафандр Синдиката description: Очень странная модель скафандра Ядерных Оперативников, явно нестандартной конфигурации - icon: { sprite: /Textures/LPP/Clothing/OuterClothing/Hardsuits/acientsyndiehardsuit.rsi, state: icon } + icon: { sprite: /Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/acientsyndiehardsuit.rsi, state: icon } productEntity: LPPClothingOuterHardsuitAcientSyndie cost: Telecrystal: 11 @@ -1747,7 +1747,7 @@ id: LPPUplinkEcbow name: мини арбалет синдиката description: Любимое оружие агентов из далёких времён. Выстрел сразу же поражает цель, роняя моментально вашу цель на короткое время. Хоть оно и не требуется боеприпасов для стрельбы, однако самому оружию требуется перезарядка для повторного выстрела. - icon: { sprite: /Textures/LPP/Objects/Weapons/Guns/Battery/ecbow.rsi, state: icon } + icon: { sprite: /Textures/_LostParadise/Objects/Weapons/Guns/Battery/ecbow.rsi, state: icon } productEntity: LPPWeaponEnergyCrossbow cost: Telecrystal: 10 @@ -1763,4 +1763,4 @@ cost: Telecrystal: 2 categories: - - UplinkArmor \ No newline at end of file + - UplinkArmor diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 2fdca29fc4..022ffa3c88 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -1059,6 +1059,7 @@ sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi layers: - state: scatterlaser + shader: unshaded - type: GatheringProjectile - type: Projectile DeleteOnCollide: false @@ -1133,7 +1134,7 @@ params: volume: 5 - type: Sprite - sprite: LPP/Objects/Weapons/Guns/Projectiles/battlecutter.rsi + sprite: _LostParadise/Objects/Weapons/Guns/Projectiles/battlecutter.rsi layers: - state: ion shader: unshaded @@ -1163,11 +1164,11 @@ types: Heat: 1 muzzleFlash: - sprite: LPP/Objects/Weapons/Guns/projectiles/ailaser.rsi + sprite: _LostParadise/Objects/Weapons/Guns/projectiles/ailaser.rsi state: AILaser_3 travelFlash: - sprite: LPP/Objects/Weapons/Guns/projectiles/ailaser.rsi + sprite: _LostParadise/Objects/Weapons/Guns/projectiles/ailaser.rsi state: AILaser_2 impactFlash: - sprite: LPP/Objects/Weapons/Guns/projectiles/ailaser.rsi - state: AILaser_1 \ No newline at end of file + sprite: _LostParadise/Objects/Weapons/Guns/projectiles/ailaser.rsi + state: AILaser_1 diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 7143f0428b..7e1f1b4a5a 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -244,6 +244,7 @@ parent: BaseLathe name: protolathe description: Converts raw materials into useful objects. + noSpawn: false #проверка components: - type: Sprite sprite: Structures/Machines/protolathe.rsi @@ -1418,4 +1419,4 @@ - type: MaterialStorage whitelist: tags: - - PrizeTicket \ No newline at end of file + - PrizeTicket diff --git a/Resources/Prototypes/_LostParadise/Action/ai.yml b/Resources/Prototypes/_LostParadise/Action/ai.yml index 96456b370f..1c799e680d 100644 --- a/Resources/Prototypes/_LostParadise/Action/ai.yml +++ b/Resources/Prototypes/_LostParadise/Action/ai.yml @@ -2,6 +2,7 @@ id: AIEyeCamShootAction name: stun shot description: destabilizing shot in some point + noSpawn: true components: - type: WorldTargetAction icon: _LostParadise/Actions/AI/camerashoot.png @@ -15,6 +16,7 @@ id: AIEyeCamAction name: AI cameras description: Can jump on target cameras. + noSpawn: true components: - type: InstantAction icon: _LostParadise/Actions/AI/camera.png @@ -27,6 +29,7 @@ id: AIEyeAction name: AI Eye description: Puts you in to the AI Eye form, allowing you to float about the station's cameras. + noSpawn: true components: - type: InstantAction icon: _LostParadise/Actions/AI/eye.png @@ -39,6 +42,7 @@ id: AIEyeReturnAction name: AI Eye Return description: Return view to AI Core + noSpawn: true components: - type: InstantAction icon: _LostParadise/Actions/AI/core.png @@ -51,6 +55,7 @@ id: AIToggleArmNuke name: Nuke Arm/Disarm description: Toggles the AI's nuke. + noSpawn: true components: - type: InstantAction icon: @@ -66,6 +71,7 @@ id: ActionAIShowCommunications name: Communications Interface description: View a communications interface. + noSpawn: true components: - type: InstantAction icon: _LostParadise/Actions/AI/announcement.png @@ -76,6 +82,7 @@ id: ActionAiShowCriminalRecords name: Criminal Records Interface description: View a criminal records interface. + noSpawn: true components: - type: InstantAction icon: Corvax/Interface/AdminActions/monitoring.png # Corvax-Resprite @@ -88,6 +95,7 @@ - type: entity id: ActionOpenCloseRemote name: Open targeted door + noSpawn: true components: - type: EntityTargetAction icon: _LostParadise/Actions/AI/door.png @@ -100,6 +108,7 @@ - type: entity id: ActionToggleBolts name: Toggle bolts on door + noSpawn: true components: - type: EntityTargetAction icon: _LostParadise/Actions/AI/door_bolt.png @@ -112,6 +121,7 @@ - type: entity id: ActionToggleEmergencyAccess name: Toggle emergency on door + noSpawn: true components: - type: EntityTargetAction icon: _LostParadise/Actions/AI/door_emergency.png diff --git a/Resources/Prototypes/_LostParadise/Entities/Structures/Specific/Supermatter/supermatter.yml b/Resources/Prototypes/_LostParadise/Entities/Structures/Specific/Supermatter/supermatter.yml deleted file mode 100644 index a7d87cb4ce..0000000000 --- a/Resources/Prototypes/_LostParadise/Entities/Structures/Specific/Supermatter/supermatter.yml +++ /dev/null @@ -1,64 +0,0 @@ -- type: entity - id: LPPSupermatter - name: суперматерия - description: Странно прозрачный и переливающийся кристалл. Кристаллическая гиперструктура. - placement: - mode: SnapgridCenter - components: - - type: Sprite - drawdepth: WallMountedItems - sprite: _LostParadise/Supermatter/supermatter.rsi - state: supermatter - - type: Icon - sprite: _LostParadise/Supermatter/supermatter.rsi - state: supermatter - - type: Clickable - - type: InteractionOutline - - type: Transform - anchored: true - noRot: true - - type: Fixtures - fixtures: - fix1: - shape: - !type:PhysShapeAabb - bounds: "-0.25,-0.25,0.25,0.25" - density: 600 - mask: - - FullTileMask - layer: - - WallLayer - - type: Physics - bodyType: Dynamic - - type: Explosive - explosionType: Supermatter - maxIntensity: 10000 - intensitySlope: 10 - totalIntensity: 10000 - - type: PointLight - enabled: true - radius: 10 - energy: 5 - color: "#d9ce00" - - type: Supermatter - whitelist: - tags: - - EmitterBolt - components: - - Body - - Item - - type: AmbientSound - range: 5 - volume: -5 - sound: - path: /Audio/_LostParadise/Supermatter/calm.ogg - - type: Speech - speechVerb: Robotic - - type: CollisionWake - enabled: false - - type: WarpPoint - follow: true - location: Supermatter - - type: Appearance - - type: RadiationSource - intensity: 2 diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/meta.json index 78c9ef4619..fe13676420 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/meta.json @@ -13,6 +13,12 @@ { "name": "icon-flash" }, + { + "name": "icon-unshaded" + }, + { + "name": "light-overlay" + }, { "name": "on-inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/meta.json index 999971c030..20037d2116 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/meta.json @@ -10,6 +10,9 @@ { "name": "icon" }, + { + "name": "icon-flash" + }, { "name": "equipped-HELMET", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/meta.json index 1623caf7df..3faa83d7b0 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/meta.json @@ -43,7 +43,7 @@ "directions": 4 }, { - "name": "equipped-OUTERCLOTHING-hapry", + "name": "equipped-OUTERCLOTHING-harpy", "directions": 4 } ] diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/meta.json index baf15841af..b0be230e43 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/meta.json @@ -18,11 +18,11 @@ "name": "equipped-OUTERCLOTHING-vulpkanin", "directions": 4 }, - { + { "name": "equipped-OUTERCLOTHING-tajaran", "directions": 4 }, - { + { "name": "equipped-OUTERCLOTHING-reptilian", "directions": 4 }, @@ -37,7 +37,7 @@ { "name": "inhand-right", "directions": 4 - }}, + }, { "name": "equipped-OUTERCLOTHING-harpy", "directions": 4 diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/meta.json index 0a835a14d7..8cb46cce43 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/meta.json @@ -318,6 +318,15 @@ ] ] }, + { + "name": "scatterlaser", + "delays": [ + [ + 0.060000002, + 0.060000002 + ] + ] + }, { "name": "impact_xray", "delays": [ diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/scatterlaser.png b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/scatterlaser.png new file mode 100644 index 0000000000000000000000000000000000000000..1d30df48f469ffbcfe5fd3533004491ff4c479ba GIT binary patch literal 1832 zcmV+@2iN$CP)Px*;z>k7RA_N6Z z#-3*L)pUIx_kB5F&YLI5xYXJyKe2F!5SjT|?m zz->_EHK`?iS`ZRV0I&v$DR@*SJk~jRh;VRsS0087jcru{oMev&lqMs2&n*acnzLrQOfY&;wtSVRmFaYjN!0voV z!X-!g)bN_razpXRoeRF9X7d{a;VJ+)DmxZQ(gYOPT2qyztwFUrAM*O->V@%I0@ixH zdckXoI_(2`f*|^tS2zBR)u-zKfaC3DI^KaqYP^Utu7nB}Sg-YZ<$XzzJ~?iKd^e;y z8HlbE`A=xE{XLe~e!xQa5ddH`Sf>DY5EO;NZZ7i^)q0;B#T?nc0N7|v3E&TCRz z`t$@r^b@ac{0l$+XB`{Av;hD+FTg-W$2)~oNybg6h8D*0c(OeR^#WiPZBrSX+Ao+0Fi)nTzEpFNv^Yips|Fx#TFL24J>x+ zZ9Ew^Ft^x3&{!hZSr8IU$Aw1%lEl^X-|8IjcVasX2?Qbnk$^))l7#T#NFS~*;rRm6 z1EdFdzJTjXIMOE}{Mr@{5eNjjIJJHd|5yV4E_@;2p&fW=d?DbW9e8MbA>g4McxZef z;GrFOXx#L3_@4o`KxF`30A&G~vTiSnx~(#`%`I^I49HU;?gQ}&kWK1ed{VdN>8*$R z7@lSsgTc&Twy2odaAgaWsz5e1$R-vl1yl-T6N_wWP^y9}TQIY!`+&h$3%1u~09OSY z8;~-JGZ|1HDm_Jf5@XnJBcIk*!#)t7#8BxefWA?j*$S#E_+Fw2TQFOgN~5#}32QT= zbb5xkKgQ{s2;qGFHF)|aN8BGHou08aBWsXU8YNp8wpY)8Jpl%#QJmCr7j`AmWjfwz z^Y)8P1W~OAY`=)s6sPv^#yjP|imx)c(h-*>wo~p1ZxFQDy2~1_c10kzJk)>^l-*sThdJUTl z_c=>5kIAub zNvfvASx9-3001ksZxXewbNjYTcx(#Jt>)@FK@_+l0kbSXS4?VkNdQQ2A%Ec__&@TY z9bCQ__!M}2p4r20q;<|I37iob4^VKl9sod9RDGS8y>iNDI_I>yLF&(N<8AP0Ym3u? z)n&?)d}s$c=Rb_%-;CnlK4qi-}R*Uy`1Vli-|oh zQy#y6DRTK*??brNIp8u0S!|E8*dBeZ;Ai+C31jXTQ@dYG?S3)l{#}9x?r;!#pM+v; z&x)}<`<%hgaG8W+YA0E2hgocg#nevj5PW%0HcFd~jkj4EZ1a@cVW+#>MQfj=4tG2dJ>(yUW zN?a`0c+zIFs9ScqvGtZYDks+I0?pj5qjSN);Nr!LJC&7>A3y%h+PXqqe5$-W$T|jQ ze{OCEa~>BfE_YjAA4jfGFP?C3-uNK?tZ0G4M8P?2QmZG+K#ZDqXYw+j9{q+mycK7q|K+ zs^@dWmcPr-=J;sqcRo|*oeqb~#3_bu4-bfU$YgHT;eW!-TI21=peR}*dn4>%P(T!C z{sxyB>P?pYtn-<+v2g!kd%zSfz+lFp(yX;*K(!M+ zT^vI!dY4|h$aTnor}bg)u3MH9PcBI=d-Z$&(s^H!geM6f{J%{;lRIih=j1D1uS6&NaC9_0Xn4R_-o*bx+4z+J^G(*9 zY{k0AJRG+iR9foKqr&uVg*(d^o*eGv|4ORg+Ja84Ol$rmUoh=k_FHyViM@;_w&DSa T4ANmh$1!-i`njxgN@xNAQVWaO literal 0 HcmV?d00001 diff --git a/Resources/Textures/_LostParadise/Supermatter/supermatter.rsi/meta.json b/Resources/Textures/_LostParadise/Supermatter/supermatter.rsi/meta.json deleted file mode 100644 index 3c25e1a830..0000000000 --- a/Resources/Textures/_LostParadise/Supermatter/supermatter.rsi/meta.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "version": 1, - "copyright": "Taken from https://github.com/tgstation/tgstation/blob/master/icons/obj/supermatter.dmi", - "license": "CC-BY-SA-3.0", - "size": { - "x": 32, - "y": 48 - }, - "states": [ - { - "name": "supermatter" - } - ] -} diff --git a/Resources/Textures/_LostParadise/Supermatter/supermatter.rsi/supermatter.png b/Resources/Textures/_LostParadise/Supermatter/supermatter.rsi/supermatter.png deleted file mode 100644 index b8fa4defeb76c0deaca66924f60cf5932bd35d79..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2702 zcmV;93UT#`P)%skX)DSvI%N78QEE~ zggtR=8t2Kv8382FzfWCO2TG!IzXR?D%(nlRg|jgrFd2x`FHEl!Oh0r9YSrGvrt@Oq zYycLZ-}FA#`4U?7*8vr^V%`76!h!(KO#f_C6b1e8Zq)LI>85jL;Yuv-W1TNq z6ZG!3^Jd{p02WmLT#I$CLaTmfZu2>@a9RKh(|>yJ2lj^mP^+#2&MzYtV&Js&$2wP? z(Hs5H%cxaXCN|Atp(eXo)MPiSaR&j=7FcT@{fSSZm>E%44`$7{0LTV% zfuled@G+1Dq@Ruf1+WWM!H^QqeUBg|G&J9AdA*SLJ=_0ENz?VjI$uIR;sGfEQUkt| zALP3iW9mr(Lr4F(;~=nNApi;rAZHreHa`eJ>5>a@UX(M>`?gnyXt<(a)km_Zdmr8{B{+ST1E5u|LkNK?OgVLULkRH< z#f?q$z1o8E{7#A+51>}tky3(j8z>{-ib3d|*&_7&{Qv|40rIm_$agQsnV*iMItzeH zZ~X~U{s90frS&rmNnL#&hGAeBhShIKiPsaPXU7VpybHLK{^wWm{@)u|f8`4Rqq6{v zjg5kYv9U0QDIf}$XEFFuh~ma3rVhP=ly^~g+fR9;^_T@(qQCyx1 zNTv?eGw`o3F@2bhPe_2syfly*#NAq&jTRV zwR=`SfFcxzMo#f~hnvYM31G|vuwr>NB_-wDv#W^E$Da$!)*GuogMc^FpN9^ z$1DaE1(NKNM{kz?YWp%xeo7^7K9KOFSnR$ z3PHOkh^su6CE2N{<^KV(1q>71EC6=9LUmOcOY#QDU6zTes_427fU2t2g7pm!3`6I# zh622vARP}p#$~tPh<8g1^|${F+1+N%duvZWst}Yq7vWr)$5i(QM8%812*Rb$9LGYD zq$Vpgt$2-`r57TlM32W$N=g6zAOi2Aq2s8|GGiRqf^O&-QZjYu6_oOZnHr(% z)Yj$VsLrB)e-PDu8G82yj<;^W=zZra767{qQcY#fie;h(iW@i5e!q+2#wIJqO*dCt zDNB4_tZO%FMVqCK=~_~B&G+!{dX5h|25H(91qf=1;@kEM8@bCeF$@F$!C{0DmIk!S zb$IT31Xp1O-YqTE-f{yR+>Za?Fg5E-@NQ|rRhVIw=AIoZt9(atJ^(8X`j@N;K zozEbIN{2T@U40%xRdF?L#J}rV0wWVNZ?lo_P&hRq**m=1m{$k-hDN!#b_oLqLI|N? z7&Eb)j=87pIJI@TbhI7=V9ojxtKaJhm|0*LRvqZuxr4ySINRQ>WHNe`Xl!Ob0cJ)_ z#XuSoXMP%QzS_ggWkAw?|5jXu8MJ!>R%^Q_fXk7N%aP6-t;go|*VX6I>mS8cm_e_9 zl$c@g(47&Ilfb6V0U#wzL>2CMLc@PzoD$~+^bL(s^xcgVH#W^B2{3DZuRlz$KRl~# zZGB#R^Kg9gFkidE#p)aOp_bOL=kYx3c4-|-RtTa~Fg7mf2yNg}<-aT~TErU<|!@cU~9$XR+Jt0!Z4 zJwa;ga;&%(m#5-#q@z`?Bih-TAl$HZA?fvxQhU`>1`eE{aCsKT4~^g-j_~uXF>>;j z^4VB7i>BsiAUR1PJyr7bU3T)yG68T@XU8uSW}QfUmG?cn9o5}{x~!I9_a|s}L4RP3 zUVoUH^(Ab7u#;YYm^XL#;JkV-UtY6>hi}xFios-5lK9NiYO-uHv zeWizz$_!RtUIf6=*CgTZn1DFb(QJaD z;c;B<6i^ftp^%gkzkn(r4TEESLGJFokl!|b%JHrdYH#`>#*uc8ca0!ag}})Pa*plg zo3}(r&G1>Vw?eRYc(ZV>kcXNDr99Km; z#TDrs4@J1+FB<-#QT%~X9`;tCC=m0#hFbbJ^4*zSe{YmOx0SQzx&VVipAns6o@oFR zlajGP&1qnwa8JP;7hK;!A^Pl)idwV-g8?TjacLjDEB-%U0*AKp5^-~ Date: Mon, 26 Aug 2024 17:19:30 +0300 Subject: [PATCH 2/3] merge --- .../Entities/Structures/Machines/lathe.yml | 2 +- .../Entities/Objects/Devices/machineboard.yml | 128 +++++++++--------- 2 files changed, 65 insertions(+), 65 deletions(-) diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 7e1f1b4a5a..71bda7976c 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -244,7 +244,7 @@ parent: BaseLathe name: protolathe description: Converts raw materials into useful objects. - noSpawn: false #проверка + noSpawn: false components: - type: Sprite sprite: Structures/Machines/protolathe.rsi diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Devices/machineboard.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Devices/machineboard.yml index 276588ca14..1ec96ef51d 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Objects/Devices/machineboard.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Objects/Devices/machineboard.yml @@ -1,67 +1,67 @@ -- type: entity - id: LPPProtolatheENGMachineCircuitboard - parent: BaseMachineCircuitboard - name: инженерный протолат (машинная плата) - description: Плата для создания инженерного протолата. - components: - - type: MachineBoard - prototype: LPPprotolatheENG - stackRequirements: - MatterBin: 2 - Manipulator: 2 - tagRequirements: - GlassBeaker: - amount: 2 - defaultPrototype: Beaker - -- type: entity - id: LPPProtolatheRnDMachineCircuitboard - parent: BaseMachineCircuitboard - name: научный протолат (машинная плата) - description: Плата для создания научного протолата. - components: - - type: MachineBoard - prototype: LPPprotolatheRnD - stackRequirements: - MatterBin: 2 - Manipulator: 2 - tagRequirements: - GlassBeaker: - amount: 2 - defaultPrototype: Beaker - -- type: entity - id: LPPProtolatheSUPMachineCircuitboard - parent: BaseMachineCircuitboard - name: протолат снабжения (машинная плата) - description: Плата для создания протолата снабжения. - components: - - type: MachineBoard - prototype: LPPSupProtolathe - stackRequirements: - MatterBin: 2 - Manipulator: 2 - tagRequirements: - GlassBeaker: - amount: 2 - defaultPrototype: Beaker - -- type: entity - id: LPPProtolatheServiceMachineCircuitboard - parent: BaseMachineCircuitboard - name: сервисный протолат (машинная плата) - description: Плата для создания сервисного протолата. - components: - - type: MachineBoard - prototype: LPPServiceProtolathe - stackRequirements: - MatterBin: 2 - Manipulator: 2 - tagRequirements: - GlassBeaker: - amount: 2 - defaultPrototype: Beaker - +# - type: entity +# id: LPPProtolatheENGMachineCircuitboard +# parent: BaseMachineCircuitboard +# name: инженерный протолат (машинная плата) +# description: Плата для создания инженерного протолата. +# components: +# - type: MachineBoard +# prototype: LPPprotolatheENG +# stackRequirements: +# MatterBin: 2 +# Manipulator: 2 +# tagRequirements: +# GlassBeaker: +# amount: 2 +# defaultPrototype: Beaker +# +# - type: entity +# id: LPPProtolatheRnDMachineCircuitboard +# parent: BaseMachineCircuitboard +# name: научный протолат (машинная плата) +# description: Плата для создания научного протолата. +# components: +# - type: MachineBoard +# prototype: LPPprotolatheRnD +# stackRequirements: +# MatterBin: 2 +# Manipulator: 2 +# tagRequirements: +# GlassBeaker: +# amount: 2 +# defaultPrototype: Beaker +# +# - type: entity +# id: LPPProtolatheSUPMachineCircuitboard +# parent: BaseMachineCircuitboard +# name: протолат снабжения (машинная плата) +# description: Плата для создания протолата снабжения. +# components: +# - type: MachineBoard +# prototype: LPPSupProtolathe +# stackRequirements: +# MatterBin: 2 +# Manipulator: 2 +# tagRequirements: +# GlassBeaker: +# amount: 2 +# defaultPrototype: Beaker +# +# - type: entity +# id: LPPProtolatheServiceMachineCircuitboard +# parent: BaseMachineCircuitboard +# name: сервисный протолат (машинная плата) +# description: Плата для создания сервисного протолата. +# components: +# - type: MachineBoard +# prototype: LPPServiceProtolathe +# stackRequirements: +# MatterBin: 2 +# Manipulator: 2 +# tagRequirements: +# GlassBeaker: +# amount: 2 +# defaultPrototype: Beaker +# - type: entity id: LPPSpaceForgeBoard parent: BaseMachineCircuitboard From 647a483de826f9f8d009bc7fc4fcc39129a36391 Mon Sep 17 00:00:00 2001 From: SpicyDarkFox Date: Mon, 26 Aug 2024 17:30:28 +0300 Subject: [PATCH 3/3] =?UTF-8?q?=D1=81=D1=82=D1=80=D0=B0=D0=BD=D0=BD=D1=8B?= =?UTF-8?q?=D0=B9=20=D0=BC=D0=B5=D1=80=D0=B4=D0=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Specific/Supermatter/supermatter.yml | 65 ------------------- 1 file changed, 65 deletions(-) delete mode 100644 Resources/Prototypes/_LostParadise/Entities/Structures/Specific/Supermatter/supermatter.yml diff --git a/Resources/Prototypes/_LostParadise/Entities/Structures/Specific/Supermatter/supermatter.yml b/Resources/Prototypes/_LostParadise/Entities/Structures/Specific/Supermatter/supermatter.yml deleted file mode 100644 index d6ea8d43df..0000000000 --- a/Resources/Prototypes/_LostParadise/Entities/Structures/Specific/Supermatter/supermatter.yml +++ /dev/null @@ -1,65 +0,0 @@ -# - type: entity -# id: LPPSupermatter -# name: суперматерия -# description: Странно прозрачный и переливающийся кристалл. Кристаллическая гиперструктура. -# placement: -# mode: SnapgridCenter -# components: -# - type: Sprite -# drawdepth: WallMountedItems -# sprite: _LostParadise/Supermatter/supermatter.rsi -# state: supermatter -# - type: Icon -# sprite: _LostParadise/Supermatter/supermatter.rsi -# state: supermatter -# - type: Clickable -# - type: InteractionOutline -# - type: Transform -# anchored: true -# noRot: true -# - type: Fixtures -# fixtures: -# fix1: -# shape: -# !type:PhysShapeAabb -# bounds: "-0.25,-0.25,0.25,0.25" -# density: 600 -# mask: -# - FullTileMask -# layer: -# - WallLayer -# - type: Physics -# bodyType: Dynamic -# - type: Explosive -# explosionType: Supermatter -# maxIntensity: 10000 -# intensitySlope: 10 -# totalIntensity: 10000 -# - type: PointLight -# enabled: true -# radius: 10 -# energy: 5 -# color: "#d9ce00" -# - type: Supermatter -# whitelist: -# tags: -# - EmitterBolt -# components: -# - Body -# - Item -# - type: AmbientSound -# range: 5 -# volume: -5 -# sound: -# path: /Audio/_LostParadise/Supermatter/calm.ogg -# - type: Speech -# speechVerb: Robotic -# - type: CollisionWake -# enabled: false -# - type: WarpPoint -# follow: true -# location: Supermatter -# - type: Appearance -# - type: RadiationSource -# intensity: 2 -