Wasteplanet Pandora Remap (REQUIRES #1945) #2022

Zevotech · 2023-06-06T20:56:47Z

About The Pull Request

Remaps wasteplanet_pandora to not be a tiny box with a one-way entry into a locked room with a pandora. Requires #1945 to be merged or at least test merged.

Why It's Good For The Game

shit ruin must remap

Changelog

🆑
Add: Remapped wasteplanet_pandora
/:cl:

that is to say creates biomes for waste planets

hivebot spawners in next update

…to pandoradeez

Zevotech · 2023-06-06T21:04:18Z

is there genuinely a fucking check dedicated to the spelling of centcom? im dying.

Valorium-RB · 2023-06-07T05:15:35Z

The note(s) used are a bit too brazen, methinks. If it were wrapped in about three pounds of corpo-speak and less overtly colonialist then it'd be about fine.

Zevotech · 2023-06-07T05:23:46Z

The note(s) used are a bit too brazen, methinks. If it were wrapped in about three pounds of corpo-speak and less overtly colonialist then it'd be about fine.

its meant to be old "practically a government" nanotrasen so thats what i went for. examples of how to improve it are appreciated though.

…to pandoradeez

Latentish · 2023-06-07T09:04:45Z

The note(s) used are a bit too brazen, methinks. If it were wrapped in about three pounds of corpo-speak and less overtly colonialist then it'd be about fine.

its meant to be old "practically a government" nanotrasen so thats what i went for. examples of how to improve it are appreciated though.

Remove the colonial racism, make the note less edgy.
Or remove it entirely. It doesn't totally need to be there.

Zevotech · 2023-06-07T09:14:34Z

The note(s) used are a bit too brazen, methinks. If it were wrapped in about three pounds of corpo-speak and less overtly colonialist then it'd be about fine.

its meant to be old "practically a government" nanotrasen so thats what i went for. examples of how to improve it are appreciated though.

Remove the colonial racism, make the note less edgy. Or remove it entirely. It doesn't totally need to be there.

yk what good point. entirely environmental storytelling it is.

Zevotech · 2023-06-07T09:49:22Z

up to date and tm ready

github-actions · 2023-06-09T03:09:17Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

Erikafox · 2023-06-13T18:33:34Z

resolve your merge conflicts

PrefabQuasar · 2023-06-13T20:19:33Z

looks like a large improvement over the original, once merge conflicts are fixed, id like to see it TM'd

Signed-off-by: zevo <95449138+Zevotech@users.noreply.github.com>

Zevotech · 2023-06-14T05:49:29Z

that should handle the conflicts. not sure why github is inserting the file comparison marks directly into the code but at least its easily fixed

Latentish · 2023-06-14T11:11:30Z

Please update your images.
Also I agree with prefab, tm'able.

Latentish

I like this. I tested it in game, it's pretty good. I like the arena.

code/datums/mapgen/planetary/WasteGenerator.dm

Erikafox · 2023-07-06T06:00:39Z

code/game/turfs/open/floor/plating/wasteplanet.dm

+/turf/open/water/waste/lit
+	light_range = 2
+	light_power = 0.2
+	light_color = LIGHT_COLOR_LAVA


Suggested change

light_color = LIGHT_COLOR_LAVA

light_color = LIGHT_COLOR_FLARE

Erikafox · 2023-07-06T06:00:52Z

code/game/turfs/open/floor/plating/wasteplanet.dm

+/turf/open/floor/plating/dirt/old/waste/lit
+	light_range = 2
+	light_power = 0.2
+	light_color = LIGHT_COLOR_LAVA


Suggested change

light_color = LIGHT_COLOR_LAVA

light_color = LIGHT_COLOR_FLARE

Erikafox · 2023-07-06T06:01:01Z

code/game/turfs/open/floor/plating/wasteplanet.dm

+/turf/open/floor/plating/grass/wasteplanet/lit
+	light_range = 2
+	light_power = 0.2
+	light_color = LIGHT_COLOR_LAVA


Suggested change

light_color = LIGHT_COLOR_LAVA

light_color = LIGHT_COLOR_FLARE

Erikafox · 2023-07-06T06:01:47Z

code/game/turfs/open/floor/plating/wasteplanet.dm

+	initial_gas_mix = OPENTURF_DEFAULT_ATMOS
+	planetary_atmos = TRUE
+
+/turf/open/water/waste/lit


define the lits where the rest of them are defined in file. That is to say at the bottom.

Erikafox · 2023-07-06T06:01:58Z

code/game/turfs/open/floor/plating/wasteplanet.dm

@@ -48,4 +53,45 @@
 /turf/open/water/tar/waste/lit
 	light_range = 2
 	light_power = 0.2
+	light_color = LIGHT_COLOR_LAVA


Suggested change

light_color = LIGHT_COLOR_LAVA

light_color = LIGHT_COLOR_FLARE

Erikafox

If something has planetary atmos it needs to match the atmosphere of the planet it's on, otherwise you're just making atmos lag fnr.

Erikafox · 2023-07-06T06:03:09Z

code/game/turfs/open/floor/plating/wasteplanet.dm

+	light_color = LIGHT_COLOR_LAVA
+
+/turf/open/floor/plating/dirt/old/waste
+	initial_gas_mix = OPENTURF_DEFAULT_ATMOS


also:

Suggested change

initial_gas_mix = OPENTURF_DEFAULT_ATMOS

initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS

Erikafox · 2023-07-06T06:03:29Z

code/game/turfs/open/floor/plating/wasteplanet.dm

+	light_color = LIGHT_COLOR_LAVA
+
+/turf/open/floor/wood/waste
+	initial_gas_mix = OPENTURF_DEFAULT_ATMOS


Suggested change

initial_gas_mix = OPENTURF_DEFAULT_ATMOS

initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS

Erikafox · 2023-07-06T06:03:39Z

code/game/turfs/open/floor/plating/wasteplanet.dm

+	planetary_atmos = TRUE
+
+/turf/open/indestructible/hierophant/waste
+	initial_gas_mix = OPENTURF_DEFAULT_ATMOS


Suggested change

initial_gas_mix = OPENTURF_DEFAULT_ATMOS

initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS

Erikafox · 2023-07-06T06:03:44Z

code/game/turfs/open/floor/plating/wasteplanet.dm

+	planetary_atmos = TRUE
+
+/turf/open/indestructible/hierophant/two/waste
+	initial_gas_mix = OPENTURF_DEFAULT_ATMOS


Suggested change

initial_gas_mix = OPENTURF_DEFAULT_ATMOS

initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS

…to pandoradeez

Zevotech · 2023-07-07T22:57:52Z

images updated and reviews addressed

Erikafox · 2023-07-14T16:49:16Z

code/game/turfs/open/floor/plating/wasteplanet.dm

 //open turfs then open lits.

 /turf/open/floor/plating/wasteplanet/lit
 	light_range = 2
 	light_power = 0.2
 	light_color = LIGHT_COLOR_FLARE

+/turf/open/floor/plating/rust/wasteplanet/lit


you need to scrub this out. the already defined path is /plating/wasteplanet/rust/lit

Erikafox · 2023-07-14T16:49:24Z

code/datums/mapgen/planetary/WasteGenerator.dm

@@ -368,6 +374,7 @@

 /datum/biome/cave/waste/metal //deeper in, there's no normal stuff here
 	open_turf_types = list(
+		/turf/open/floor/plating/rust/wasteplanet = 10,


Erikafox · 2023-07-14T16:49:26Z

code/datums/mapgen/planetary/WasteGenerator.dm

@@ -334,6 +339,7 @@
 /datum/biome/cave/waste/tar_bed //tar colorings here
 	open_turf_types = list(
 		/turf/open/floor/plating/asteroid/wasteplanet = 70,
+		/turf/open/floor/plating/rust/wasteplanet = 20,


Erikafox · 2023-07-14T16:49:30Z

code/datums/mapgen/planetary/WasteGenerator.dm

@@ -274,6 +278,7 @@
 /datum/biome/cave/waste
 	open_turf_types = list(
 		/turf/open/floor/plating/asteroid/wasteplanet = 80,
+		/turf/open/floor/plating/rust/wasteplanet = 15,


Erikafox · 2023-07-14T16:49:33Z

code/datums/mapgen/planetary/WasteGenerator.dm

@@ -265,6 +268,7 @@
 /datum/biome/waste/metal/rust
 	open_turf_types = list(
 		/turf/open/floor/plating/asteroid/wasteplanet/lit = 1,
+		/turf/open/floor/plating/rust/wasteplanet/lit = 10,


Erikafox · 2023-07-14T16:49:37Z

code/datums/mapgen/planetary/WasteGenerator.dm

@@ -220,6 +222,7 @@
 /datum/biome/waste/metal
 	open_turf_types = list(
 		/turf/open/floor/plating/asteroid/wasteplanet/lit = 5,
+		/turf/open/floor/plating/rust/wasteplanet/lit = 45,


Erikafox · 2023-07-14T16:49:41Z

code/datums/mapgen/planetary/WasteGenerator.dm

@@ -208,6 +209,7 @@
 /datum/biome/waste/tar_bed //tar colorings
 	open_turf_types = list(
 		/turf/open/floor/plating/asteroid/wasteplanet/lit = 70,
+		/turf/open/floor/plating/rust/wasteplanet/lit = 10,


Erikafox · 2023-07-14T16:49:45Z

code/datums/mapgen/planetary/WasteGenerator.dm

@@ -154,6 +154,7 @@
 /datum/biome/waste/crater
 	open_turf_types = list(
 		/turf/open/floor/plating/asteroid/wasteplanet/lit = 90,
+		/turf/open/floor/plating/rust/wasteplanet/lit = 10,


Erikafox · 2023-08-05T15:23:12Z

ping us when you feel like addressing the review I left.

Zevotech · 2023-08-19T23:09:41Z

maptainers reopen pls

Erikafox added 10 commits May 6, 2023 23:37

does what this pr is supposed to do

e74e62e

that is to say creates biomes for waste planets

2.0

b095cbe

hivebot spawners in next update

Update WasteGenerator.dm

070e111

reduces radiation

4c47972

more loot drops

c92c7a4

Update lootdrop.dm

6b28315

finishes my pr

094362d

Update WasteGenerator.dm

ff069fe

Merge branch 'master' into Wasteplanet-Biomes

808a98a

finishes the pr v2

7594757

Zevotech requested a review from MarkSuckerberg as a code owner June 6, 2023 20:56

uncanny

9bfcf9b

github-actions bot added Code change Watch something violently break. DME Edit labels Jun 6, 2023

Zevotech requested a review from a team as a code owner June 6, 2023 20:57

github-actions bot added the Map Change Tile placing is hard. Thank you for your service. label Jun 6, 2023

Zevotech added 2 commits June 6, 2023 16:57

Merge branch 'master' of https://github.com/shiptest-ss13/Shiptest in…

ab0d236

…to pandoradeez

update to current shiptest-ss13#1945

2884bf3

Zevotech added 3 commits June 6, 2023 17:06

appeasing the centcom check

6dfd700

fix mysterious compile issues

1750db4

fixing the grass

563dffd

Merge branch 'master' of https://github.com/shiptest-ss13/Shiptest in…

b18aae8

…to pandoradeez

removes notes and their code.

fa25dea

github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Jun 9, 2023

Merge branch 'master' into pandoradeez

f362321

Signed-off-by: zevo <95449138+Zevotech@users.noreply.github.com>

github-actions bot removed Merge Conflict Use Git Hooks, you're welcome. DME Edit labels Jun 14, 2023

Latentish added the Test Merge Candidate You do it for free. label Jun 14, 2023

Latentish approved these changes Jul 6, 2023

View reviewed changes

Latentish requested changes Jul 6, 2023

View reviewed changes

code/datums/mapgen/planetary/WasteGenerator.dm Outdated Show resolved Hide resolved

Erikafox suggested changes Jul 6, 2023

View reviewed changes

Zevotech and others added 4 commits July 7, 2023 18:17

hope this works lol

9bbfdb6

Merge branch 'pandoradeez' of https://github.com/Zevotech/Shiptest in…

a64c83d

…to pandoradeez

whoopsies!

61d0ee7

Merge branch 'master' into pandoradeez

d1a0770

Erikafox suggested changes Jul 14, 2023

View reviewed changes

Merge branch 'master' into pandoradeez

c3b2f09

Erikafox removed the Test Merge Candidate You do it for free. label Aug 5, 2023

Erikafox closed this Aug 5, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Wasteplanet Pandora Remap (REQUIRES #1945) #2022

Wasteplanet Pandora Remap (REQUIRES #1945) #2022

Zevotech commented Jun 6, 2023 •

edited

Loading

Zevotech commented Jun 6, 2023

Valorium-RB commented Jun 7, 2023

Zevotech commented Jun 7, 2023

Latentish commented Jun 7, 2023

Zevotech commented Jun 7, 2023

Zevotech commented Jun 7, 2023

github-actions bot commented Jun 9, 2023

Erikafox commented Jun 13, 2023

PrefabQuasar commented Jun 13, 2023

Zevotech commented Jun 14, 2023

Latentish commented Jun 14, 2023

Latentish left a comment

Erikafox Jul 6, 2023

Erikafox Jul 6, 2023

Erikafox Jul 6, 2023

Erikafox Jul 6, 2023

Erikafox Jul 6, 2023

Erikafox left a comment

Erikafox Jul 6, 2023

Erikafox Jul 6, 2023

Erikafox Jul 6, 2023

Erikafox Jul 6, 2023

Zevotech commented Jul 7, 2023

Erikafox Jul 14, 2023

Erikafox Jul 14, 2023

Erikafox Jul 14, 2023

Erikafox Jul 14, 2023

Erikafox Jul 14, 2023

Erikafox Jul 14, 2023

Erikafox Jul 14, 2023

Erikafox Jul 14, 2023

Erikafox commented Aug 5, 2023

Zevotech commented Aug 19, 2023

	light_color = LIGHT_COLOR_LAVA
	light_color = LIGHT_COLOR_FLARE

	initial_gas_mix = OPENTURF_DEFAULT_ATMOS
	initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS

Wasteplanet Pandora Remap (REQUIRES #1945) #2022

Wasteplanet Pandora Remap (REQUIRES #1945) #2022

Conversation

Zevotech commented Jun 6, 2023 • edited Loading

About The Pull Request

Why It's Good For The Game

Changelog

Zevotech commented Jun 6, 2023

Valorium-RB commented Jun 7, 2023

Zevotech commented Jun 7, 2023

Latentish commented Jun 7, 2023

Zevotech commented Jun 7, 2023

Zevotech commented Jun 7, 2023

github-actions bot commented Jun 9, 2023

Erikafox commented Jun 13, 2023

PrefabQuasar commented Jun 13, 2023

Zevotech commented Jun 14, 2023

Latentish commented Jun 14, 2023

Latentish left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Erikafox left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Zevotech commented Jul 7, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Erikafox commented Aug 5, 2023

Zevotech commented Aug 19, 2023

Zevotech commented Jun 6, 2023 •

edited

Loading