[HOLY SHIT!]Charlie, lets go to candy mountain, charlie #2903

Aurorablade · 2015-12-20T03:51:22Z

KINDA READY FOR REVIEW OF THIS SHIT

moved organs folder into surgery folder cuase i LIKE that kind of orgnazation.

This shit dosen't even compile yet...But in the interest of sleep for work soon...and the fact i need to go fix that changeling shit...i am making a pr..so heres my half assed notes i have been keeping in a note pad...

note to self, not diona expert, we can also now spawn diona nymphs on insert or remove. if we wants.

Suggest new locations for organ slots as needed please...

I am not making ipc organs a subtype of organic organs unless someone wants me too...

might need to rip out organ tag...dunno...

Two heads are better then one if i can do something under the revamp in a diffrent way i missed slap me in the head with it.

All in all this will hopefully allow for more dynamic organs !!FUN!! and other. Yes based on TG. also some of the xeno stuff might need updates to the entire mode later.

shit i need to do for these fucking organs.

(Changelog courtsy of falseincarnate with edits))
🆑 Fethas

rscadd: Adds a bunch of bugs to surgery and organ code.(Revemps surgery and organs)
rscdel: Removes shitty old organs.
rscadd: Adds new shitty organs like honk tumors and beard organs.(no really...admin honk tumor..HONK)
tweak: Breaks IPCs in a different way(....Tested but something is gonna break)
/:cl:

TheDZD · 2015-12-20T03:53:46Z

note to self, not diona expert, we can also now spawn diona nymphs on insert or remove. if we wants.

Spawning Diona nymphs upon certain diona organs being removed was a Bay thing, which I thought we tactically nuked, it should really stay dead.

Aurorablade · 2015-12-20T03:55:07Z

it shall stay dead then! least cancan do the gestalt thing now...better...maybe..

tigercat2000 · 2015-12-20T03:57:49Z

code/modules/surgery/organs/subtypes/xenos.dm

+	icon_state = "stomach-x"
+	slot = "resinspinner"
+	origin_tech = "biotech=5;materials=4"
+	alien_powers = list(/mob/living/carbon/alien/humanoid/proc/resin)


Earthdivine · 2015-12-20T04:37:40Z

I thought we wanted to keep Baysurgery for how useful and better it is compared to TG's?

TheDZD · 2015-12-20T04:40:39Z

@Earthdivine The only real upside Bay surgery has over -tg- surgery is that you can shift from one surgery to another/do multiple surgeries at a time, although even that tends to break. Aside from that, some people dislike surgical drapes, and surgery code is hell to work with. It's significantly easier to make new surgeries with -tg- surgery code-wise, and you don't have to worry about conflicting steps. That said, I don't believe that @Aurorablade is doing a 1:1 port.

Spacemanspark · 2015-12-20T04:42:11Z

When you say you're not making IPC organs a subtype, does that mean you're making them it's own parent, or that IPCs will just have organic organs?

Aurorablade · 2015-12-20T04:54:06Z

@Earthdivine i am gonna try to keep it similiar to how it is now but better...

@Spacemanspark instead of organ/internal/heart/cell just organ/internal/cell unless that ends up not working...

Spacemanspark · 2015-12-20T04:55:01Z

Alrighty.

KasparoVy · 2015-12-20T07:35:53Z

Not very happy about losing baysurgery, had a great time with it so far. But w/e

Fox-McCloud · 2015-12-20T08:07:40Z

we haven't fully decided how we will progress with organ surgery, so don't get too uptight just yet =3

marlyn-x86 · 2015-12-20T09:40:10Z

so so so so so so

I think you should have each surgery step datum have a function to check if it has been completed, so that you can mix the fluidity of -tg- surgery with the intricacy of the baysurgery - you're probably already planning something like this though so my advice here is most likely le dumb

Also tyvm for making internal and external organs two completely different things I'm not sure what bay was thinking

The system I've got going in my multibrain fix PR is somewhat hacky, since it checks if there's already an organ registered to the organs_by_name list on the human, perhaps there's a better system to set up there

And finally... well, good luck, I guess, this is going to take a fair bit of doing, from what I've gleaned from the code, and how pervasive organ junk is.

👍

ZomgPonies · 2015-12-20T11:23:21Z

@Aurorablade Whatever you decide for synthetic organs, make sure it's easily expandable to a whole cybernetics system. Maybe have organs/internal/heart/organic and cybernetic. Just throwing that out there.

Aurorablade · 2015-12-20T11:41:21Z

o think i can use tags....but will see later...need to finish feeding dogs...then more sleep...

MistakeNot4892 · 2015-12-20T14:27:45Z

Also tyvm for making internal and external organs two completely different things I'm not sure what bay was thinking

Most of the weird bullshit with the current iteration of Bay organs came from the fact that the project to unify them and turn them into objects involved working with some of the crustiest and most awful shit in our codebase. Someday I'm going to go back and do another pass to make the entire mess more sane and easy to maintain.

please note, anything further on changling may invovle updates to game mode, so another pr. and yes with the brains its jut blocked from prepare_eat() proc

Fox-McCloud · 2015-12-23T03:02:19Z

code/game/gamemodes/changeling/powers/augmented_eyesight.dm

+
+
+/obj/item/organ/internal/cyberimp/eyes/shield/ling


ahhh yis. Time to butcher lings before shoving them into the incinerator, now.

TheDZD · 2015-12-23T03:03:58Z

Conflicts.

…o OrganRefactor

Aurorablade · 2015-12-25T01:34:07Z

current quirks:
When i debrain some one (in this case a unathi i spawned)...i die and not the paitent
Its is populating the internal organs list with 2 of each organ, soe you have 2 brains, 2 hearts, etc..etc

TheDZD · 2015-12-25T01:47:56Z

code/modules/surgery/organs_internal.dm

 				spread_germs_to_organ(O, user)
-				O.removed(user)
+				O.Remove(user)


The organ is being removed from user (the surgeon) instead of target, which is why you're having the debrain issue.

surgeon: "And now, vee carefully remove zeh brain from zeh surgeon's head"

the surgeon seizes up and falls limp, his eyes dead and lifeless

ghost · 2015-12-25T01:49:00Z

How much do I have to pay to go to Candy Mountain with Charlie?

then remove the removes so we can remove

TheDZD · 2016-02-29T23:52:33Z

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

@@ -24,7 +22,7 @@

 	status_flags = CANPARALYSE|CANPUSH
 	var/heal_rate = 5
-	var/plasma_rate = 5
+	//var/plasma_rate = 5


Should probably be removed instead of commented out.

OPERATE!

Fox-McCloud · 2016-03-02T12:35:52Z

code/datums/hud.dm

@@ -24,8 +24,8 @@ var/datum/atom_hud/huds = list( \
 /datum/atom_hud/proc/remove_hud_from(mob/M)
 	if(!M)
 		return
-	//if(src in M.permanent_huds)//I will deal with you later -Fethas
-	//	return
+	if(src in M.permanent_huds)//I will deal with you later -Fethas


Dealt with later. ;P

FalseIncarnate · 2016-03-03T04:54:56Z

Probably fine as is, I say

(srs edit: i expect things to break once the players get at it, as per usual. this PR is going to be !!FUN!!)

Fox-McCloud · 2016-03-05T00:51:48Z

#yolomerge (ok, not really with how much this has been reviewed/tested)

[HOLY SHIT!]Charlie, lets go to candy mountain, charlie

ghost · 2016-03-05T00:53:23Z

🎊 hooray! 🎊

this shit dosen't even compile yet...

80eb828

TheDZD added Do Not Merge This PR must not be merged or closed Feature This PR is a new addition to the game labels Dec 20, 2015

Aurorablade changed the title ~~[DNM][WIP][HOLY SHIT!]Charlie, lets go to candy mountain, charlie~~ [WIP][HOLY SHIT!]Charlie, lets go to candy mountain, charlie Dec 20, 2015

tigercat2000 reviewed Dec 20, 2015
View reviewed changes

commit so i can swap branches...

4b7253b

please note, anything further on changling may invovle updates to game mode, so another pr. and yes with the brains its jut blocked from prepare_eat() proc

Fox-McCloud reviewed Dec 23, 2015
View reviewed changes

TheDZD added the Merge Conflict This PR is merge conflicted label Dec 23, 2015

Aurorablade added 5 commits December 23, 2015 11:40

almost....

046b0b9

might as well fix fonglict

96c5a5c

missed one

5d7aa0a

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise int…

1a70e9c

…o OrganRefactor

IT COMPILES

027d966

TheDZD reviewed Dec 25, 2015
View reviewed changes

Aurorablade added 4 commits February 27, 2016 22:51

removes the removed so we can remove while we remove

378c5d0

futher removes the removed things so we can remove while we remove..

60baa8c

then remove the removes so we can remove

the honkening

960e552

the honk strikes back

ac02c8a

TheDZD reviewed Feb 29, 2016
View reviewed changes

I'M GOING TO OPERATE

fe3eb50

OPERATE!

Fox-McCloud reviewed Mar 2, 2016
View reviewed changes

Fox-McCloud mentioned this pull request Mar 4, 2016

Refactors eating and drinking #3733

Closed

TheDZD removed the Needs Review label Mar 5, 2016

Fox-McCloud added a commit that referenced this pull request Mar 5, 2016

Merge pull request #2903 from Aurorablade/OrganRefactor

ab490f7

[HOLY SHIT!]Charlie, lets go to candy mountain, charlie

Fox-McCloud merged commit ab490f7 into ParadiseSS13:master Mar 5, 2016

Tastyfish mentioned this pull request Mar 7, 2016

Fixes several midround antag/creature assignments not asking ghosts first #3780

Merged

S-CR mentioned this pull request Mar 29, 2016

Problems/ suggestions about the new surgery system #4020

Closed

Aurorablade deleted the OrganRefactor branch May 11, 2017 12:42

Vivalas mentioned this pull request Jun 23, 2017

Makes surgery great again, part 2. (nerfs spaceacillin) #7623

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[HOLY SHIT!]Charlie, lets go to candy mountain, charlie #2903

[HOLY SHIT!]Charlie, lets go to candy mountain, charlie #2903

Aurorablade commented Dec 20, 2015

TheDZD commented Dec 20, 2015

Aurorablade commented Dec 20, 2015

tigercat2000 Dec 20, 2015

Earthdivine commented Dec 20, 2015

TheDZD commented Dec 20, 2015

Spacemanspark commented Dec 20, 2015

Aurorablade commented Dec 20, 2015

Spacemanspark commented Dec 20, 2015

KasparoVy commented Dec 20, 2015

Fox-McCloud commented Dec 20, 2015

marlyn-x86 commented Dec 20, 2015

ZomgPonies commented Dec 20, 2015

Aurorablade commented Dec 20, 2015

MistakeNot4892 commented Dec 20, 2015

Fox-McCloud Dec 23, 2015

TheDZD commented Dec 23, 2015

Aurorablade commented Dec 25, 2015

TheDZD Dec 25, 2015

Fox-McCloud Dec 25, 2015

ghost commented Dec 25, 2015

TheDZD Feb 29, 2016

Fox-McCloud Mar 2, 2016

FalseIncarnate commented Mar 3, 2016

Fox-McCloud commented Mar 5, 2016

ghost commented Mar 5, 2016



		/obj/item/organ/internal/cyberimp/eyes/shield/ling

[HOLY SHIT!]Charlie, lets go to candy mountain, charlie #2903

[HOLY SHIT!]Charlie, lets go to candy mountain, charlie #2903

Conversation

Aurorablade commented Dec 20, 2015

KINDA READY FOR REVIEW OF THIS SHIT

shit i need to do for these fucking organs.

TheDZD commented Dec 20, 2015

Aurorablade commented Dec 20, 2015

tigercat2000 Dec 20, 2015

Choose a reason for hiding this comment

Earthdivine commented Dec 20, 2015

TheDZD commented Dec 20, 2015

Spacemanspark commented Dec 20, 2015

Aurorablade commented Dec 20, 2015

Spacemanspark commented Dec 20, 2015

KasparoVy commented Dec 20, 2015

Fox-McCloud commented Dec 20, 2015

marlyn-x86 commented Dec 20, 2015

ZomgPonies commented Dec 20, 2015

Aurorablade commented Dec 20, 2015

MistakeNot4892 commented Dec 20, 2015

Fox-McCloud Dec 23, 2015

Choose a reason for hiding this comment

TheDZD commented Dec 23, 2015

Aurorablade commented Dec 25, 2015

TheDZD Dec 25, 2015

Choose a reason for hiding this comment

Fox-McCloud Dec 25, 2015

Choose a reason for hiding this comment

ghost commented Dec 25, 2015

TheDZD Feb 29, 2016

Choose a reason for hiding this comment

Fox-McCloud Mar 2, 2016

Choose a reason for hiding this comment

FalseIncarnate commented Mar 3, 2016

Fox-McCloud commented Mar 5, 2016

ghost commented Mar 5, 2016