Tweak outreach map by PsyCommando · Pull Request #380 · PersistentSS13/Nebula

PsyCommando · 2022-08-23T00:51:15Z

Description of changes

Remake the outreach map to be a bit more up to date and interesting.

Changelog

🆑
tweak: Tweaked a lot of things.
/:cl:

PsyCommando · 2022-11-22T21:53:28Z

Gotta clean the trash in this PR

PsyCommando · 2023-02-03T21:59:58Z

Alright, so it passes CI now.

maps/kleibkhar/kleibkhar_exoplanet.dm

NataKilar · 2023-02-03T23:20:03Z

maps/kleibkhar/kleibkhar_exoplanet.dm

+/decl/strata/kleibkhar
+	default_strata_candidate = TRUE
+
+/decl/strata/kleibkhar/subterrane


Subterranean or subterrane? I know both are words.

maps/outreach/outreach_defines.dm

NataKilar · 2023-02-03T23:23:53Z

maps/outreach/outreach_exoplanet.dm

-	water_color = COLOR_BOTTLE_GREEN
-	crust_strata = /decl/strata/sedimentary
+	//Sector Access
+	free_landing          = FALSE


This needs to be TRUE, otherwise nothing can land and take off from the surface.

Speaking of that. I really don't think we should let shuttles land anywhere on the planet, but on docking areas?

Because the shuttle code still lets you land on any z-levels of the planet, and pretty much anywhere without an area protection thing.
That in turn is going to mess with the base turfs when the thing takes off. And I just can't guarantee it won't cause problems or end up being used for griefing.

For reference, landing on a transition edge is going to permanently fuck the map. The underground turfs ended up being less trouble being simulated turfs for allowing laying down cable and etc,. So a shuttle landing there is very bad..

I can turn it back on, but like, can we at least add support for docking ports, so we don't have to deal with shuttle damage again? It's really hard to recover anything that a shuttle destroys.

NataKilar · 2023-02-03T23:26:45Z

maps/outreach/outreach_overmap.dm

+	event_areas = 10
+	map_size_x  = 50
+	map_size_y  = 50
+	var/map_file// = "maps/outreach/outreach-overmap.dmm"


Should this be commented out?

Oh, that actually reminds me I didn't test the overmap -_-
But yeah that's fine. We really shouldn't need to pre-generate the overmap.

NataKilar · 2023-02-03T23:36:41Z

code/game/objects/effects/effect_system.dm

 	for(i=0, i<src.number, i++)
-		addtimer(CALLBACK(src, /datum/effect/effect/system/proc/spread, i), 0)
+		spread(i)
+		//addtimer(CALLBACK(src, /datum/effect/effect/system/proc/spread, i), 0)


Why was this changed? I believe the 0 delay callback is intentional.

It was removed because it caused massive lag when you had a few geysers on the map, and a lot of timer runtimes. Plus, spread already is async anyways?
I actually rewrote that effect for geysers using particles though.

I'll revert that

NataKilar · 2023-02-03T23:39:58Z

code/modules/organs/internal/lungs.dm

 		exhale_type =         species.exhale_type  || /decl/material/gas/carbon_dioxide
 	else
+		//Species-less lungs should be illegal
+		log_debug("Got null species")


Might want to make this debug message more specific

Yeah, that shouldn't be in here. I was debugging why mobs would runtime when breathing.

NataKilar · 2023-02-03T23:40:54Z

code/modules/overmap/sectors.dm

 	. = ..()

 /obj/effect/overmap/visitable/Initialize()
+	log_debug("[src]([x],[y],[z]) creating sector.") //#REMOVEME


Left over debug lines?

NataKilar · 2023-02-03T23:41:02Z

code/modules/overmap/sectors.dm

 	return get_filtered_areas(list(/proc/area_belongs_to_zlevels = map_z))

 /obj/effect/overmap/visitable/proc/find_z_levels()
+	log_debug("[src]([x],[y],[z]) finding z levels. Current z is [z].") //#REMOVEME


NataKilar · 2023-02-03T23:41:34Z

code/modules/overmap/ships/landable.dm

 		landmark.shuttle_name = shuttle
 		LAZYDISTINCTADD(initial_generic_waypoints, landmark.landmark_tag) // this is us being user-friendly: it means we register it properly regardless of whether the mapper put the tag in initial_restricted_waypoints

+	/* //#OUTREACH: Since we delete those right when creating them, might as well just comment this out


This is fine, but you might as well delete the part of the code that actually deletes them as well.

Just for reference, that was to fix the hard deletes.
I'd suggest maybe doing that in another PR? Because this one is extremely bloated as it is.

Docking controller being their usual bugged PoS selves are crashing over duplicate program instances for their convoluted control system. So I just removed the supply shuttle stuff from the map because I'm kinda sick of having to constantly deal with it breaking everything.

NataKilar · 2023-12-13T07:19:48Z

code/controllers/subsystems/mapping.dm

 		level.setup_level_data()

+	// Generate turbolifts last!!!
+	for(var/obj/abstract/turbolift_spawner/turbolift as anything in turbolifts_to_initialize)


Is this something specific for Persistence or could it go upstream eventually?

I think it went upstream already?

It's not unique to outreach, any dynamically loaded maps like away_sites would have that issue if they had elevators.

NataKilar · 2023-12-13T07:22:19Z

code/game/objects/items/stacks/dust.dm

+	use(amount)
+
+// Dust override
+/decl/material


Instinct tells me this should be in the base material file, but the Neb maints can decide once/if it goes upstream

NataKilar · 2023-12-13T07:23:00Z

code/modules/fabrication/designs/imprinter/designs_misc_circuits.dm

+	path = /obj/item/stock_parts/circuitboard/geothermal
+
+/datum/fabricator_recipe/imprinter/circuit/radiocarbon_spectrometer
+	path = /obj/item/stock_parts/circuitboard/radiocarbon_spectrometer


New line here if you get the chance

NataKilar · 2023-12-13T07:26:17Z

code/unit_tests/map_tests.dm

 	if(!isStationLevel(source_turf.z))
 		return TRUE

+	if(locate(/obj/abstract/landmark/skip_test) in source_turf)


Is this the only test this should be checked?

For now yes. But it's a work in progress tool for convenience.

NataKilar · 2023-12-13T07:28:26Z

maps/outreach/outreach_machinery.dm

+////////////////////////////////////////////////////////////////////////
+// Defense Turret
+////////////////////////////////////////////////////////////////////////
+/obj/machinery/porta_turret/stationary/stun


Making a note that we'll need to replace these with the new turrets once they're in

NataKilar

Further map adjustments can be made in future PRs. This seems fine.

PsyCommando added the 🆕 enhancement New feature or request label Aug 23, 2022

PsyCommando added this to the post open testing milestone Aug 23, 2022

PsyCommando self-assigned this Aug 23, 2022

PsyCommando force-pushed the tweak-outreach-map branch 21 times, most recently from f4a7e85 to 9cd2e66 Compare January 26, 2023 04:05

PsyCommando marked this pull request as ready for review February 3, 2023 21:59

NataKilar requested changes Feb 3, 2023

View reviewed changes

PsyCommando requested a review from NataKilar February 4, 2023 21:59

PsyCommando linked an issue Mar 9, 2023 that may be closed by this pull request

Outreach map renovation #284

Closed

PsyCommando added 20 commits August 9, 2023 17:53

remove old strata var

ed19706

Make turbolift generate last

368bed5

properly offset wall recharger

3e3be14

Properly offset wall dispensers

cf33d68

comment sequential guid gen

2145997

godmode check on fire acts

6cd4a11

Don't save mimic edges

a6394fc

Update outreach_elevators.dm

3327413

Merge remote-tracking branch 'upstream/dev' into tweak-outreach-map

54d0c46

Update outreach-4.dmm

88e51b0

satisfy mapping gods

b1f3f4a

Update outreach_south-2.dmm

24a3caa

added missing unit test overrides

a3c6c2b

fixes missing species

5be703c

fix duplicate catwalk spawning

9a604e4

formatting changes

79cb5fd

Get area tests to behave

a412966

Fix missing scrubber

3bb3f97

Some area fixes

f2ebce3

PsyCommando force-pushed the tweak-outreach-map branch from 814bb4b to f2ebce3 Compare October 2, 2023 19:24

PsyCommando added 2 commits October 3, 2023 13:45

Fix list error during unit tests

bee92de

Fix internet uplink templates

8e9f9a8

PsyCommando force-pushed the tweak-outreach-map branch from ca7ad09 to 8e9f9a8 Compare October 3, 2023 17:45

PsyCommando added 3 commits October 3, 2023 19:22

Update outreach_test.dm

5770cf9

Test

dae51fd

Merge remote-tracking branch 'upstream/dev' into tweak-outreach-map

7345a84

NataKilar reviewed Dec 13, 2023

View reviewed changes

NataKilar approved these changes Dec 15, 2023

View reviewed changes

NataKilar merged commit 3a79f07 into PersistentSS13:dev Dec 15, 2023

Conversation

PsyCommando commented Aug 23, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description of changes

Changelog

Uh oh!

PsyCommando commented Nov 22, 2022

Uh oh!

PsyCommando commented Feb 3, 2023

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

NataKilar left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

PsyCommando commented Aug 23, 2022 •

edited

Loading