Moves breathing from species to the lung organ #20869

AKlimentyev · 2016-10-08T23:03:16Z

🆑
experiment: Breathing has been moved from species to the lung organ
add: Lung transplants are now possible!
/:cl:

…gaswalkers

PKPenguin321 · 2016-10-08T23:26:08Z

Slightly related, we really really really need to refactor eye damage/color to be dependent on an eyes organ

WJohn · 2016-10-08T23:32:33Z

Does this make it so if you transplant ashwalker lungs into yourself, you'll be able to breathe on lavaland without equipment?

RemieRichards · 2016-10-08T23:37:43Z

code/modules/station_goals/dna_vault.dm

@@ -257,8 +257,10 @@ var/list/non_simple_animals = typecacheof(list(/mob/living/carbon/monkey,/mob/li
 	switch(upgrade_type)
 		if(VAULT_TOXIN)
 			H << "<span class='notice'>You feel resistant to airborne toxins.</span>"
-			S.tox_breath_dam_min = 0
-			S.tox_breath_dam_max = 0
+			if(/obj/item/organ/lungs in H.internal_organs)


false.

the H.internal_organs list will never contain the path /obj/item/organ/lungs, or any paths at all for that matter!
It's a lit of objects.

you're probably forgetting a locate() call

Oh. I didn't know that didn't work with objects.

Well /obj/item/organ/lungs and an instantiated lung object are completely different.
that lung object's .type variable however is a 100% match for /obj/item/organ/lungs

paths != objects

It would be if(locate(/obj/item/organ/lungs) in H.internal_organs) then, right?

@RemieRichards k. I fixed it.

AKlimentyev · 2016-10-08T23:50:13Z

@WJohn actually, no.
Ash walkers have NOBREATH, which is still part of the species. I'm not sure if they even have lungs due to that.
I'm planning on adding N2 to the list of breathable gasses and have ashwalkers breath lavaland airmix in a later pr.
That was actually the original purpose of the pr (hence the branch name), but @phil235 asked me to move breathing to lungs, so I did that instead.

GunHog · 2016-10-09T00:51:33Z

What lung types are there? Could I give a guy Xeno lungs for breathing plasma and removing the need for oxygen? Cybernetic lungs for immunity to toxic gasses? Plasmaman lungs for FORCING people to breathe plasma?

AKlimentyev · 2016-10-09T02:33:15Z

@GunHog
If you made subtypes, yes.
At the moment, the lungs set their vars based off of the species where they originated from.
Also, I don't think xeno lungs work with this system. They have separate breathing code.

FantasticFwoosh · 2016-10-09T16:58:31Z

If you steal ashwalker/golem lungs, and aug a body, then suppliment a heat gene you are effectively space proof when revived from practically any condition of death with strange reagent.

This is a slightly better alternative to reattaching to a ashwalker torso, and will fuel my surgeon experiments.

PKPenguin321 · 2016-10-09T17:32:02Z

You don't need augs to space proof, cold res handles pressure resistance

FantasticFwoosh · 2016-10-10T09:29:21Z

Double checked, ashwalkers and NOBREATHE related races have their lungs qdeleted in the code.

So no-breathe transplanted lungs are currently impossible without badminnery to restore said lungs and assign them to the owner.

coiax · 2016-10-10T12:33:49Z

I specifically did the NOBREATH species having no lungs, because it made no sense for golems and skeletons to have a set of lungs. If ashwalkers are being switched to a lavaland gas mixture, then they won't be NOBREATH anymore.

phil235 · 2016-10-10T13:42:21Z

code/modules/mob/living/carbon/human/life.dm

+
+		return 0
+	else
+		if(istype(L,/obj/item/organ/lungs))


people can have an organ in the lung slot that isn't /obj/item/organ/lungs ??

Badmins? Idk.
I just like to do an istype before casting stuff, just in case.
Should I remove this check then?

Well, I don't really see what admins could use a non lung organ in the lung slot for. But I guess it prevents potential runtimes, so let's keep it.

nullbear · 2016-10-11T01:14:02Z

I cant wait for the entire server to die of suffocation within 3 minutes of starting the round if this bugs out.

AKlimentyev · 2016-10-11T02:08:46Z

I tested it. it works fine

PKPenguin321 · 2016-10-11T02:26:24Z

famous last words

Razharas · 2016-10-12T01:24:07Z

First step in porting all the species behaviour to organs

Wonderful

RemieRichards · 2016-10-12T01:25:07Z

>First Step
>Probably the 3 or 4th time functionality has been moved to an organ

HMMMMMMM.

Razharas

Moving stuff from mobs\species to organs is the goal

Razharas · 2016-10-12T01:26:23Z

Thats the first one i see so its first for me

optimumtact · 2016-10-12T02:44:57Z

code/modules/surgery/organs/organ_internal.dm

+
+	//-- TRACES --//
+
+	if(breath && !(NOBREATH in specflags))	// If there's some other shit in the air lets deal with it here.


there's no point in checking this because NOBREATH species will have no lungs and this line will never be reached if that is the case.

what if you insert lungs into a human with NOBREATH?

I dunno. Haven't tested it post check removal yet.
I'd assume either the check in the species would make them still not breath, or they would need to breath.

Things with nobreath shouldnt even try to call their lungs procs
Thus inserting lungs into them should be as impactful as inserting a bike horn into their cavity

Well there is what should happen and then what the code actually does, so you would need to check.

Ok, tested it. If the species has nobreath, they basically skip breathe(), and don't call check_breath() which is where the lung code is.
So they don't breathe if you transplant lungs into them.

Anonmare · 2016-10-12T12:19:50Z

I'm hopeful for this PR

phil235 · 2016-10-19T16:52:12Z

code/modules/mob/living/carbon/human/species.dm

@@ -150,6 +132,9 @@
 	else if((!(NOBREATH in specflags)) && (!lungs))
 		lungs = new()
 		lungs.Insert(C)
+	if(lungs)
+		lungs.breathlevels = list("safe_oxygen_min" = safe_oxygen_min,"safe_oxygen_max" = safe_oxygen_max,"safe_co2_min" = safe_co2_min,"safe_co2_max" = safe_co2_max,
+	"safe_toxins_min" = safe_toxins_min,"safe_toxins_max" = safe_toxins_max,"SA_para_min" = SA_para_min,"SA_sleep_min" = SA_sleep_min,"BZ_trip_balls_min" = BZ_trip_balls_min)


in human/New() organs are created after setting up the species, so if we make lizard have special values, their lung won't have those.

…gaswalkers

creates lung subtypes

AKlimentyev · 2016-10-20T02:49:26Z

@phil235 I did the change you suggested, but now the lungs aren't spawning in humans.
I cant figure out what I did wrong, ahhhhhhhh!

phil235 · 2016-10-20T11:25:20Z

code/modules/mob/living/carbon/human/human.dm

+		if(dna.species.mutantlungs)
+			internal_organs += new dna.species.mutantlungs()
+		else
+			internal_organs += new /obj/item/organ/lungs


phil235 · 2016-10-20T11:26:26Z

code/modules/mob/living/carbon/human/life.dm

 				throw_alert("not_enough_tox", /obj/screen/alert/not_enough_tox)
-			else if(S.safe_co2_min)
+			else if(S.breathid = "co2")


phil235 · 2016-10-20T11:26:29Z

code/modules/mob/living/carbon/human/life.dm

 				throw_alert("oxy", /obj/screen/alert/oxy)
-			else if(S.safe_toxins_min)
+			else if(S.breathid = "tox")


phil235 · 2016-10-20T11:26:31Z

code/modules/mob/living/carbon/human/life.dm

@@ -108,11 +108,11 @@
 		if(dna && dna.species)
 			var/datum/species/S = dna.species

-			if(S.safe_oxygen_min)
+			if(S.breathid = "o2")


phil235 · 2016-10-20T11:28:35Z

code/modules/mob/living/carbon/human/life.dm

+				throw_alert("oxy", /obj/screen/alert/oxy)
+			else if(S.breathid = "tox")
+				throw_alert("not_enough_tox", /obj/screen/alert/not_enough_tox)
+			else if(S.breathid = "co2")


phil235 · 2016-10-20T11:28:38Z

code/modules/mob/living/carbon/human/life.dm

+
+			if(S.breathid = "o2")
+				throw_alert("oxy", /obj/screen/alert/oxy)
+			else if(S.breathid = "tox")


phil235 · 2016-10-20T11:28:40Z

code/modules/mob/living/carbon/human/life.dm

+		if(dna && dna.species)
+			var/datum/species/S = dna.species
+
+			if(S.breathid = "o2")


AKlimentyev · 2016-10-20T15:40:17Z

Compiles now. lungs still not spawning ;_;
So confused as to what I'm doing wrong.

phil235 · 2016-10-20T17:29:27Z

Manually calling create_internal_organs() gives lungs, and adminspawned humans correctly have lungs. So it's only happening when players are first spawned by the game, or when they join the game.

edit: found the issue.

phil235 · 2016-10-20T17:31:37Z

code/modules/mob/living/carbon/human/species.dm

@@ -144,11 +119,14 @@
 		heart = new()
 		heart.Insert(C)

-	if((NOBREATH in specflags) && lungs)
+	if(lungs)
 		lungs.Remove(C)
 		qdel(lungs)


you're not immediately nullifying lungs so the if(!lungs) check below fails.

Shadowlight213 added 5 commits September 20, 2016 14:06

First commit on moving breathing from species to an organ.

d6c93bc

Merge branch 'master' of https://github.com/tgstation/tgstation into …

94be240

…gaswalkers

Finalization and cleanup

e6fe683

Fix up alerts for no lungs

4de562d

Removes extra defines

62dda55

optimumtact added the Refactor Makes the code harder to read label Oct 8, 2016

RemieRichards suggested changes Oct 8, 2016

View reviewed changes

locate

c0275aa

RemieRichards approved these changes Oct 10, 2016

View reviewed changes

phil235 reviewed Oct 10, 2016

View reviewed changes

Razharas approved these changes Oct 12, 2016

View reviewed changes

optimumtact reviewed Oct 12, 2016

View reviewed changes

removes nobreath checks in lungs

108cdb2

Web-Mang mentioned this pull request Oct 19, 2016

Half of the game screen are just black tiles #21066

Closed

phil235 reviewed Oct 19, 2016

View reviewed changes

Shadowlight213 added 2 commits October 19, 2016 16:34

Merge branch 'master' of https://github.com/tgstation/tgstation into …

865ca10

…gaswalkers

removes breath mix vars from species

e7f9c7e

creates lung subtypes

AKlimentyev changed the title ~~Moves breathing from species to the lung organ~~ [WIP]Moves breathing from species to the lung organ Oct 20, 2016

phil235 reviewed Oct 20, 2016

View reviewed changes

Fixes. compiles now

df3b787

phil235 reviewed Oct 20, 2016

View reviewed changes

Yay for Phil!

0b37b5a

AKlimentyev changed the title ~~[WIP]Moves breathing from species to the lung organ~~ Moves breathing from species to the lung organ Oct 21, 2016

Cheridan merged commit 091e101 into tgstation:master Oct 21, 2016

tgstation-server added a commit that referenced this pull request Oct 21, 2016

Automatic changelog generation for PR #20869 [ci skip]

3d89474

AKlimentyev deleted the gaswalkers branch October 21, 2016 16:52


		//-- TRACES --//

		if(breath && !(NOBREATH in specflags)) // If there's some other shit in the air lets deal with it here.

Moves breathing from species to the lung organ #20869

Moves breathing from species to the lung organ #20869

Conversation

AKlimentyev commented Oct 8, 2016

PKPenguin321 commented Oct 8, 2016

WJohn commented Oct 8, 2016

RemieRichards Oct 8, 2016 • edited

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

AKlimentyev commented Oct 8, 2016

GunHog commented Oct 9, 2016

AKlimentyev commented Oct 9, 2016

FantasticFwoosh commented Oct 9, 2016

PKPenguin321 commented Oct 9, 2016

FantasticFwoosh commented Oct 10, 2016

coiax commented Oct 10, 2016

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

nullbear commented Oct 11, 2016

AKlimentyev commented Oct 11, 2016

PKPenguin321 commented Oct 11, 2016

Razharas commented Oct 12, 2016

RemieRichards commented Oct 12, 2016 • edited

Razharas left a comment

Choose a reason for hiding this comment

Razharas commented Oct 12, 2016

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

Anonmare commented Oct 12, 2016

Choose a reason for hiding this comment

AKlimentyev commented Oct 20, 2016

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

phil235 Oct 20, 2016 • edited

Choose a reason for hiding this comment

phil235 Oct 20, 2016 • edited

Choose a reason for hiding this comment

phil235 Oct 20, 2016 • edited

Choose a reason for hiding this comment

AKlimentyev commented Oct 20, 2016

phil235 commented Oct 20, 2016 • edited

phil235 Oct 20, 2016 • edited

Choose a reason for hiding this comment

RemieRichards Oct 8, 2016 •

edited

RemieRichards commented Oct 12, 2016 •

edited

phil235 Oct 20, 2016 •

edited

phil235 Oct 20, 2016 •

edited

phil235 Oct 20, 2016 •

edited

phil235 commented Oct 20, 2016 •

edited

phil235 Oct 20, 2016 •

edited