From f704d9bff7d022091a44b73511e87bf06b309f05 Mon Sep 17 00:00:00 2001 From: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Date: Tue, 28 Jan 2025 03:55:51 +0100 Subject: [PATCH 1/4] add binoculars --- .../Markers/Spawners/Random/maintenance.yml | 1 + .../Entities/Objects/Tools/binoculars.yml | 24 ++++++++++++++ .../Objects/Tools/binoculars.rsi/icon.png | Bin 0 -> 611 bytes .../Tools/binoculars.rsi/inhand-left.png | Bin 0 -> 295 bytes .../Tools/binoculars.rsi/inhand-right.png | Bin 0 -> 295 bytes .../Objects/Tools/binoculars.rsi/meta.json | 30 ++++++++++++++++++ .../binoculars.rsi/wielded-inhand-left.png | Bin 0 -> 421 bytes .../binoculars.rsi/wielded-inhand-right.png | Bin 0 -> 421 bytes 8 files changed, 55 insertions(+) create mode 100644 Resources/Prototypes/Entities/Objects/Tools/binoculars.yml create mode 100644 Resources/Textures/Objects/Tools/binoculars.rsi/icon.png create mode 100644 Resources/Textures/Objects/Tools/binoculars.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Tools/binoculars.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Tools/binoculars.rsi/meta.json create mode 100644 Resources/Textures/Objects/Tools/binoculars.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/Objects/Tools/binoculars.rsi/wielded-inhand-right.png diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml index 96cf75d9351d..0ff3c2776cbf 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml @@ -280,6 +280,7 @@ - !type:GroupSelector weight: 2 children: + - id: Binoculars - id: LanternFlash - id: PowerCellHigh - id: NetProbeCartridge diff --git a/Resources/Prototypes/Entities/Objects/Tools/binoculars.yml b/Resources/Prototypes/Entities/Objects/Tools/binoculars.yml new file mode 100644 index 000000000000..145f6bd5e4d5 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Tools/binoculars.yml @@ -0,0 +1,24 @@ +- type: entity + name: binoculars + parent: BaseItem + id: Binoculars + description: Used for long-distance surveillance. + components: + - type: Sprite + sprite: Objects/Tools/binoculars.rsi + state: icon + - type: Item + size: Normal + - type: Wieldable + - type: UseDelay + delay: 1.0 + - type: CursorOffsetRequiresWield + - type: EyeCursorOffset + maxOffset: 3 + pvsIncrease: 0.3 + - type: PhysicalComposition + materialComposition: + Steel: 100 + Glass: 50 + - type: StaticPrice + price: 100 diff --git a/Resources/Textures/Objects/Tools/binoculars.rsi/icon.png b/Resources/Textures/Objects/Tools/binoculars.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..ee368b680dfc3424f7176c18abb0a9f334f1c313 GIT binary patch literal 611 zcmV-p0-XJcP)_q((fuuMTRg1fcg0LI!%v^&`C5(;jJJ8*bDB{ z^1>K>#CmBcK1_FO2h^-}S4^jn#Fc8F>I7ik*JxD07-^f>?g4-_LcUG%uFlia;RTx) z`#~%Vgwi0%RKmOuD)vC?^LssRlDJ8-NU>{-Je2~(&ud{Us-`BC1yiv!Fh*?)^$oEk zWMkeNDk%YAz>P%7r9pr2PM6J}t}ofx>Cz~9pSBNxxFTCY9R_9+OJgSN8YTP4=h?!p zwiZ0jx&dLo2TBk{;bt0N zJmhphVVaz~H}Cb+Txo#<#hj z@4ddkIQ90Hw@=HT2rAexa`-bG5^ngwf`hpykTGt*L;csEIUx+sD(&>Pr$+iI^KgH- zwolnl@elWbmn;bv-aX%!a&84fs=Z$iSHLuw`^@94W#bA{6%2u%WbkzLb6Mw<&;$VD Cf@-G# literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tools/binoculars.rsi/inhand-right.png b/Resources/Textures/Objects/Tools/binoculars.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..fd6ca1a7e3bbb0cdac9b13bd7407e666152c4c31 GIT binary patch literal 295 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fAQ1GUw zi(^Q|oVPbO@-`cYus!UavQVPMP_kvMP}3w0)=9mWKa~8x9?&qMcGKM-eKAZ5(-}^v zG8Az(pfFAD+21=a{k5cb?@p#=nYZeM5Z*Ys{O&5N` zBB-o$@FHi5ZZ- z_L#7i^-Q{P_4hA5f1R6;9<|)F@o$9QaS?t!(R9zDz2!5VY> zce2WfC43*$XTLh){zVLEB14f1!xImN6B8LGC^IU!Gdc9JK&(QM*vQHe{GlE%ZlA{Bv*Z5 bs$+bxHP^TIy3Z6~xHEXV`njxgN@xNAXK||_ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tools/binoculars.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Tools/binoculars.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..d91a914e442ac3caaa102130f418ae578760c041 GIT binary patch literal 421 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|R5Y zr;B4q#hkaZ484vxNVLv3;BY&^sIpD-(%X5C0wN;b+WLt*BOM5Z*Ys{O&5N` zBB-o$@FHi5ZZ- z_L#7i^-Q{P_4hA5f1R6;9<|)F@o$9QaS?t!(R9zDz2!5VY> zce2WfC43*$XTLh){zVLEB14f1!xImN6B8LGC^IU!Gdc9JK&(QM*vQHe{GlE%ZlA{Bv*Z5 bs$+bxHP^TIy3Z6~xHEXV`njxgN@xNAXK||_ literal 0 HcmV?d00001 From 109a81f80143d8826aefe7fda7143243278b7c67 Mon Sep 17 00:00:00 2001 From: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Date: Tue, 28 Jan 2025 10:56:34 +0100 Subject: [PATCH 2/4] tabs evil --- .../Textures/Objects/Tools/binoculars.rsi/meta.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Resources/Textures/Objects/Tools/binoculars.rsi/meta.json b/Resources/Textures/Objects/Tools/binoculars.rsi/meta.json index e2471afeb13d..ab90b393773f 100644 --- a/Resources/Textures/Objects/Tools/binoculars.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/binoculars.rsi/meta.json @@ -12,19 +12,19 @@ }, { "name": "inhand-left", - "directions": 4 + "directions": 4 }, { "name": "inhand-right", - "directions": 4 + "directions": 4 }, { "name": "wielded-inhand-left", - "directions": 4 + "directions": 4 }, { "name": "wielded-inhand-right", - "directions": 4 + "directions": 4 } ] -} \ No newline at end of file +} From 03c011213dfa150ad39960b84cddb73292820459 Mon Sep 17 00:00:00 2001 From: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Date: Tue, 28 Jan 2025 11:04:17 +0100 Subject: [PATCH 3/4] give one to warden --- Resources/Prototypes/Catalog/Fills/Lockers/security.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml index 01038f419607..93ea12404e5c 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml @@ -48,6 +48,7 @@ amount: 2 - id: RemoteSignaller amount: 2 + - id: Binoculars - type: entity id: LockerSecurityFilled From b09f03ef5baba3e59800c21cbd8960b6154b37d6 Mon Sep 17 00:00:00 2001 From: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Date: Tue, 28 Jan 2025 11:04:25 +0100 Subject: [PATCH 4/4] buff --- Resources/Prototypes/Entities/Objects/Tools/binoculars.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Tools/binoculars.yml b/Resources/Prototypes/Entities/Objects/Tools/binoculars.yml index 145f6bd5e4d5..06712e67defe 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/binoculars.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/binoculars.yml @@ -14,8 +14,8 @@ delay: 1.0 - type: CursorOffsetRequiresWield - type: EyeCursorOffset - maxOffset: 3 - pvsIncrease: 0.3 + maxOffset: 5 + pvsIncrease: 0.5 - type: PhysicalComposition materialComposition: Steel: 100