From b83980773fc6a81d38227e1c961f4e2d1a42949f Mon Sep 17 00:00:00 2001 From: Chubbygummibear Date: Wed, 11 Dec 2024 11:31:36 -0800 Subject: [PATCH 1/7] prototypes updated --- .../Entities/Clothing/Head/base_clothinghead.yml | 4 ++-- .../Prototypes/Entities/Clothing/Head/hardhats.yml | 2 +- .../Prototypes/Entities/Clothing/Head/helmets.yml | 2 +- Resources/Prototypes/Entities/Clothing/Head/misc.yml | 2 +- .../Entities/Clothing/OuterClothing/armor.yml | 3 +-- .../Entities/Mobs/Cyborgs/base_borg_chassis.yml | 2 +- Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml | 2 +- Resources/Prototypes/Entities/Mobs/base.yml | 1 + .../Entities/Objects/Misc/subdermal_implants.yml | 2 +- .../Entities/Objects/Tools/flashlights.yml | 2 +- .../Structures/Decoration/decorated_fir_tree.yml | 2 +- .../Entities/Structures/Lighting/base_lighting.yml | 2 +- .../Entities/Structures/Lighting/strobe_lighting.yml | 2 +- .../Machines/Computers/base_structurecomputers.yml | 2 +- .../Prototypes/Entities/Structures/Machines/nuke.yml | 2 +- .../Entities/Structures/Shuttles/thrusters.yml | 2 +- Resources/Prototypes/light_mask.yml | 12 ++++++++++++ 17 files changed, 29 insertions(+), 17 deletions(-) create mode 100644 Resources/Prototypes/light_mask.yml diff --git a/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml b/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml index 46fe9ef09df3..4adb8e8a56ff 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml @@ -63,7 +63,7 @@ enabled: false radius: 3 energy: 1 - mask: /Textures/Effects/LightMasks/cone.png + lightMask: ConeSingle autoRot: true netsync: false - type: Appearance @@ -198,7 +198,7 @@ enabled: false radius: 3 energy: 2 - mask: /Textures/Effects/LightMasks/cone.png + lightMask: ConeSingle 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 15cda5a69f76..460139893a38 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 + lightMask: ConeSingle autoRot: true radius: 7 netsync: false diff --git a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml index 11643c076d84..705dadaa6bce 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml @@ -464,7 +464,7 @@ energy: 1.4 color: red netsync: false - mask: /Textures/Effects/LightMasks/double_cone.png + lightMask: ConeDouble - type: RotatingLight speed: 360 - type: PowerCellSlot diff --git a/Resources/Prototypes/Entities/Clothing/Head/misc.yml b/Resources/Prototypes/Entities/Clothing/Head/misc.yml index 254eaf37c80f..d555bd9012a7 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/misc.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/misc.yml @@ -66,7 +66,7 @@ enabled: false radius: 3 energy: 1 - mask: /Textures/Effects/LightMasks/cone.png + lightMask: ConeSingle 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 2412dd9d5c32..9f310bb658dc 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml @@ -144,7 +144,7 @@ color: "#80ff80" radius: 5 energy: 2 - mask: /Textures/Effects/LightMasks/cone.png + lightMask: ConeSingle autoRot: true netsync: false - type: LightBehaviour @@ -359,4 +359,3 @@ - type: GroupExamine - type: ProtectedFromStepTriggers slots: WITHOUT_POCKET - diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml index 0db92ac941d4..06d6d76dede6 100644 --- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml +++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml @@ -217,7 +217,7 @@ - type: ToggleableLightVisuals - type: PointLight enabled: false - mask: /Textures/Effects/LightMasks/cone.png + lightMask: ConeSingle autoRot: true radius: 4 netsync: false diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml index 5883790b6658..059229094184 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml @@ -431,7 +431,7 @@ enabled: false radius: 3.5 softness: 2 - mask: /Textures/Effects/LightMasks/cone.png + lightMask: ConeSingle autoRot: true - type: FootstepModifier footstepSoundCollection: diff --git a/Resources/Prototypes/Entities/Mobs/base.yml b/Resources/Prototypes/Entities/Mobs/base.yml index bf7c72c46d9d..586bbadc3974 100644 --- a/Resources/Prototypes/Entities/Mobs/base.yml +++ b/Resources/Prototypes/Entities/Mobs/base.yml @@ -43,6 +43,7 @@ - type: MovementSpeedModifier - type: RequireProjectileTarget active: False + - type: LightSensitive - type: entity save: false diff --git a/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml b/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml index 28788e9a1376..3b490526c5c2 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml @@ -45,7 +45,7 @@ enabled: false radius: 2.5 softness: 5 - mask: /Textures/Effects/LightMasks/cone.png + lightMask: ConeSingle autoRot: true - type: Tag tags: diff --git a/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml b/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml index 6d36e24bc124..58be4b814243 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml @@ -59,7 +59,7 @@ storedRotation: -90 - type: PointLight enabled: false - mask: /Textures/Effects/LightMasks/cone.png + lightMask: ConeSingle 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 b2806b93c997..10a84b3bac95 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 + lightMask: ConeSingle autoRot: true offset: "0, 0.6" - type: Damageable diff --git a/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml b/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml index 99973845a9f3..759fdb01f169 100644 --- a/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml +++ b/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml @@ -377,7 +377,7 @@ energy: 0.6 offset: "0, 0.4" color: "#7CFC00" - mask: /Textures/Effects/LightMasks/double_cone.png + lightMask: ConeDouble - type: ApcPowerReceiver - type: ExtensionCableReceiver - type: Battery diff --git a/Resources/Prototypes/Entities/Structures/Lighting/strobe_lighting.yml b/Resources/Prototypes/Entities/Structures/Lighting/strobe_lighting.yml index 1a99ab6f1017..c87894703e48 100644 --- a/Resources/Prototypes/Entities/Structures/Lighting/strobe_lighting.yml +++ b/Resources/Prototypes/Entities/Structures/Lighting/strobe_lighting.yml @@ -31,7 +31,7 @@ shader: unshaded state: base - type: PointLight - mask: /Textures/Effects/LightMasks/double_cone.png + lightMask: ConeDouble color: "#FFE4CE" energy: 5 radius: 10 diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/base_structurecomputers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/base_structurecomputers.yml index d79348bfa612..a615fff6650a 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/Computers/base_structurecomputers.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/base_structurecomputers.yml @@ -51,7 +51,7 @@ radius: 1.5 energy: 1.6 enabled: false - mask: /Textures/Effects/LightMasks/cone.png + lightMask: ConeSingle autoRot: true offset: "0, 0.4" # shine from the top, not bottom of the computer castShadows: false diff --git a/Resources/Prototypes/Entities/Structures/Machines/nuke.yml b/Resources/Prototypes/Entities/Structures/Machines/nuke.yml index ec9e5bdfa588..41b841c11d76 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/nuke.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/nuke.yml @@ -66,7 +66,7 @@ radius: 4 energy: 2.0 color: "#FF4020" - mask: /Textures/Effects/LightMasks/double_cone.png + lightMask: ConeDouble - type: RotatingLight speed: 120 - type: NavMapBeacon diff --git a/Resources/Prototypes/Entities/Structures/Shuttles/thrusters.yml b/Resources/Prototypes/Entities/Structures/Shuttles/thrusters.yml index fa8b382ade8a..82b42999bbef 100644 --- a/Resources/Prototypes/Entities/Structures/Shuttles/thrusters.yml +++ b/Resources/Prototypes/Entities/Structures/Shuttles/thrusters.yml @@ -167,7 +167,7 @@ radius: 1.3 energy: 0.8 enabled: false - mask: /Textures/Effects/LightMasks/cone.png + lightMask: ConeSingle autoRot: true offset: "0, 0.1" # shine from the top, not bottom of the computer color: "#4246b3" diff --git a/Resources/Prototypes/light_mask.yml b/Resources/Prototypes/light_mask.yml new file mode 100644 index 000000000000..a856d1877c29 --- /dev/null +++ b/Resources/Prototypes/light_mask.yml @@ -0,0 +1,12 @@ +- type: lightMask + id: ConeSingle + maskPath: /Textures/Effects/LightMasks/cone.png + cones: + - { direction: 0, innerWidth: 30, outerWidth: 60 } + +- type: lightMask + id: ConeDouble + maskPath: /Textures/Effects/LightMasks/double_cone.png + cones: + - { direction: 0, innerWidth: 30, outerWidth: 60 } + - { direction: 180, innerWidth: 30, outerWidth: 60 } \ No newline at end of file From 057680d1ca6679d406b13cbce8ca8bff8e18f8c7 Mon Sep 17 00:00:00 2001 From: Chubbygummibear Date: Fri, 20 Dec 2024 21:27:38 -0800 Subject: [PATCH 2/7] light mask var updated to actually match, removed comp from base mob because it shouldn't have that at default --- Resources/Prototypes/Entities/Mobs/base.yml | 1 - Resources/Prototypes/light_mask.yml | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/Entities/Mobs/base.yml b/Resources/Prototypes/Entities/Mobs/base.yml index 586bbadc3974..bf7c72c46d9d 100644 --- a/Resources/Prototypes/Entities/Mobs/base.yml +++ b/Resources/Prototypes/Entities/Mobs/base.yml @@ -43,7 +43,6 @@ - type: MovementSpeedModifier - type: RequireProjectileTarget active: False - - type: LightSensitive - type: entity save: false diff --git a/Resources/Prototypes/light_mask.yml b/Resources/Prototypes/light_mask.yml index a856d1877c29..06b9738c44ef 100644 --- a/Resources/Prototypes/light_mask.yml +++ b/Resources/Prototypes/light_mask.yml @@ -1,12 +1,12 @@ - type: lightMask id: ConeSingle maskPath: /Textures/Effects/LightMasks/cone.png - cones: + lightCones: - { direction: 0, innerWidth: 30, outerWidth: 60 } - type: lightMask id: ConeDouble maskPath: /Textures/Effects/LightMasks/double_cone.png - cones: + lightCones: - { direction: 0, innerWidth: 30, outerWidth: 60 } - { direction: 180, innerWidth: 30, outerWidth: 60 } \ No newline at end of file From 3b4d6efe79fc4725330d55f2299c440c50524963 Mon Sep 17 00:00:00 2001 From: Chubbygummibear Date: Fri, 20 Dec 2024 21:30:39 -0800 Subject: [PATCH 3/7] does that fix RT throwing a fit over the branch i'm using? --- RobustToolbox | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RobustToolbox b/RobustToolbox index 92b0e7f1a853..9b031b586381 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit 92b0e7f1a853979a1361ed24d2fb5ffc11f43f66 +Subproject commit 9b031b586381aeb0dc1c0a4cf87d17d8b1737746 From fb54b89e585a5fb41aefdf858b451129a46cf3af Mon Sep 17 00:00:00 2001 From: Chubbygummibear Date: Mon, 23 Dec 2024 13:44:48 -0800 Subject: [PATCH 4/7] oh wait does the RT target need to be committed to work --- RobustToolbox | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RobustToolbox b/RobustToolbox index 9b031b586381..9104ded18e03 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit 9b031b586381aeb0dc1c0a4cf87d17d8b1737746 +Subproject commit 9104ded18e03222d8239203f668762327f1e0a15 From 1418aee0cd8541e330b498dcb4e06648de57a0a0 Mon Sep 17 00:00:00 2001 From: Chubbygummibear Date: Tue, 24 Dec 2024 14:19:18 -0800 Subject: [PATCH 5/7] rt update --- RobustToolbox | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RobustToolbox b/RobustToolbox index 9104ded18e03..3f40141acb71 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit 9104ded18e03222d8239203f668762327f1e0a15 +Subproject commit 3f40141acb71e1e431213813471549140ec31c36 From 4b73f4c64e9fac193dcb5fae93ee9e6e461ef5dc Mon Sep 17 00:00:00 2001 From: Chubbygummibear Date: Tue, 24 Dec 2024 14:25:44 -0800 Subject: [PATCH 6/7] does this fix the conflict --- RobustToolbox | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RobustToolbox b/RobustToolbox index 3f40141acb71..a2aec44ebbfb 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit 3f40141acb71e1e431213813471549140ec31c36 +Subproject commit a2aec44ebbfb75118e24e36488546bbbd80a8608 From 8b5d2b0bff9bf0a685a06e6eb2aa2017ff96426c Mon Sep 17 00:00:00 2001 From: Chubbygummibear Date: Tue, 24 Dec 2024 14:33:37 -0800 Subject: [PATCH 7/7] PLEASE BE THE RIGHT VERSION --- RobustToolbox | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RobustToolbox b/RobustToolbox index a2aec44ebbfb..5e97db435c05 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit a2aec44ebbfb75118e24e36488546bbbd80a8608 +Subproject commit 5e97db435c05b4c188184ef90e5d77b0500403d0