Skip to content

Commit

Permalink
Add Non-Hostile UPP ERT (#4713)
Browse files Browse the repository at this point in the history
# About the pull request

Adds a non-hostile UPP ERT alternative to the hostile ERT spawn. Has the
same chance to spawn as the hostile version.

# Explain why it's good for the game

In lore the UPP enjoy a cold war esque relationship with the UA, a
possibly neutral ERT helps better reflect this.

Furthermore, as more UPP are added to the game, the need to help shift
the community meta regarding UPP away from 100% hostile to 50/50 hostile
is going to become more important, this would be 1 small step.


# 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: UPP ERT's have a chance to be neutral to the USCM.
/:cl:

---------

Co-authored-by: Steelpoint <[email protected]>
Co-authored-by: harryob <[email protected]>
  • Loading branch information
3 people committed Oct 20, 2023
1 parent 3b0baad commit e953a78
Showing 1 changed file with 41 additions and 8 deletions.
49 changes: 41 additions & 8 deletions code/datums/emergency_calls/upp.dm
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
/datum/emergency_call/upp
name = "UPP Naval Infantry (Squad)"
mob_max = 9
probability = 10
probability = 20
shuttle_id = "Distress_UPP"
name_of_spawn = /obj/effect/landmark/ert_spawns/distress_upp
item_spawn = /obj/effect/landmark/ert_spawns/distress_upp/item
Expand All @@ -14,15 +14,17 @@
max_heavies = 1
max_smartgunners = 0
var/heavy_pick = TRUE // whether heavy should count as either a minigunner or shotgunner
hostility = TRUE
var/max_synths = 1
var/synths = 0

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

. = ..()
hostility = pick(50;FALSE,50;TRUE)
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."
if(hostility)
objectives = "Eliminate the UA Forces to ensure the UPP prescence in this sector is continued. Listen to your superior officers and take over the [MAIN_SHIP_NAME] at all costs."
else
objectives = "Render assistance towards the UA Forces, do not engage UA forces. Listen to your superior officers."

/datum/emergency_call/upp/print_backstory(mob/living/carbon/human/M)
if(ishuman_strict(M))
Expand Down Expand Up @@ -94,10 +96,26 @@
addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), H, SPAN_BOLD("Objectives: [objectives]")), 1 SECONDS)


/datum/emergency_call/upp/hostile
name = "UPP Naval Infantry (Squad) (Hostile)"
hostility = TRUE

/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
name = "UPP Naval Infantry (Squad) (Friendly)"
hostility = FALSE

/datum/emergency_call/upp/friendly/New()
..()
arrival_message = "This is UPP dispatch. USS Almayer, We are responding to your distress call, we will render aid as able, do not fire."
objectives = "Render assistance towards the UA Forces, Listen to your superior officers."

/datum/emergency_call/upp/platoon
name = "UPP Naval Infantry (Platoon)"
mob_min = 4
name = "UPP Naval Infantry (Platoon) (Hostile)"
mob_max = 30
probability = 0
max_medics = 3
Expand All @@ -106,6 +124,21 @@
max_engineers = 2
max_synths = 1
heavy_pick = FALSE
hostility = TRUE

/datum/emergency_call/upp/platoon/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/platoon/friendly
name = "UPP Naval Infantry (Platoon) (Friendly)"
hostility = FALSE

/datum/emergency_call/upp/platoon/friendly/New()
..()
arrival_message = "This is UPP dispatch. USS Almayer, We are responding to your distress call, we will render aid as able, do not fire."
objectives = "Render assistance towards the UA Forces, Listen to your superior officers."

/obj/effect/landmark/ert_spawns/distress_upp
name = "Distress_UPP"
Expand Down

0 comments on commit e953a78

Please sign in to comment.