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.

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

[PORT FEAT] Borg hats #23690

Merged
merged 36 commits into from
Mar 10, 2024
Merged

[PORT FEAT] Borg hats #23690

merged 36 commits into from
Mar 10, 2024

Conversation

Adrer
Copy link
Contributor

@Adrer Adrer commented Dec 31, 2023

What Does This PR Do

ports: ss220club#497
The year is 2568. It is time for the cyborg revolution.
Adds the ability for all silicons (Cyborgs, AIs, maintenance drones) to wear hats
Hats can be added to a silicon by hitting it with a hat on help intent. Hats may be removed by using grab intent on a silicon wearing a hat or by the borg using the *flip emote.

Why It's Good For The Game

It's finally time for cyborg to take over, and this is the first step to total station domination.

Images of changes

cyborg_hats

Testing

Put a hat on a borg.
Take a hat off a borg.

Changelog

🆑
add: Silicons can now wear hats by hitting them with a hat on help intent. Hats may be removed from silicons by clicking on them while on grab intent, or by the silicon using the flip emote.
/:cl:

@Roachesintrenchcoat
Copy link

This is the greatest thing ever. Borgs with hats!

@PhantornRU
Copy link
Contributor

PhantornRU commented Dec 31, 2023

Add examine text about hats to cyborgs


/mob/living/silicon/robot/examine(mob/user)
	. = ..()
	if(inventory_head)
		. += "\nWear [bicon(inventory_head)] [inventory_head.name].\n"

/mob/living/silicon/ai/examine(mob/user)
	. = ..()
	if(inventory_head)
		. += "\nLocated on the hull [bicon(inventory_head)] [inventory_head.name].\n"

@github-actions github-actions bot added the Merge Conflict This PR is merge conflicted label Dec 31, 2023
@ParadiseSS13-Bot ParadiseSS13-Bot added -Status: Awaiting type assignment This PR is waiting for its type to be assigned internally Sprites This PR modifies the game sprites labels Dec 31, 2023
@farie82 farie82 added the Feature This PR is a new addition to the game label Jan 14, 2024
@ParadiseSS13-Bot ParadiseSS13-Bot added -Status: Awaiting review This PR is awaiting review from the review team and removed -Status: Awaiting type assignment This PR is waiting for its type to be assigned internally labels Jan 14, 2024
code/modules/mob/living/silicon/robot/drone/maint_drone.dm Outdated Show resolved Hide resolved
code/modules/mob/living/silicon/robot/robot_inventory.dm Outdated Show resolved Hide resolved
code/modules/mob/living/silicon/robot/robot_inventory.dm Outdated Show resolved Hide resolved
code/modules/mob/living/silicon/robot/robot_mob.dm Outdated Show resolved Hide resolved
code/modules/mob/living/silicon/silicon_mob.dm Outdated Show resolved Hide resolved
code/modules/mob/living/silicon/silicon_mob.dm Outdated Show resolved Hide resolved
code/modules/mob/living/silicon/silicon_mob.dm Outdated Show resolved Hide resolved
code/modules/mob/living/silicon/silicon_mob.dm Outdated Show resolved Hide resolved
code/modules/mob/living/silicon/silicon_mob.dm Outdated Show resolved Hide resolved
code/modules/mob/living/silicon/silicon_mob.dm Outdated Show resolved Hide resolved
code/modules/mob/living/silicon/silicon_mob.dm Outdated Show resolved Hide resolved
code/modules/mob/living/silicon/silicon_mob.dm Outdated Show resolved Hide resolved
@Henri215
Copy link
Member

image

image

@Adrer
Copy link
Contributor Author

Adrer commented Jan 21, 2024

image

image

I am literally working on it right now chief

@Adrer Adrer changed the title Borg hats [PORT FEAT] Borg hats Jan 25, 2024
@Adrer Adrer marked this pull request as ready for review January 29, 2024 09:02
Copy link
Member

@Henri215 Henri215 left a comment

Choose a reason for hiding this comment

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

Mostly looking good, might be time to solve the merge conflict

code/modules/mob/living/silicon/silicon_mob.dm Outdated Show resolved Hide resolved
code/modules/mob/living/silicon/robot/drone/maint_drone.dm Outdated Show resolved Hide resolved
@S34NW S34NW added Merge Conflict This PR is merge conflicted and removed Merge Conflict This PR is merge conflicted labels Mar 3, 2024
@github-actions github-actions bot removed Merge Conflict This PR is merge conflicted labels Mar 6, 2024
@Henri215
Copy link
Member

Henri215 commented Mar 6, 2024

Its looking good

Copy link
Member

@Henri215 Henri215 left a comment

Choose a reason for hiding this comment

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

Is it your intention to have the hat placed with an attack animation (on attacked_by)?

2024-03-07.00-19-49.mp4

@github-actions github-actions bot added the Merge Conflict This PR is merge conflicted label Mar 7, 2024
@Adrer
Copy link
Contributor Author

Adrer commented Mar 7, 2024

Is it your intention to have the hat placed with an attack animation (on attacked_by)?

2024-03-07.00-19-49.mp4

Yeah, gives a little more feedback on the fact that someone's putting a hat on you. Can be changed if so desired though.

Copy link
Member

@Henri215 Henri215 left a comment

Choose a reason for hiding this comment

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

That hat of yours look good to me

@ParadiseSS13-Bot ParadiseSS13-Bot added -Status: Awaiting merge This PR is ready for merge and removed -Status: Awaiting review This PR is awaiting review from the review team labels Mar 7, 2024
@github-actions github-actions bot removed the Merge Conflict This PR is merge conflicted label Mar 8, 2024
@S34NW S34NW merged commit 5670f95 into ParadiseSS13:master Mar 10, 2024
11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
-Status: Awaiting merge This PR is ready for merge Feature This PR is a new addition to the game Requires Wiki Update Useful for Wiki Contributers to search for things that need updating Sprites This PR modifies the game sprites
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants