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

[BOUNTY] Nanotrasen Representative #3864

Merged
merged 30 commits into from
Oct 28, 2024
Merged

Conversation

SirNightKnight
Copy link
Collaborator

@SirNightKnight SirNightKnight commented Oct 18, 2024

About The Pull Request

Adds the Nanotrasen Representative job and several items for them including the Plasmacore laser gun, clothing, special briefcase full of cash, and stolen garment bag.

The job should need 50 central command hours to unlock.

Sprite work by the amazing CannibalHunter.

Things that look like bugs but aren't

Their ID trim is not a template in the ID painter and they don't have a spare headset in their locker. This was done for security reasons.

Why It's Good For The Game

Ook wanted it and it has a LOT of RP potential

Changelog

🆑
change: Blueshields now answer to Central Command and the Nanotrasen Representative
code: Renamed the "Nanotrasen Consultant's Office" area to "Nanotrasen Representative's Office"
code: Added a landmark for the Nanotrasen Representative
add: Nanotrasen has pushed their representatives to work onboard the station to make sure Standard Operating Procedure is followed and company interests are upheld.
/:cl:

@github-actions github-actions bot changed the title Nanotrasen Representative (WIP but Soon™) Nanotrasen Representative (WIP but Soon) Oct 18, 2024
@SirNightKnight SirNightKnight changed the title Nanotrasen Representative (WIP but Soon) [BOUNTY] Nanotrasen Representative Oct 20, 2024
@SirNightKnight SirNightKnight marked this pull request as ready for review October 20, 2024 22:30
Copy link
Member

@Absolucy Absolucy left a comment

Choose a reason for hiding this comment

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

monkestation/code/modules/NTrep/clothing/nanotrasen_representative_clothing-digi.dmi
monkestation/code/modules/NTrep/clothing/nanotrasen_representative_clothing.dmi
monkestation/code/modules/NTrep/clothing/nanotrasen_representative_clothing_item.dmi

No. Gonna start putting my foot down - icons go in the monkestation/icons folder, do not put icons in the code folder.


Also, CI is failing:

  Error: Missing inhand sprites for /obj/item/clothing/head/hats/nanotrasen_representative in both 'icons/mob/inhands/clothing/hats_lefthand.dmi' & 'icons/mob/inhands/clothing/hats_righthand.dmi'.
  	inhand_icon_state = "dg_suit" - Matching sprite found in: 'icons/mob/inhands/clothing/suits_lefthand.dmi' & 'icons/mob/inhands/clothing/suits_righthand.dmi'
  	FAILURE #1: Missing inhand sprites for /obj/item/clothing/head/hats/nanotrasen_representative in both 'icons/mob/inhands/clothing/hats_lefthand.dmi' & 'icons/mob/inhands/clothing/hats_righthand.dmi'.
  	inhand_icon_state = "dg_suit" - Matching sprite found in: 'icons/mob/inhands/clothing/suits_lefthand.dmi' & 'icons/mob/inhands/clothing/suits_righthand.dmi' at code/modules/unit_tests/inhands.dm:88

Copy link
Collaborator Author

@SirNightKnight SirNightKnight left a comment

Choose a reason for hiding this comment

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

Done?

@ThePooba ThePooba dismissed Absolucy’s stale review October 25, 2024 21:36

How do i mark a review as completed lmao

@Absolucy Absolucy changed the title [BOUNTY] Nanotrasen Representative [BOUNTY] Nanotrasen Representative Oct 26, 2024
@ThePooba ThePooba merged commit 9fe427a into Monkestation:master Oct 28, 2024
25 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants