Various Interdyne/Dauntless map and spawn ruin tweaks (#1526)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

This PR adds an additional check for the space edition of Dauntless to
the hack used to stop the bitrunner server from blurting out the cool
down across supply radio comms.

It also tweaks a few things with Dauntless/Interdyne, such as giving
them rad storm immunity and experi-scanners in the R&D labs.

Interdyne is now successfully placed on the lower Z levels thanks to the
`ZTRAIT_ICE_RUINS_UNDERGROUND` flag.

## Why It's Good For The Game

This is fixing an existing bug.

## Proof Of Testing

I have tested this on my server and confirm it works as described as the
PR.

## Changelog

🆑
fix: Dauntless space ruin bitrunner server no longer announces cool down
over NT supply comms
fix: Dauntless and Interdyne are now immune to rad storms
add: Added Syndie borg access cards to Interdyne
qol: Replaced the polarized windows in the Interdyne sauna area with
blast door shutters
add: Added experi-scanners to Interdyne/Dauntless R&D
fix: Interdyne never spawns on top Z level
qol: Interdyne dorm rooms now have crowbars in closets
qol: Interdyne deck officer does not leave empty sleeper on ghost role
spawn
/🆑
This commit is contained in:
tmyqlfpir
2024-06-03 20:37:53 +10:00
committed by GitHub
parent dffbc0c10b
commit c7e11d7161
9 changed files with 984 additions and 958 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -9982,6 +9982,7 @@
}, },
/obj/item/paper_bin, /obj/item/paper_bin,
/obj/item/pen/survival, /obj/item/pen/survival,
/obj/item/experi_scanner,
/turf/open/floor/iron/dark, /turf/open/floor/iron/dark,
/area/ruin/space/has_grav/bubbers/dauntless/sci/rnd) /area/ruin/space/has_grav/bubbers/dauntless/sci/rnd)
"Uc" = ( "Uc" = (

View File

@@ -6670,6 +6670,7 @@
}, },
/obj/item/paper_bin, /obj/item/paper_bin,
/obj/item/pen/survival, /obj/item/pen/survival,
/obj/item/experi_scanner,
/turf/open/floor/iron/dark, /turf/open/floor/iron/dark,
/area/ruin/space/has_grav/bubbers/dauntless_space/sci/rnd) /area/ruin/space/has_grav/bubbers/dauntless_space/sci/rnd)
"EI" = ( "EI" = (

View File

@@ -6,10 +6,9 @@
update_appearance() update_appearance()
//BUBBER ADDITION BEGIN - This is a HORRIBLE HACK to stop the radio from blurting out on cargo channel for dauntless prisoners //BUBBER ADDITION BEGIN - This is a HORRIBLE HACK to stop the radio from blurting out on cargo channel for dauntless prisoners
//If the dauntless map is removed, remove this hack! //If the dauntless map is removed, remove this hack!
//If the server is moved into a different area for dauntless, update this hack! var/area/curr = get_area(src)
var/turf/curr = get_turf(radio) if(istype(curr, /area/ruin/space/has_grav/bubbers/dauntless) || istype(curr, /area/ruin/space/has_grav/bubbers/dauntless_space))
var/area/dauntless_prison = /area/ruin/space/has_grav/bubbers/dauntless/sec/prison balloon_alert_to_viewers("cooldown has completed")
if(get_area_name(curr, TRUE) == dauntless_prison.name)
return return
//BUBBER ADDITION END //BUBBER ADDITION END
radio.talk_into(src, "Thermal systems within operational parameters. Proceeding to domain configuration.", RADIO_CHANNEL_SUPPLY) radio.talk_into(src, "Thermal systems within operational parameters. Proceeding to domain configuration.", RADIO_CHANNEL_SUPPLY)

View File

@@ -79,10 +79,14 @@
you_are_text = "You are an Interdyne Deck Officer, employed in a top secret research facility developing biological weapons." you_are_text = "You are an Interdyne Deck Officer, employed in a top secret research facility developing biological weapons."
outfit = /datum/outfit/lavaland_syndicate/shaftminer/deckofficer outfit = /datum/outfit/lavaland_syndicate/shaftminer/deckofficer
/* Bubberstation Removal Start - Don't spawn empty sleeper
/obj/effect/mob_spawn/ghost_role/human/lavaland_syndicate/deckofficer/Destroy() /obj/effect/mob_spawn/ghost_role/human/lavaland_syndicate/deckofficer/Destroy()
new/obj/structure/fluff/empty_sleeper/syndicate/captain(get_turf(src)) new/obj/structure/fluff/empty_sleeper/syndicate/captain(get_turf(src))
return ..() return ..()
Bubberstation Removal End */
/datum/outfit/lavaland_syndicate/shaftminer/ice /datum/outfit/lavaland_syndicate/shaftminer/ice
name = "Icemoon Interdyne Shaft Miner" name = "Icemoon Interdyne Shaft Miner"
uniform = /obj/item/clothing/under/syndicate/skyrat/tactical uniform = /obj/item/clothing/under/syndicate/skyrat/tactical

View File

@@ -10,7 +10,7 @@
var/area/location_area = get_turf(location) var/area/location_area = get_turf(location)
var/static/list/syndie_typecache = typecacheof(list( var/static/list/syndie_typecache = typecacheof(list(
/area/ruin/space/has_grav/skyrat/interdynefob, // DS-2 /area/ruin/space/has_grav/skyrat/interdynefob, // DS-2
/area/ruin/syndicate_ice_base, // Interdyne (ice moon) /area/ruin/syndicate_lava_base, // Interdyne (ice moon)
/area/ruin/space/has_grav/bubbers/dauntless, // SSV Dauntless (lavalands) /area/ruin/space/has_grav/bubbers/dauntless, // SSV Dauntless (lavalands)
/area/ruin/space/has_grav/bubbers/dauntless_space, // SSV Dauntless (space) /area/ruin/space/has_grav/bubbers/dauntless_space, // SSV Dauntless (space)
)) ))

View File

@@ -313,3 +313,8 @@
/area/ruin/space/has_grav/bubbers/dauntless_space/sec/prison/shower /area/ruin/space/has_grav/bubbers/dauntless_space/sec/prison/shower
name = "Prison Showers" name = "Prison Showers"
sound_environment = SOUND_AREA_SMALL_ENCLOSED sound_environment = SOUND_AREA_SMALL_ENCLOSED
/datum/weather/rad_storm/New()
. = ..()
protected_areas += /area/ruin/space/has_grav/bubbers/dauntless
protected_areas += /area/ruin/space/has_grav/bubbers/dauntless_space

View File

@@ -1,58 +1,58 @@
/area/ruin/syndicate_ice_base /area/ruin/syndicate_lava_base
always_unpowered = FALSE always_unpowered = FALSE
/area/ruin/syndicate_ice_base/engineering /area/ruin/syndicate_lava_base/engineering
name = "Interdyne Engineering" name = "Interdyne Engineering"
sound_environment = SOUND_AREA_SMALL_ENCLOSED sound_environment = SOUND_AREA_SMALL_ENCLOSED
/area/ruin/syndicate_ice_base/medbay /area/ruin/syndicate_lava_base/medbay
name = "Interdyne Medbay" name = "Interdyne Medbay"
/area/ruin/syndicate_ice_base/arrivals /area/ruin/syndicate_lava_base/arrivals
name = "Interdyne Arrivals" name = "Interdyne Arrivals"
/area/ruin/syndicate_ice_base/bar /area/ruin/syndicate_lava_base/bar
name = "Interdyne Bar" name = "Interdyne Bar"
mood_bonus = 5 mood_bonus = 5
mood_message = "I love being in the bar!" mood_message = "I love being in the bar!"
sound_environment = SOUND_AREA_SMALL_SOFTFLOOR sound_environment = SOUND_AREA_SMALL_SOFTFLOOR
/area/ruin/syndicate_ice_base/main /area/ruin/syndicate_lava_base/main
name = "Interdyne Primary Hallway" name = "Interdyne Primary Hallway"
/area/ruin/syndicate_ice_base/cargo /area/ruin/syndicate_lava_base/cargo
name = "Interdyne Cargo Bay" name = "Interdyne Cargo Bay"
sound_environment = SOUND_AREA_LARGE_ENCLOSED sound_environment = SOUND_AREA_LARGE_ENCLOSED
/area/ruin/syndicate_ice_base/chemistry /area/ruin/syndicate_lava_base/chemistry
name = "Interdyne Chemistry" name = "Interdyne Chemistry"
/area/ruin/syndicate_ice_base/virology /area/ruin/syndicate_lava_base/virology
name = "Interdyne Virology" name = "Interdyne Virology"
/area/ruin/syndicate_ice_base/testlab /area/ruin/syndicate_lava_base/testlab
name = "Interdyne Experimentation Lab" name = "Interdyne Experimentation Lab"
area_flags = XENOBIOLOGY_COMPATIBLE area_flags = XENOBIOLOGY_COMPATIBLE
/area/ruin/syndicate_ice_base/dormitories /area/ruin/syndicate_lava_base/dormitories
name = "Interdyne Dormitories" name = "Interdyne Dormitories"
mood_bonus = 3 mood_bonus = 3
mood_message = "I feel at ease here." mood_message = "I feel at ease here."
sound_environment = SOUND_AREA_SMALL_SOFTFLOOR sound_environment = SOUND_AREA_SMALL_SOFTFLOOR
/area/ruin/syndicate_ice_base/spare /area/ruin/syndicate_lava_base/spare
name = "Spare Room" name = "Spare Room"
sound_environment = SOUND_AREA_SMALL_SOFTFLOOR sound_environment = SOUND_AREA_SMALL_SOFTFLOOR
/area/ruin/syndicate_ice_base/telecomms /area/ruin/syndicate_lava_base/telecomms
name = "Interdyne Telecommunications" name = "Interdyne Telecommunications"
sound_environment = SOUND_AREA_SMALL_SOFTFLOOR sound_environment = SOUND_AREA_SMALL_SOFTFLOOR
/area/ruin/syndicate_ice_base/gym /area/ruin/syndicate_lava_base/gym
name = "Interdyne Gym" name = "Interdyne Gym"
mood_bonus = 5 mood_bonus = 5
mood_message = "This place is quite relaxing." mood_message = "This place is quite relaxing."
sound_environment = SOUND_AREA_SMALL_SOFTFLOOR sound_environment = SOUND_AREA_SMALL_SOFTFLOOR
/area/ruin/syndicate_ice_base/armory /area/ruin/syndicate_lava_base/armory
name = "Interdyne Armory" name = "Interdyne Armory"

View File

@@ -11,3 +11,4 @@
allow_duplicates = FALSE allow_duplicates = FALSE
never_spawn_with = list(/datum/map_template/ruin/lavaland/bubberstation/dauntless) never_spawn_with = list(/datum/map_template/ruin/lavaland/bubberstation/dauntless)
always_place = TRUE always_place = TRUE
ruin_type = ZTRAIT_ICE_RUINS_UNDERGROUND