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

Nightmare Insert: Fiorina - Armory - Riot in Progress #3839

Closed
wants to merge 18 commits into from

Conversation

Steelpoint
Copy link
Contributor

@Steelpoint Steelpoint commented Jul 8, 2023

About the pull request

Starring
The United Americas Peacekeeping Corps
The Colonial Marshal Burau Rapid Response Team
The Rioters (deceased)

This PR adds a new nightmare insert for Fiorina that adds a new group of alternative survivors. Taking place in the same timeline but with an alternative occurrence of events. The stationed group of UA peacekeepers successfully put down the prisoner riot and have maintained their station at the armoury, a group of CMB marshals and a CMB Synthetic arrived on the station to investigate but were marooned. The two groups now must survive.

Technically wise, this PR adds spawns for up to.

  • 6 UA Peacekeepers
  • 2 CMB Deputies
  • 1 CMB Marshal
  • 1 CMB Investigative Synthetic

There is no CO WL spawn.

They spawn inside the armoury area, that has been moderately fortified and has not yet been looted/ransacked due to the defeat of the rioters.

I am 100% open to changing anything in this regarding personnel numbers, equipment spawns and the odds of the nightmare being used.

Still a WIP

Explain why it's good for the game

More variety in life, new survivors, introduction of more UA personnel.

This was some old event that was well received which gives some corroborating evidence to it being a worthwhile idea.

Testing Photographs and Procedure

Screenshots & Videos

Screenshot 2023-07-08 13 52 19

UA peacekeeper ingame

2023-07-08 16 13 47

StrongDMM overview

Changelog

🆑
mapadd: Added a new nightmare insert for Fiorina. Featuring UA Peacekeepers and CMB personnel survivors.
/:cl:

@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Jul 8, 2023
@github-actions
Copy link
Contributor

github-actions bot commented Jul 8, 2023

You currently have a negative Fix/Feature pull request delta of -4. Maintainers may close this PR at will. Fixing issues or improving the codebase will improve this score.

@github-actions github-actions bot added the Mapping did you remember to save in tgm format? label Jul 8, 2023
@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Jul 8, 2023
@Steelpoint
Copy link
Contributor Author

I hope to clean this up later when I finish my work on the UPP insert.

Comment on lines +982 to +991
/obj/item/device/radio/headset/distress/CMB/hvh
desc = "A sleek headset used by The Colonial Marshal Bureau, crafted in Sol. Low profile and comfortable. No one is above the law. Channels are as follows: :o - colony."
initial_keys = list(/obj/item/device/encryptionkey/colony, /obj/item/device/encryptionkey/cmb)
misc_tracking = FALSE

/obj/item/device/radio/headset/distress/CMB/hvh/ua
desc = "A special issue headset used by UA Peacekeepers, has been modified to tap into CMB channels. Channels are as follows: :o - colony."
initial_keys = list(/obj/item/device/encryptionkey/colony, /obj/item/device/encryptionkey/cmb)
misc_tracking = FALSE

Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
/obj/item/device/radio/headset/distress/CMB/hvh
desc = "A sleek headset used by The Colonial Marshal Bureau, crafted in Sol. Low profile and comfortable. No one is above the law. Channels are as follows: :o - colony."
initial_keys = list(/obj/item/device/encryptionkey/colony, /obj/item/device/encryptionkey/cmb)
misc_tracking = FALSE
/obj/item/device/radio/headset/distress/CMB/hvh/ua
desc = "A special issue headset used by UA Peacekeepers, has been modified to tap into CMB channels. Channels are as follows: :o - colony."
initial_keys = list(/obj/item/device/encryptionkey/colony, /obj/item/device/encryptionkey/cmb)
misc_tracking = FALSE

Redundant headset, we got one for CMB survs

idtype = /obj/item/card/id/syndicate
role_comm_title = "UA PCK"
/datum/equipment_preset/survivor/ua_peacekeeper/load_gear(mob/living/carbon/human/new_human)
new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CMB/hvh/ua, WEAR_L_EAR)
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CMB/hvh/ua, WEAR_L_EAR)
new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CMB/limited, WEAR_L_EAR)

role_comm_title = "CMB Deputy"

/datum/equipment_preset/survivor/cmb_deputy/load_gear(mob/living/carbon/human/new_human)
new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CMB/hvh, WEAR_L_EAR)
Copy link
Contributor

Choose a reason for hiding this comment

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

/obj/item/device/radio/headset/distress/CMB/limited

@github-actions
Copy link
Contributor

This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself

@github-actions github-actions bot added the Stale beg a maintainer to review your PR label Jul 20, 2023
@Steelpoint
Copy link
Contributor Author

I'll get back to this after the UPP PR is resolved

@Steelpoint Steelpoint closed this Jul 25, 2023
@Steelpoint Steelpoint deleted the PredShip branch July 17, 2024 17:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Mapping did you remember to save in tgm format? Stale beg a maintainer to review your PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants