Skip to content

Commit

Permalink
Fax responder renovation (#7758)
Browse files Browse the repository at this point in the history
# About the pull request

Completely renovates the offices used by fax responders to a much higher
quality.

# Explain why it's good for the game

Adds more depth to the job other than being stuck in a cubicle and looks
nice.

# Testing Photographs and Procedure

<details>
<summary>Screenshots & Videos</summary>

![StrongDMM-2024-12-07 11 02
41](https://github.com/user-attachments/assets/6c989c6b-4483-4cbe-a233-cdb28551b213)

</details>


# Changelog

:cl:
add: Added a new area for the sector relay.
mapadd: Added new offices for Fax Responders.
maptweak: Renamed the old map.
fix: Fax responders no longer count to round end.
/:cl:

---------

Co-authored-by: forest2001 <[email protected]>
  • Loading branch information
Syndro101 and realforest2001 authored Dec 31, 2024
1 parent c809bc4 commit 484923b
Show file tree
Hide file tree
Showing 6 changed files with 6,995 additions and 2,479 deletions.
10 changes: 10 additions & 0 deletions code/game/area/admin_level.dm
Original file line number Diff line number Diff line change
Expand Up @@ -142,9 +142,19 @@
soundscape_playlist = SCAPE_PL_ELEVATOR_MUSIC
icon_state = "yellow"

//Fax Responder areas
/area/adminlevel/ert_station/fax_response_station
name = "Sector Comms Relay"
icon_state = "green"
unlimited_power = TRUE
flags_area = AREA_AVOID_BIOSCAN

/area/adminlevel/ert_station/fax_response_station/exterior
name = "Sector Comms Relay"
icon_state = "red"
ambience_exterior = AMBIENCE_JUNGLE
//ambience = list('sound/ambience/jungle_amb1.ogg')
base_lighting_alpha = 185

//Simulation area
/area/adminlevel/simulation
Expand Down
10 changes: 5 additions & 5 deletions code/game/gamemodes/cm_process.dm
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ GLOBAL_VAR_INIT(next_admin_bioscan, 30 MINUTES)
var/num_xenos = 0
for(var/i in GLOB.living_xeno_list)
var/mob/M = i
if(M.z && (M.z in z_levels) && !istype(M.loc, /turf/open/space)) //If they have a z var, they are on a turf.
if(M.z && (M.z in z_levels) && !istype(M.loc, /turf/open/space) && !istype(M.loc, /area/adminlevel/ert_station/fax_response_station)) //If they have a z var, they are on a turf.
num_xenos++
return num_xenos

Expand All @@ -195,7 +195,7 @@ GLOBAL_VAR_INIT(next_admin_bioscan, 30 MINUTES)
var/num_xenos = 0

for(var/mob/M in GLOB.player_list)
if(M.z && (M.z in z_levels) && M.stat != DEAD && !istype(M.loc, /turf/open/space)) //If they have a z var, they are on a turf.
if(M.z && (M.z in z_levels) && M.stat != DEAD && !istype(M.loc, /turf/open/space) && !istype(M.loc, /area/adminlevel/ert_station/fax_response_station)) //If they have a z var, they are on a turf.
if(ishuman(M) && !isyautja(M) && !(M.status_flags & XENO_HOST) && !iszombie(M))
var/mob/living/carbon/human/H = M
if(((H.species && H.species.name == "Human") || (H.is_important)) && !H.hivenumber) //only real humans count, or those we have set to also be included
Expand Down Expand Up @@ -225,7 +225,7 @@ GLOBAL_VAR_INIT(next_admin_bioscan, 30 MINUTES)

for(var/i in GLOB.alive_human_list)
var/mob/M = i
if(M.z && (M.z in z_levels) && !istype(M.loc, /turf/open/space))
if(M.z && (M.z in z_levels) && !istype(M.loc, /turf/open/space) && !istype(M.loc, /area/adminlevel/ert_station/fax_response_station))
if(M.faction in FACTION_LIST_WY)
num_pmcs++
else if(M.faction == FACTION_MARINE)
Expand All @@ -238,7 +238,7 @@ GLOBAL_VAR_INIT(next_admin_bioscan, 30 MINUTES)

for(var/i in GLOB.alive_human_list)
var/mob/M = i
if(M.z && (M.z in z_levels) && !istype(M.loc, /turf/open/space))
if(M.z && (M.z in z_levels) && !istype(M.loc, /turf/open/space) && !istype(M.loc, /area/adminlevel/ert_station/fax_response_station))
if(M.faction == FACTION_MARINE)
num_marines++

Expand All @@ -252,7 +252,7 @@ GLOBAL_VAR_INIT(next_admin_bioscan, 30 MINUTES)
var/num_headcount = 0

for(var/mob/living/carbon/human/current_human as anything in GLOB.alive_human_list)
if(!(current_human.z && (current_human.z in z_levels) && !istype(current_human.loc, /turf/open/space)))
if(!(current_human.z && (current_human.z in z_levels) && !istype(current_human.loc, /turf/open/space) && !istype(current_human.loc, /area/adminlevel/ert_station/fax_response_station)))
continue
if((current_human.faction in FACTION_LIST_WY) || current_human.job == "Corporate Liaison") //The CL is assigned the USCM faction for gameplay purposes
num_WY++
Expand Down
2 changes: 1 addition & 1 deletion code/game/gamemodes/colonialmarines/xenovsxeno.dm
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@
hivenumbers += list(HS.name = list())

for(var/mob/M in GLOB.player_list)
if(M.z && (M.z in z_levels) && M.stat != DEAD && !istype(M.loc, /turf/open/space)) //If they have a z var, they are on a turf.
if(M.z && (M.z in z_levels) && M.stat != DEAD && !istype(M.loc, /turf/open/space) && !istype(M.loc, /area/adminlevel/ert_station/fax_response_station)) //If they have a z var, they are on a turf.
var/mob/living/carbon/xenomorph/X = M
var/datum/hive_status/hive = GLOB.hive_datum[X.hivenumber]
if(!hive)
Expand Down
3 changes: 2 additions & 1 deletion code/game/turfs/open.dm
Original file line number Diff line number Diff line change
Expand Up @@ -878,7 +878,8 @@
no_overlay = TRUE
supports_surgery = FALSE


/turf/open/gm/river/no_overlay/sewage
name = "sewage"


//ELEVATOR SHAFT-----------------------------------//
Expand Down
3 changes: 3 additions & 0 deletions code/game/turfs/shiva.dm
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,9 @@
/turf/open/floor/shiva/bluecorners
icon_state = "bluecorners"

/turf/open/floor/shiva/bluecorners/east
dir = EAST

/turf/open/floor/shiva/bluecorners/west
dir = WEST

Expand Down
Loading

0 comments on commit 484923b

Please sign in to comment.