added pets.yaml, added Pets texture folder, added Shopkeepers cat #642
+71
−0
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
I thought his name was fishfood... |
|
i looked around a little at other mobs but couldn’t find the code for different names on spawn o_O |
Peptide90
requested changes
Nov 1, 2024
| #MARK: Haggis | ||
| - type: entity | ||
| name: Haggis | ||
| id: N14MobCatShopkeep |
There was a problem hiding this comment.
Probably worth changing this to CatHaggis since it's the name people will search for
|
RSI Diff Bot; head commit 4af7554 merging into 308f909 Resources/Textures/_Nuclear14/Mobs/Pets/cathaggis.rsi
|
Peptide90
reviewed
Nov 2, 2024
| description: A little rough around the edges, but still cute as can be. | ||
| components: | ||
| - type: Sprite | ||
| - sprite: _Nuclear14\Mobs\Pets\cathaggis.rsi |
There was a problem hiding this comment.
You added a - here thats not needed
There was a problem hiding this comment.
oh I went to go fix it myself before seeing you'd already pushed an update, you're too kind as always Peppy.
Peptide90
reviewed
Nov 4, 2024
| description: A little rough around the edges, but still cute as can be. | ||
| components: | ||
| - type: Sprite | ||
| sprite: _Nuclear14\Mobs\Pets\cathaggis.rsi |
There was a problem hiding this comment.
[ERRO] go.comp.sprite: Unable to load RSI '/Textures/_Nuclear14\Mobs\Pets\cathaggis.rsi'.
slashes the wrong way
Peptide90
pushed a commit
that referenced
this pull request
Nov 11, 2024
# Description Cherry-picked from Delta-V, originally by @WarMechanic (DeltaV-Station/Delta-v#1455). Original Description: > Every pair of gloves now has its own fingerprint, so items can be traced back to gloves which can then be traced back to people. > > ## Why / Balance > > Evidence is very important to court cases running smoothly, so detectives now have more evidence that can certify whether or not John Syndicate's behaviour is valid. Traitors are now encouraged to either clean evidence off syndicate gear regardless of glove status, or use a disposable pair of gloves specifically for handling syndicate gear to be disposed of later. > > Aside from being required to obfuscate evidence you leave behind, there is now a value proposition to searching glove prints of departments. Wearing gloves that does not correspond your department can punish an unknowing detective into searching the wrong people. > > ## Technical details > > `FiberComponent.cs` now stores a Fiberprint variable like `FingerprintComponent.cs`. The code for assigning a fiberprint is the same as the fingerprint. When evidence is placed on an object, the fiberprint is concatenated to its localised fiber type. <details><summary><h1>Original Media</h1></summary> <p> > hm ok we have these specific gloves on an akms > <br> > > <img src="https://private-user-images.githubusercontent.com/69510347/345294367-55819ed3-1e89-401f-b7fb-0d8569bd7aa2.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MjI1NjU2ODYsIm5iZiI6MTcyMjU2NTM4NiwicGF0aCI6Ii82OTUxMDM0Ny8zNDUyOTQzNjctNTU4MTllZDMtMWU4OS00MDFmLWI3ZmItMGQ4NTY5YmQ3YWEyLnBuZz9YLUFtei1BbGdvcml0aG09QVdTNC1ITUFDLVNIQTI1NiZYLUFtei1DcmVkZW50aWFsPUFLSUFWQ09EWUxTQTUzUFFLNFpBJTJGMjAyNDA4MDIlMkZ1cy1lYXN0LTElMkZzMyUyRmF3czRfcmVxdWVzdCZYLUFtei1EYXRlPTIwMjQwODAyVDAyMjMwNlomWC1BbXotRXhwaXJlcz0zMDAmWC1BbXotU2lnbmF0dXJlPTYxZWUxMjZjY2FiMTU1ODdlOGFiNDliN2ZjZjg4MmYxZmY3ZWY0MGMzN2UxZWM1MjA2MjBlYjY1ZDQ2YTJjMGYmWC1BbXotU2lnbmVkSGVhZGVycz1ob3N0JmFjdG9yX2lkPTAma2V5X2lkPTAmcmVwb19pZD0wIn0.t5sASM_0is4bqd1YIizQ0lldAZ5RAStbNzXNuzHmdfU"> > > hm well we found the gloves and they have fingerprints > <br> > > <img src="https://private-user-images.githubusercontent.com/69510347/345294443-a9b21171-bee5-4c5f-8ec6-cf5576572d45.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MjI1NjU2ODYsIm5iZiI6MTcyMjU2NTM4NiwicGF0aCI6Ii82OTUxMDM0Ny8zNDUyOTQ0NDMtYTliMjExNzEtYmVlNS00YzVmLThlYzYtY2Y1NTc2NTcyZDQ1LnBuZz9YLUFtei1BbGdvcml0aG09QVdTNC1ITUFDLVNIQTI1NiZYLUFtei1DcmVkZW50aWFsPUFLSUFWQ09EWUxTQTUzUFFLNFpBJTJGMjAyNDA4MDIlMkZ1cy1lYXN0LTElMkZzMyUyRmF3czRfcmVxdWVzdCZYLUFtei1EYXRlPTIwMjQwODAyVDAyMjMwNlomWC1BbXotRXhwaXJlcz0zMDAmWC1BbXotU2lnbmF0dXJlPTM3ZTY3NjRhZmEzMjRhYTkwNjUyOWI3MzgzOGM0ZWRjY2Q3MTg0YzViN2NjMDQyZTgzMDBiMmZlZDAyYWJjYjUmWC1BbXotU2lnbmVkSGVhZGVycz1ob3N0JmFjdG9yX2lkPTAma2V5X2lkPTAmcmVwb19pZD0wIn0.uSn27Drf1K8rcfQtYRo_fGKudbO03fp40GNHUSd4Uw0"> > > gotem > <br> > > <img src="https://private-user-images.githubusercontent.com/69510347/345294064-d6254f48-2d81-4702-ac03-c1c796712ef4.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MjI1NjU2ODYsIm5iZiI6MTcyMjU2NTM4NiwicGF0aCI6Ii82OTUxMDM0Ny8zNDUyOTQwNjQtZDYyNTRmNDgtMmQ4MS00NzAyLWFjMDMtYzFjNzk2NzEyZWY0LnBuZz9YLUFtei1BbGdvcml0aG09QVdTNC1ITUFDLVNIQTI1NiZYLUFtei1DcmVkZW50aWFsPUFLSUFWQ09EWUxTQTUzUFFLNFpBJTJGMjAyNDA4MDIlMkZ1cy1lYXN0LTElMkZzMyUyRmF3czRfcmVxdWVzdCZYLUFtei1EYXRlPTIwMjQwODAyVDAyMjMwNlomWC1BbXotRXhwaXJlcz0zMDAmWC1BbXotU2lnbmF0dXJlPTgzNWYzODBmOWVhYzQzMjMxNDdlMzk5Zjk2ODY4N2I1ZWNmYmNkNGI2NGFlMjZiMDM1NGVjNDJlOGFjNjViN2YmWC1BbXotU2lnbmVkSGVhZGVycz1ob3N0JmFjdG9yX2lkPTAma2V5X2lkPTAmcmVwb19pZD0wIn0.TjsSLQpLoGsXOHS-wl_LSASdLxgeVTKxCGugkX7-v90"> </details> </p> # Changelog :cl: WarMechanic - add: Gloves now have unique fingerprints. Items can be traced back to gloves, which can then be traced back to people. --------- Signed-off-by: Angelo Fallaria <ba.fallaria@gmail.com> Co-authored-by: WarMechanic <69510347+WarMechanic@users.noreply.github.com> Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com> Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Co-authored-by: VMSolidus <evilexecutive@gmail.com>
Peptide90
pushed a commit
that referenced
this pull request
Nov 11, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
added Haggis the cat