MultiZ WIP/Staging #27189

RemieRichards · 2017-05-12T19:01:49Z

Help me/Motivate me to finish this.

TODO:

Feel free to PR to this PR if you want to help.

Brings tablets into the light of modernity Makes their sprites look much more fancy

…o Tablets

Ok lets tone down the steve jobs

Oops wrong save

…o VERTICALITY Conflicts: code/__DEFINES/atmospherics.dm code/controllers/subsystem/air.dm code/modules/atmospherics/environmental/LINDA_system.dm code/modules/atmospherics/machinery/atmosmachinery.dm tgstation.dme

duncathan · 2017-05-12T19:10:01Z

ooo multiz pipes sounds fun

Iamgoofball · 2017-05-12T19:10:39Z

why did you rename the folder back? the codebase standard is lowercase folder names

or is this just temp

RemieRichards · 2017-05-12T19:12:34Z

@Iamgoofball literally wouldn't commit otherwise, every commit attempt reported the files as being "staged in the index", which is git terms for "fucked", they're super-reverted, but just for now, it'll be fixed before merge (though someone else might have to PR that to this PR for me since git is unhappy)

@duncathan there's a stub/attempt at them in the PR, but they're a tad runtime-y at present.
Gas flow works 100% though, flowing up and down through holes, and those ancient ass Zvent things do actually work.

Iamgoofball · 2017-05-12T19:13:37Z

i love git

GunHog · 2017-05-12T19:18:04Z

HEAVY BREATHING

I want this. I want this now. YES YES YES YES YES YES ALL THE YES!! If I could help in any way, I would certainly like to try! A multi-Z station, even if PlanetStation were to fail, would be AMAZEBALLS!

Cyberboss

I don't know if this will need special rules in the map loader. But if not...

Add a multiz_test.json in _maps like this

{
    "map_name": "MultiZ Station",
    "map_path": "map_files/debug",
    "map_file": "multiz_test.dmm",
    "minetype": "lavaland",
    "transition_config":
    {
        "MAIN_STATION": "UNAFFECTED"
    }
}

Cyberboss · 2017-05-12T19:26:22Z

_maps/multiz_test.dm

@@ -0,0 +1,21 @@
+#if !defined(MAP_FILE)


This entire file should be just #define FORCE_MAP "multiz_test.json"

Cyberboss · 2017-05-12T19:27:13Z

code/controllers/subsystem/multiz.dm

+	var/list/zshadows
+
+/datum/subsystem/z_levels/New()
+	NEW_SS_GLOBAL(SSz)


Remove these two lines

Cyberboss · 2017-05-12T19:27:37Z

code/controllers/subsystem/multiz.dm

@@ -0,0 +1,20 @@
+var/datum/subsystem/z_levels/SSz
+
+/datum/subsystem/z_levels


Replace these three lines with SUBSYSTEM_DEF(z_levels)

Cyberboss · 2017-05-12T19:28:05Z

code/game/objects/effects/decals/Cleanable/humans.dm

@@ -60,7 +50,7 @@
 	random_icon_states = list("gib1", "gib2", "gib3", "gib4", "gib5", "gib6")
 	mergeable_decal = 0

-/obj/effect/decal/cleanable/blood/gibs/Initialize()
+/obj/effect/decal/cleanable/blood/gibs/New()
 	..()


Seems you need to revert this entire file to upstream

Cyberboss · 2017-05-12T19:28:50Z

code/game/objects/effects/decals/Cleanable/misc.dm

@@ -11,7 +11,7 @@
 	icon_state = "ash"
 	mergeable_decal = 0

-/obj/effect/decal/cleanable/ash/Initialize()


This one too

Cyberboss · 2017-05-12T19:33:20Z

code/modules/multiz/turfs.dm

+
+
+/turf/open/open_z/Entered(atom/movable/AM, atom/oloc)
+	..()


Another performance worry

Cyberboss · 2017-05-12T19:33:43Z

code/modules/multiz/z_helpers.dm

+	LAZYINITLIST(SSz.vertical_connections)
+	var/list/L = SSz.vertical_connections["[A]"]
+	if(!L)
+		L = list()


LAZYINITLIST(L)

old branch.

Cyberboss · 2017-05-12T19:33:51Z

code/modules/multiz/z_helpers.dm

+	SSz.vertical_connections["[A]"] = L
+	L = SSz.vertical_connections["[B]"]
+	if(!L)
+		L = list()


Cyberboss · 2017-05-12T19:34:18Z

code/modules/multiz/zshadows.dm

+	var/atom/owner
+
+/atom/movable/zshadow/Initialize()
+	..()


Cyberboss · 2017-05-12T19:34:42Z

code/modules/multiz/zshadows.dm

+	return
+
+/atom/movable/zshadow/Destroy()
+	if(!QDELETED(owner)) //Nothing destroys these if their owner exists, they *ARE* their owner as far as we're concerned


check the force param

Isn't ignoring force bad? that annoys me because I want to ignore force here.

Almost nothing uses force atm, but we should support it in case we ever do decide we need it

Cyberboss · 2017-05-12T19:42:15Z

For explosions, might just be as easy as reducing all power levels by some set amount for every level up/down

RemieRichards · 2017-05-12T19:42:54Z

@Cyberboss yes, it's something like that, as I said however, I've just not worked on it in a while (was ensuring the "core" was solid first)

coiax · 2017-05-12T20:17:29Z

@RemieRichards maybe you could shout at me in IRC?

duncathan · 2017-05-12T19:59:01Z

code/modules/atmospherics/machinery/other/zvent.dm

+	content (on/off, volume_rate) aren't implemented.
+
+	Use this for ruins and stuff I guess, or fix it up proper.
+*/


honestly just remove zvent

By that I mean that cross-z connections should only happen between nodes. Making that work shouldn't be too difficult, but having a vent like this is unnecessary complexity for a redundant gain (pipe up connected to a vent is basically the same)

sure I guess, it just seemed cruel to kill it when it survived, semi-working, for such a long time.
rip zvent.

I do appreciate the respect you had for this poor piece of oldmos

optimumtact · 2017-05-13T12:14:51Z

staged in the index just means the files have been git added, but not yet committed, there's absolutely no reason to revert that change

RemieRichards · 2017-05-13T12:19:26Z

I didn't revert it, technically.
I renamed my Cleanable folder to cleanable (because it DIDNT come in the merge commit), and committed that, so they never got updated because they're not the same files (if you look at the cleanable folder's history for example, as far as git is concerned, it only has 2 commits, the rename and MrPerson's mutable appearance changes)

It was quite literally the only thing I could do to commit it (everytime I went to the commit it shat itself about said files), and as I have said, it will be sorted before merge time.

optimumtact · 2017-05-13T12:25:36Z

ok

…o VERTICALITY

RemieRichards · 2017-05-13T14:12:47Z

Right, cleanup is done.
Fixing, Features, Improvements can begin (eg: @duncathan zpipes)

updating master

…ation into RemieRichards-VERTICALITY ok

BeeSting12 · 2017-05-14T17:13:37Z

@RemieRichards
I'm working on a map for this right now which is loosely based on baystation's torch. I should be okay making the different zlevels and I can connect them up later right?

RemieRichards · 2017-05-14T17:14:57Z

yes, though if you put a "zopen" turf on a zlevel, it will automatically connect it's Z level with the one below, which if you're mapping a multiz station you're likely to use zopens for like, balconies and things.

coiax · 2017-05-15T08:42:09Z

Bay's multiz explosion code is not very complex, if you want to look at that.

RemieRichards · 2017-05-15T08:44:24Z

No need, I already have it planned (And I think Razharas is tackling it, I know he's been messing around with it atleast)

Makes vines 3d

Razharas · 2017-05-15T12:04:48Z

For now i pr the 3d vines RemieRichards#18

@RemieRichards Check em //

Checking zlevel connection on creation or movement

3d vines

RemieRichards · 2017-05-15T15:09:18Z

code/modules/multiz/atoms.dm

+	if(zshadow)
+		zshadow.SyncLoc()
+	else
+		if(GetAboveConnectedTurf(src))


This is meant to be GetZOpenAbove(src) (so that Zshadows lazy-create (the creation of a hole above them is already covered))

Makes explosions 3d

…o RemieRichards-VERTICALITY

BeeSting12 · 2017-05-15T20:49:00Z

@RemieRichards
Gravity?

Razharas · 2017-05-15T20:52:46Z

RemieRichards#19

Makes bakuretsutachi 3d

Ausops · 2017-05-28T09:02:50Z

*motivates remie

lzimann · 2017-05-29T21:36:11Z

Just reopen when this keeps going

duncathan · 2017-05-30T16:03:31Z

maybe we should make this a branch on the main repo

lzimann · 2017-05-30T16:04:42Z

That also works.

GunHog · 2017-05-30T16:09:28Z

That is a good idea, this is a long project and seeing it closed could be discouraging to the people working on it!

Cyberboss · 2017-05-30T16:11:03Z

You can also PR a branch

…

On May 30, 2017 12:09 PM, "GunHog" ***@***.***> wrote: That is a good idea, this is a long project and seeing it closed could be discouraging to the people working on it! — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#27189 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AHywesKcmCQLrF4OT7M8OYKTQnBgduyKks5r_D87gaJpZM4NZqk6> .

GunHog · 2017-05-30T16:13:07Z

I am aware.

Razharas and others added 10 commits September 13, 2016 16:38

Brings tablets into the light of modernity

c908dcc

Brings tablets into the light of modernity Makes their sprites look much more fancy

Merge branch 'master' of https://github.com/tgstation/-tg-station int…

ae86990

…o Tablets

Ok lets tone down the steve jobs

c1323c6

Ok lets tone down the steve jobs

Oops wrong save

fdccd22

Oops wrong save

Merge branch 'master' of https://github.com/tgstation/-tg-station

793847d

Merge branch 'master' of https://github.com/tgstation/-tg-station

c9d9b42

Merge branch 'master' of https://github.com/tgstation/-tg-station

f05e5ee

Merge branch 'master' of https://github.com/tgstation/-tg-station

fc2e3d3

Initial framework + Gas Spread + ZShadows + Early attempt at pipes.

a85861d

RemieRichards added Atmospherics Nobody knows how this code works Feature Exposes new bugs in interesting ways Work In Progress labels May 12, 2017

RemieRichards requested review from duncathan and MrStonedOne May 12, 2017 19:01

tgstation-server added the Map Edit label May 12, 2017

Cyberboss requested changes May 12, 2017

View reviewed changes

duncathan reviewed May 12, 2017

View reviewed changes

Merge branch 'master' of https://github.com/tgstation/-tg-station int…

c8f4845

…o VERTICALITY

Rest in peace Zvent.

c3ffeba

RemieRichards force-pushed the VERTICALITY branch from dcae55f to c3ffeba Compare May 13, 2017 14:16

Razharas added 2 commits May 14, 2017 14:43

Merge branch 'master' of https://github.com/tgstation/-tg-station

8b83a6c

updating master

Merge branch 'VERTICALITY' of https://github.com/RemieRichards/-tg-st…

da10817

…ation into RemieRichards-VERTICALITY ok

Makes vines 3d

c133119

Makes vines 3d

Razharas and others added 2 commits May 15, 2017 17:31

Checking zlevel connection on creation or movement

271d02e

Checking zlevel connection on creation or movement

Merge pull request #18 from Razharas/RemieRichards-VERTICALITY

c9f46a2

3d vines

RemieRichards commented May 15, 2017

View reviewed changes

Razharas added 2 commits May 15, 2017 23:39

Makes explosions 3d

1995587

Makes explosions 3d

Merge branch 'master' of https://github.com/tgstation/-tg-station int…

f6dd79d

…o RemieRichards-VERTICALITY

Merge pull request #19 from Razharas/RemieRichards-VERTICALITY

b29247d

Makes bakuretsutachi 3d

lzimann added Merge Conflict Adding upstream files to your repo via drag and drop won't resolve conflicts Stale Even the uncaring universe rejects you, why even go on labels May 29, 2017

lzimann closed this May 29, 2017

duncathan mentioned this pull request May 30, 2017

separate branch for multiz #27873

Closed

		@@ -0,0 +1,20 @@
		var/datum/subsystem/z_levels/SSz

		/datum/subsystem/z_levels

MultiZ WIP/Staging #27189

MultiZ WIP/Staging #27189

Conversation

RemieRichards commented May 12, 2017 • edited by Razharas

TODO:

Feel free to PR to this PR if you want to help.

duncathan commented May 12, 2017

Iamgoofball commented May 12, 2017 • edited

RemieRichards commented May 12, 2017 • edited

Iamgoofball commented May 12, 2017

GunHog commented May 12, 2017

HEAVY BREATHING

Cyberboss 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

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

Choose a reason for hiding this comment

Cyberboss commented May 12, 2017 • edited

RemieRichards commented May 12, 2017

coiax commented May 12, 2017

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

optimumtact commented May 13, 2017

RemieRichards commented May 13, 2017 • edited

optimumtact commented May 13, 2017

RemieRichards commented May 13, 2017

BeeSting12 commented May 14, 2017

RemieRichards commented May 14, 2017

coiax commented May 15, 2017

RemieRichards commented May 15, 2017

Razharas commented May 15, 2017 • edited

Choose a reason for hiding this comment

BeeSting12 commented May 15, 2017

Razharas commented May 15, 2017

Ausops commented May 28, 2017

lzimann commented May 29, 2017

duncathan commented May 30, 2017

lzimann commented May 30, 2017

GunHog commented May 30, 2017

Cyberboss commented May 30, 2017 via email

GunHog commented May 30, 2017

RemieRichards commented May 12, 2017 •

edited by Razharas

Iamgoofball commented May 12, 2017 •

edited

RemieRichards commented May 12, 2017 •

edited

Cyberboss commented May 12, 2017 •

edited

RemieRichards commented May 13, 2017 •

edited

Razharas commented May 15, 2017 •

edited