Skip to content

Commit

Permalink
Pizza ERT readded, fixes(?) UPP spawn chance (#5662)
Browse files Browse the repository at this point in the history
# About the pull request
Pizza ERT now has a 1 prob chance to spawn.
UPP ERT variants now have their prob set to 0 (they were inheriting prob
20) so UPP had 3 prob20 rolls instead of 1.
note: basic UPP ert text is always scrambled, regardless of whether
they're hostile or not, the friendly text will only show up if an admin
forces a friendly UPP ERT to appear.
<!-- Remove this text and explain what the purpose of your PR is.

Mention if you have tested your changes. If you changed a map, make sure
you used the mapmerge tool.
If this is an Issue Correction, you can type "Fixes Issue #169420" to
link the PR to the corresponding Issue number #169420.

Remember: something that is self-evident to you might not be to others.
Explain your rationale fully, even if you feel it goes without saying.
-->

# Explain why it's good for the game
Pizza ERT was a funny (and incredibly rare) occurrence that got removed
when #2318 was added. with prob 1 it's incredibly unlikely to roll,
(roughly 1 in 146 distress beacons) meaning that the one time that it
**does** occur that will likely be memorable to every ghost in dchat
(and marines too, if the pizza manages to get delivered)

UPP prob change was (presumably) unintended and led to UPP being
incredibly likely to roll compared to any other ERT.
# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

</details>


# Changelog
:cl:
add: Pizza ERT is back, although incredibly unlikely to occur
fix: UPP ERT no longer rolls 3 times (1 for random, 1 for friendly, and
1 for hostile), due to this, UPP comms will always be scrambled at the
beginning, no way to tell intentions before meeting.
/:cl:
  • Loading branch information
private-tristan authored Feb 9, 2024
1 parent 0d0f51f commit c1e9529
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion code/datums/emergency_calls/pizza.dm
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
objectives = "Make sure you get a tip!"
shuttle_id = "Distress_Small"
name_of_spawn = /obj/effect/landmark/ert_spawns/distress_pizza
probability = 0
probability = 1

/datum/emergency_call/pizza/create_member(datum/mind/M, turf/override_spawn_loc)
var/turf/spawn_loc = override_spawn_loc ? override_spawn_loc : get_spawn_point()
Expand Down
6 changes: 4 additions & 2 deletions code/datums/emergency_calls/upp.dm
Original file line number Diff line number Diff line change
Expand Up @@ -99,18 +99,20 @@
addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), H, SPAN_BOLD("Objectives: [objectives]")), 1 SECONDS)


/datum/emergency_call/upp/hostile
/datum/emergency_call/upp/hostile //if admins want to specifically call in friendly ones
name = "UPP Naval Infantry (Squad) (Hostile)"
hostility = TRUE
probability = 0

/datum/emergency_call/upp/hostile/New()
..()
arrival_message = "[MAIN_SHIP_NAME] t*is i* UP* d^sp^*ch`. STr*&e teaM, #*u are cLe*% for a*pr*%^h. Pr*mE a*l wE*p^ns and pR*epr# t% r@nd$r a(tD."
objectives = "Eliminate the UA Forces to ensure the UPP presence in this sector is continued. Listen to your superior officers and take over the [MAIN_SHIP_NAME] at all costs."

/datum/emergency_call/upp/friendly
/datum/emergency_call/upp/friendly //ditto
name = "UPP Naval Infantry (Squad) (Friendly)"
hostility = FALSE
probability = 0

/datum/emergency_call/upp/friendly/New()
..()
Expand Down

0 comments on commit c1e9529

Please sign in to comment.