Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add Laika and security dogs #190

Merged
merged 9 commits into from
Oct 23, 2023
Merged

Add Laika and security dogs #190

merged 9 commits into from
Oct 23, 2023

Conversation

TadJohnson00
Copy link
Contributor

@TadJohnson00 TadJohnson00 commented Oct 17, 2023 •
edited
Loading

About the PR

Adds Laika and security dogs to the codebase; security dogs are NT-aligned and will attack pests on sight, are ghost roles by default
Adds sec dog crate to cargo for 3500 spesos
Adds new tag: SecDogWearable
Adds new secdog sprites to upstream RSI's
Fixes description for Mark 1 rifles crate cargo entry
Slightly changes arctic fox prototype to be updated for rebase
Properly references warden hat in sprite

Why / Balance

Pugi said we could get a new sec dog, current code is just a stand-in for when I figure out how to code dog handling for secoffs

Technical details

N/A

Media

image

  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Breaking changes

Changelog

🆑 TJohnson

  • add: Added Laika and her crew, security working dogs that are aligned with the station. Best watch your step, citizens, lest your heels be nipped!

@github-actions github-actions bot added the Changes: YML Changes any yml files label Oct 17, 2023
@TadJohnson00
Add Laika and security dogs :3
94d5f29 
Adds Laika and security dogs to the codebase
@TadJohnson00 TadJohnson00 changed the title Fix warden hat not resprited Add Laika and security dogs Oct 17, 2023
@github-actions
Copy link
Contributor

github-actions bot commented Oct 17, 2023 •
edited
Loading

RSI Diff Bot; head commit df6fa58 merging into 80c1c75
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Clothing/Eyes/Glasses/meson.rsi

State Old New Status
equipped-EYES-secdog Added

Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi

State Old New Status
equipped-EYES-secdog Added

Resources/Textures/Clothing/Eyes/Glasses/sunglasses.rsi

State Old New Status
equipped-EYES-secdog Added

Resources/Textures/Clothing/Mask/breath.rsi

State Old New Status
equipped-MASK-secdog Added

Resources/Textures/DeltaV/Mobs/Pets/secdog.rsi

State Old New Status
secdog Added
secdog_crit Added
secdog_dead Added

Resources/Textures/Objects/Tanks/anesthetic.rsi

State Old New Status
equipped-SUITSTORAGE-secdog Added

Resources/Textures/Objects/Tanks/emergency.rsi

State Old New Status
equipped-SUITSTORAGE-secdog Added

Resources/Textures/Objects/Tanks/emergency_double.rsi

State Old New Status
equipped-SUITSTORAGE-secdog Added

Resources/Textures/Objects/Tanks/emergency_yellow.rsi

State Old New Status
equipped-SUITSTORAGE-secdog Added

Resources/Textures/Objects/Tanks/generic.rsi

State Old New Status
equipped-SUITSTORAGE-secdog Added

Resources/Textures/Objects/Tanks/oxygen.rsi

State Old New Status
equipped-SUITSTORAGE-secdog Added

Resources/Textures/Objects/Tanks/red.rsi

State Old New Status
equipped-SUITSTORAGE-secdog Added

Resources/Textures/Objects/Tanks/yellow.rsi

State Old New Status
equipped-SUITSTORAGE-secdog Added

Edit: diff updated after df6fa58

@TadJohnson00
Final edit to capitalisation
121c2c8 
Should be all good to go
@TadJohnson00
Copy link
Contributor Author

Works on my machine - and, if I'm not mistaken, should all be commented properly in all the right files.

@Carolyn3114
Copy link
Contributor

mcgriff and shiva already exist as the HOS and warden's pets :((( can't believe you wanna replace them...,.,.,

@IamVelcroboy
Copy link
Member

McGriff really should be a bloodhound. But, these look pretty dope.

@TadJohnson00
Copy link
Contributor Author

McGriff is admin bait, Shiva is... well. Shiva can just be for the HoS. Laika is an all-round department mascot :3

@github-actions github-actions bot added the S: Merge Conflict Fix your PR! label Oct 17, 2023
@github-actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot removed the S: Merge Conflict Fix your PR! label Oct 17, 2023
@TadJohnson00
Copy link
Contributor Author

schmerge crisis averted

@TadJohnson00
Update animals.yml
31782fe 
vulpakin -> vulpkanin

Signed-off-by: Tad "Taddy" Johnson <[email protected]>
DebugOk
DebugOk previously approved these changes Oct 19, 2023
View reviewed changes
Copy link
Contributor

@DebugOk DebugOk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me

@DebugOk DebugOk requested a review from Colin-Tel October 19, 2023 18:29
@DebugOk
Copy link
Contributor

DebugOk commented Oct 21, 2023

@Colin-Tel review was requested, but I think this'll be good enough as is

@DebugOk DebugOk enabled auto-merge (squash) October 21, 2023 23:16
@github-actions github-actions bot added the S: Merge Conflict Fix your PR! label Oct 21, 2023
@github-actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

auto-merge was automatically disabled October 22, 2023 07:48

Head branch was pushed to by a user without write access

@github-actions github-actions bot removed the S: Merge Conflict Fix your PR! label Oct 22, 2023
@Colin-Tel Colin-Tel enabled auto-merge (squash) October 23, 2023 13:52
@TadJohnson00
Copy link
Contributor Author

the fuck??? Laika doesn't even have hands, why am I getting an error with detaching hands??

@Colin-Tel Colin-Tel merged commit c83d60f into DeltaV-Station:master Oct 23, 2023
12 checks passed
DeltaV-Bot pushed a commit that referenced this pull request Oct 23, 2023
Automatic Changelog Update (#190)
6763831
@TadJohnson00 TadJohnson00 deleted the wardenreassignhat branch November 14, 2023 01:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@DebugOk DebugOk DebugOk left review comments

@Colin-Tel Colin-Tel Awaiting requested review from Colin-Tel

Assignees
No one assigned
Labels
Changes: YML Changes any yml files S: Needs Review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@TadJohnson00 @Carolyn3114 @IamVelcroboy @DebugOk @Colin-Tel