diff --git a/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml b/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml index d3dd8061e26..763faafe497 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml @@ -69,7 +69,7 @@ enabled: false radius: 3 energy: 1 - mask: /Textures/Effects/LightMasks/cone.png + mask: /Textures/_Scp/Effects/LightMasks/cone.png autoRot: true netsync: false - type: Appearance @@ -225,7 +225,7 @@ enabled: false radius: 3 energy: 2 - mask: /Textures/Effects/LightMasks/cone.png + mask: /Textures/_Scp/Effects/LightMasks/cone.png autoRot: true netsync: false - type: Appearance diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardhats.yml b/Resources/Prototypes/Entities/Clothing/Head/hardhats.yml index dbcb84ed1d4..3cca7f628fe 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hardhats.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hardhats.yml @@ -14,7 +14,7 @@ equippedPrefix: off - type: PointLight enabled: false - mask: /Textures/Effects/LightMasks/cone.png + mask: /Textures/_Scp/Effects/LightMasks/cone.png autoRot: true radius: 7 netsync: false diff --git a/Resources/Prototypes/Entities/Clothing/Head/misc.yml b/Resources/Prototypes/Entities/Clothing/Head/misc.yml index 53b49625736..56ba9abec75 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/misc.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/misc.yml @@ -71,7 +71,7 @@ enabled: false radius: 3 energy: 1 - mask: /Textures/Effects/LightMasks/cone.png + mask: /Textures/_Scp/Effects/LightMasks/cone.png autoRot: true color: "#cc6600" netsync: false diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml index 230875c343b..48e4a5d2a86 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml @@ -312,7 +312,7 @@ color: "#80ff80" radius: 5 energy: 2 - mask: /Textures/Effects/LightMasks/cone.png + mask: /Textures/_Scp/Effects/LightMasks/cone.png autoRot: true netsync: false - type: LightBehaviour diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml index 41a2a82b6ca..8ebe801f083 100644 --- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml +++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml @@ -244,7 +244,7 @@ spriteLayer: light - type: PointLight enabled: false - mask: /Textures/Effects/LightMasks/cone.png + mask: /Textures/_Scp/Effects/LightMasks/cone.png autoRot: true energy: 2 # Sunrise-edit radius: 12 # Sunrise-edit diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml index 1455762290b..83883b93e5b 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml @@ -476,7 +476,7 @@ enabled: false radius: 3.5 softness: 2 - mask: /Textures/Effects/LightMasks/cone.png + mask: /Textures/_Scp/Effects/LightMasks/cone.png autoRot: true - type: FootstepModifier footstepSoundCollection: diff --git a/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml b/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml index 04be6693694..34a412cd71f 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml @@ -52,7 +52,7 @@ enabled: false radius: 2.5 softness: 5 - mask: /Textures/Effects/LightMasks/cone.png + mask: /Textures/_Scp/Effects/LightMasks/cone.png autoRot: true - type: Tag tags: diff --git a/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml b/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml index 19728ac7713..611ae3246fb 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml @@ -201,7 +201,7 @@ bounds: "-0.6,-0.6, 0.6, 0.6" - type: PointLight enabled: false - mask: /Textures/Effects/LightMasks/cone.png + mask: /Textures/_Scp/Effects/LightMasks/cone.png autoRot: true energy: 3 # Sunrise-edit radius: 18 # Sunrise-edit @@ -500,7 +500,7 @@ baseWalkSpeed: 2.5 baseSprintSpeed: 4 - type: PointLight - mask: /Textures/Effects/LightMasks/cone.png + mask: /Textures/_Scp/Effects/LightMasks/cone.png autoRot: true radius: 5 energy: 5 @@ -590,7 +590,7 @@ allowRevives: true - type: PointLight enabled: false - mask: /Textures/Effects/LightMasks/cone.png + mask: /Textures/_Scp/Effects/LightMasks/cone.png autoRot: true radius: 8 netsync: false diff --git a/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml b/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml index 6fd27c43023..3b17a178549 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml @@ -60,7 +60,7 @@ storedRotation: -90 - type: PointLight enabled: false - mask: /Textures/Effects/LightMasks/cone.png + mask: /Textures/_Scp/Effects/LightMasks/cone.png autoRot: true radius: 6 netsync: false diff --git a/Resources/Prototypes/Entities/Structures/Decoration/decorated_fir_tree.yml b/Resources/Prototypes/Entities/Structures/Decoration/decorated_fir_tree.yml index b2806b93c99..28bb3056e7c 100644 --- a/Resources/Prototypes/Entities/Structures/Decoration/decorated_fir_tree.yml +++ b/Resources/Prototypes/Entities/Structures/Decoration/decorated_fir_tree.yml @@ -15,7 +15,7 @@ radius: 1.6 energy: 1.2 enabled: false - mask: /Textures/Effects/LightMasks/cone.png + mask: /Textures/_Scp/Effects/LightMasks/cone.png autoRot: true offset: "0, 0.6" - type: Damageable diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/base_structurecomputers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/base_structurecomputers.yml index 39964b7b643..410e1314a45 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/Computers/base_structurecomputers.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/base_structurecomputers.yml @@ -63,7 +63,7 @@ radius: 1.5 energy: 1.6 enabled: false - mask: /Textures/Effects/LightMasks/cone.png + mask: /Textures/Effects/LightMasks/soft_cone.png autoRot: true offset: "0, 0.4" # shine from the top, not bottom of the computer castShadows: false diff --git a/Resources/Prototypes/Entities/Structures/Power/apc.yml b/Resources/Prototypes/Entities/Structures/Power/apc.yml index 0addb347043..325fb892893 100644 --- a/Resources/Prototypes/Entities/Structures/Power/apc.yml +++ b/Resources/Prototypes/Entities/Structures/Power/apc.yml @@ -15,11 +15,15 @@ sound: path: /Audio/Ambience/Objects/hdd_buzz.ogg - type: PointLight - radius: 1.5 - energy: 1.6 + # Fire edit start - для красоты + маска + radius: 2 + energy: 0.5 color: "#3db83b" castShadows: false netsync: false + mask: /Textures/_Scp/Effects/LightMasks/cone.png + autoRot: true + # Fire edit end - type: AccessReader access: [["Engineering"]] - type: Sprite diff --git a/Resources/Prototypes/Entities/Structures/Shuttles/thrusters.yml b/Resources/Prototypes/Entities/Structures/Shuttles/thrusters.yml index 681077b130c..b5751ed60af 100644 --- a/Resources/Prototypes/Entities/Structures/Shuttles/thrusters.yml +++ b/Resources/Prototypes/Entities/Structures/Shuttles/thrusters.yml @@ -171,7 +171,7 @@ radius: 1.3 energy: 0.8 enabled: false - mask: /Textures/Effects/LightMasks/cone.png + mask: /Textures/_Scp/Effects/LightMasks/cone.png autoRot: true offset: "0, 0.1" # shine from the top, not bottom of the computer color: "#4246b3" diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/armor.yml index f5a4c145ed1..1d478cc4bb6 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/armor.yml @@ -152,7 +152,7 @@ color: "#00FFFFFF" radius: 5 energy: 2 - mask: /Textures/Effects/LightMasks/cone.png + mask: /Textures/_Scp/Effects/LightMasks/cone.png autoRot: true netsync: false - type: LightBehaviour @@ -209,7 +209,7 @@ color: "#00FFFFFF" radius: 5 energy: 2 - mask: /Textures/Effects/LightMasks/cone.png + mask: /Textures/_Scp/Effects/LightMasks/cone.png autoRot: true netsync: false - type: LightBehaviour @@ -266,7 +266,7 @@ color: "#FFC458FF" radius: 5 energy: 2 - mask: /Textures/Effects/LightMasks/cone.png + mask: /Textures/_Scp/Effects/LightMasks/cone.png autoRot: true netsync: false - type: LightBehaviour @@ -323,7 +323,7 @@ color: "#00FFFFFF" radius: 5 energy: 2 - mask: /Textures/Effects/LightMasks/cone.png + mask: /Textures/_Scp/Effects/LightMasks/cone.png autoRot: true netsync: false - type: LightBehaviour @@ -380,7 +380,7 @@ color: "#ADFFECFF" radius: 5 energy: 2 - mask: /Textures/Effects/LightMasks/cone.png + mask: /Textures/_Scp/Effects/LightMasks/cone.png autoRot: true netsync: false - type: LightBehaviour @@ -437,7 +437,7 @@ color: "#CBADFFFF" radius: 5 energy: 2 - mask: /Textures/Effects/LightMasks/cone.png + mask: /Textures/_Scp/Effects/LightMasks/cone.png autoRot: true netsync: false - type: LightBehaviour diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/mechs.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/mechs.yml index 60fe7c3aaf9..af02e827360 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/mechs.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/mechs.yml @@ -114,7 +114,7 @@ bounds: "-0.6,-0.6, 0.6, 0.6" - type: PointLight enabled: false - mask: /Textures/Effects/LightMasks/cone.png + mask: /Textures/_Scp/Effects/LightMasks/cone.png autoRot: true radius: 30 energy: 3 diff --git a/Resources/Textures/_Scp/Effects/LightMasks/cone.png b/Resources/Textures/_Scp/Effects/LightMasks/cone.png new file mode 100644 index 00000000000..4bb29579348 Binary files /dev/null and b/Resources/Textures/_Scp/Effects/LightMasks/cone.png differ