cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-17 10:57:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

ZAS CBT (#20064)

Browse Source 
Let's see what broke this time
This commit is contained in:
Fluffy
2024-10-16 21:06:20 +02:00
committed by GitHub
parent b7ccc74979
commit bec05df121
10 changed files with 168 additions and 5642 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mapping/map_template.dm
+3
View File
@@ -197,6 +197,9 @@
return TRUE
/datum/map_template/proc/get_affected_turfs(turf/T, centered = FALSE)
SHOULD_NOT_SLEEP(TRUE)
RETURN_TYPE(/list/turf)
var/turf/placement = T
if(centered)
var/turf/corner = locate(placement.x - round(width / 2), placement.y - round(height / 2), placement.z)
code/modules/mapping/planet_types/lore/uueoaesa.dm
+2 -2
View File
@@ -73,7 +73,7 @@
possible_themes = list(/datum/exoplanet_theme/barren/asteroid, /datum/exoplanet_theme/barren/asteroid/ice)
ruin_planet_type = PLANET_LORE
features_budget = 3
ruin_type_whitelist = list(/datum/map_template/ruin/exoplanet/heph_mining_station, /datum/map_template/ruin/exoplanet/miners_guild_outpost, /datum/map_template/ruin/exoplanet/sol_listening_post, /datum/map_template/ruin/exoplanet/crashed_sol_shuttle_01, /datum/map_template/ruin/exoplanet/crashed_skrell_shuttle_01, /datum/map_template/ruin/exoplanet/digsite, /datum/map_template/ruin/exoplanet/abandoned_outpost, /datum/map_template/ruin/exoplanet/izweski_probe, /datum/map_template/ruin/exoplanet/heph_survey_post, /datum/map_template/ruin/exoplanet/kazhkz_crash)
ruin_type_whitelist = list(/datum/map_template/ruin/exoplanet/heph_mining_station, /datum/map_template/ruin/exoplanet/miners_guild_outpost, /datum/map_template/ruin/exoplanet/sol_listening_post, /datum/map_template/ruin/exoplanet/crashed_sol_shuttle_01, /datum/map_template/ruin/exoplanet/crashed_skrell_shuttle_01, /datum/map_template/ruin/exoplanet/digsite, /datum/map_template/ruin/exoplanet/izweski_probe, /datum/map_template/ruin/exoplanet/heph_survey_post, /datum/map_template/ruin/exoplanet/kazhkz_crash)
/obj/effect/overmap/visitable/sector/exoplanet/barren/asteroid/ytizi/pre_ruin_preparation()
if(istype(theme, /datum/exoplanet_theme/barren/asteroid/ice))
@@ -97,7 +97,7 @@
ring_chance = 0
ruin_planet_type = PLANET_LORE
place_near_main = list(2,2)
ruin_type_whitelist = list(/datum/map_template/ruin/exoplanet/heph_mining_station, /datum/map_template/ruin/exoplanet/miners_guild_outpost, /datum/map_template/ruin/exoplanet/digsite, /datum/map_template/ruin/exoplanet/abandoned_outpost, /datum/map_template/ruin/exoplanet/crashed_sol_shuttle_01, /datum/map_template/ruin/exoplanet/crashed_skrell_shuttle_01, /datum/map_template/ruin/exoplanet/izweski_probe, /datum/map_template/ruin/exoplanet/heph_survey_post, /datum/map_template/ruin/exoplanet/kazhkz_crash)
ruin_type_whitelist = list(/datum/map_template/ruin/exoplanet/heph_mining_station, /datum/map_template/ruin/exoplanet/miners_guild_outpost, /datum/map_template/ruin/exoplanet/digsite, /datum/map_template/ruin/exoplanet/crashed_sol_shuttle_01, /datum/map_template/ruin/exoplanet/crashed_skrell_shuttle_01, /datum/map_template/ruin/exoplanet/izweski_probe, /datum/map_template/ruin/exoplanet/heph_survey_post, /datum/map_template/ruin/exoplanet/kazhkz_crash)
scanimage = "chanterel.png"
/obj/effect/overmap/visitable/sector/exoplanet/barren/asteroid/chanterel/generate_planet_image()
code/modules/mapping/ruins.dm
+14 -1
View File
@@ -75,8 +75,15 @@ GLOBAL_LIST_EMPTY(banned_ruin_ids)
available -= ruin
continue
log_admin("Ruin \"[ruin.name]\" placed at ([choice.x], [choice.y], [choice.z])!")
log_admin("Loading ruin \"[ruin.name]\" ([ruin.type]) with center turf ([choice.x], [choice.y], [choice.z])!")
load_ruin(choice, ruin)
log_module_ruins("Ruin \"[ruin.name]\" ([ruin.type]) loaded with geometry: Lower X: [choice.x - round(ruin.width / 2)] - Lower Y [choice.y - round(ruin.height / 2)] -- Upper X: [choice.x + round(ruin.width / 2)] - Upper Y: [choice.y + round(ruin.height / 2)]")
#if defined(UNIT_TEST)
var/list/turf/affected_turfs = ruin.get_affected_turfs(choice, TRUE)
GLOB.turfs_to_map_type["[ruin.type]"] = affected_turfs
#endif
selected += ruin
for(var/ruin_path in ruin.force_ruins)
@@ -106,6 +113,12 @@ GLOBAL_LIST_EMPTY(banned_ruin_ids)
log_admin("Ruin \"[ruin.name]\" force-spawned at ([choice.x], [choice.y], [choice.z])!")
load_ruin(choice, ruin)
#if defined(UNIT_TEST)
var/list/turf/affected_turfs = ruin.get_affected_turfs(choice, TRUE)
GLOB.turfs_to_map_type["[ruin.type]"] = affected_turfs
#endif
selected += ruin
if(!(ruin.template_flags & TEMPLATE_FLAG_ALLOW_DUPLICATES))