Skip to content

Commit

Permalink
faction cryo consoles (#7919)
Browse files Browse the repository at this point in the history
# About the pull request

solves the issue with UPP announcments showing up on almayer and allows
for all nonmarine factions to have their own cryo console

# Explain why it's good for the game

less mess in chat during events and allows for better faction cryo
consoles


# 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: faction cryo consoles
fix: ares no longer announces when non marine factions enter cryo
/:cl:

---------

Co-authored-by: vincibrv <[email protected]>
Co-authored-by: harryob <[email protected]>
  • Loading branch information
3 people authored Dec 31, 2024
1 parent 956ee6c commit cb043c2
Showing 1 changed file with 9 additions and 2 deletions.
11 changes: 9 additions & 2 deletions code/game/machinery/cryopod.dm
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,9 @@ GLOBAL_LIST_INIT(frozen_items, list(SQUAD_MARINE_1 = list(), SQUAD_MARINE_2 = li
icon_state = "terminal"
z_restricted = FALSE

/obj/structure/machinery/computer/cryopod/upp
cryotype = FACTION_UPP

/obj/structure/machinery/computer/cryopod/attack_remote()
src.attack_hand()

Expand Down Expand Up @@ -239,8 +242,10 @@ GLOBAL_LIST_INIT(frozen_items, list(SQUAD_MARINE_1 = list(), SQUAD_MARINE_2 = li
dept_console = GLOB.frozen_items["Med"]
if(JOB_MAINT_TECH, JOB_ORDNANCE_TECH, JOB_CHIEF_ENGINEER)
dept_console = GLOB.frozen_items["Eng"]
if(JOB_PREDATOR)
dept_console = GLOB.frozen_items["Yautja"]


if(cryo_human.faction != FACTION_MARINE)
dept_console = GLOB.frozen_items[cryo_human.faction]

if(cryo_human.job in FAX_RESPONDER_JOB_LIST)
cryo_human.despawn_fax_responder()
Expand Down Expand Up @@ -560,6 +565,8 @@ GLOBAL_LIST_INIT(frozen_items, list(SQUAD_MARINE_1 = list(), SQUAD_MARINE_2 = li
return TRUE
if(no_store_pod)
return TRUE
if(occupant.faction != FACTION_MARINE)
return TRUE
return FALSE


Expand Down

0 comments on commit cb043c2

Please sign in to comment.