Emergency fixes for the last merge (#7484)

Emergency fixes for the last merge

code/modules/item_worth/worths_list.dm

@@ -631,7 +631,7 @@ var/list/worths = list(
 					/obj/item/organ/internal/heart = 1200,
 					/obj/item/organ/internal/brain/golem = 3000,
 					/obj/item/organ/internal/brain = 1200,
-					/obj/item/organ/pariah_brain = 5,
+					/obj/item/organ/internal/pariah_brain = 5,
 					/obj/item/organ/vaurca/neuralsocket = 1500,
 					/obj/item/organ/stack/vox = 5000,
 					/obj/item/organ = 400,

code/modules/mob/living/carbon/brain/brain_item.dm

@@ -18,7 +18,7 @@
 	var/lobotomized = 0
 	var/can_lobotomize = 1
 
-/obj/item/organ/pariah_brain
+/obj/item/organ/internal/pariah_brain
 	name = "brain remnants"
 	desc = "Did someone tread on this? It looks useless for cloning or cyborgification."
 	organ_tag = "brain"
@@ -39,6 +39,7 @@
 /obj/item/organ/internal/brain/Initialize(mapload)
 	. = ..()
 	health = config.default_brain_health
+	max_damage = 60
 	if (!mapload)
 		addtimer(CALLBACK(src, .proc/clear_screen), 5)
 

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

@@ -109,7 +109,7 @@
 		BP_LUNGS =    /obj/item/organ/internal/lungs/vox,
 		BP_LIVER =    /obj/item/organ/internal/liver/vox,
 		BP_KIDNEYS =  /obj/item/organ/internal/kidneys/vox,
-		BP_BRAIN =    /obj/item/organ/pariah_brain,
+		BP_BRAIN =    /obj/item/organ/internal/pariah_brain,
 		BP_EYES =     /obj/item/organ/internal/eyes
 		)
 	spawn_flags = IS_RESTRICTED

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

@@ -75,7 +75,7 @@
 	reagent_tag = IS_MACHINE
 
 	has_organ = list(
-		BP_BRAIN   = /obj/item/organ/mmi_holder/posibrain,
+		BP_BRAIN   = /obj/item/organ/internal/mmi_holder/posibrain,
 		BP_CELL    = /obj/item/organ/cell,
 		BP_OPTICS  = /obj/item/organ/internal/eyes/optical_sensor,
 		BP_IPCTAG = /obj/item/organ/internal/ipc_tag

code/modules/mob/living/carbon/human/species/station/ipc/ipc_subspecies.dm

@@ -86,7 +86,7 @@
 	breakcuffs = list(MALE, FEMALE)
 
 	has_organ = list(
-		BP_BRAIN   = /obj/item/organ/mmi_holder/posibrain,
+		BP_BRAIN   = /obj/item/organ/internal/mmi_holder/posibrain,
 		BP_CELL    = /obj/item/organ/cell,
 		BP_OPTICS  = /obj/item/organ/internal/eyes/optical_sensor,
 		"surge"   = /obj/item/organ/surge/advanced
@@ -224,7 +224,7 @@
 	)
 
 	has_organ = list(
-		BP_BRAIN = /obj/item/organ/mmi_holder/posibrain/terminator,
+		BP_BRAIN = /obj/item/organ/internal/mmi_holder/posibrain/terminator,
 		"shielded cell" = /obj/item/organ/cell/terminator,
 		BP_OPTICS = /obj/item/organ/internal/eyes/optical_sensor/terminator,
 		"data core" = /obj/item/organ/data,

code/modules/organs/subtypes/machine.dm

@@ -147,14 +147,14 @@
 	. = ..()
 
 // Used for an MMI or posibrain being installed into a human.
-/obj/item/organ/mmi_holder
+/obj/item/organ/internal/mmi_holder
 	name = "brain"
 	organ_tag = BP_BRAIN
 	parent_organ = BP_HEAD
 	vital = 1
 	var/obj/item/device/mmi/stored_mmi
 
-/obj/item/organ/mmi_holder/proc/update_from_mmi()
+/obj/item/organ/internal/mmi_holder/proc/update_from_mmi()
 	if(!stored_mmi)
 		return
 	name = stored_mmi.name
@@ -162,7 +162,7 @@
 	icon = stored_mmi.icon
 	icon_state = stored_mmi.icon_state
 
-/obj/item/organ/mmi_holder/removed(var/mob/living/user)
+/obj/item/organ/internal/mmi_holder/removed(var/mob/living/user)
 
 	if(stored_mmi)
 		stored_mmi.forceMove(get_turf(src))
@@ -175,13 +175,13 @@
 		holder_mob.drop_from_inventory(src)
 	qdel(src)
 
-/obj/item/organ/mmi_holder/posibrain/Initialize()
+/obj/item/organ/internal/mmi_holder/posibrain/Initialize()
 	robotize()
 	stored_mmi = new /obj/item/device/mmi/digital/posibrain(src)
 	. = ..()
 	addtimer(CALLBACK(src, .proc/setup_brain), 1)
 
-/obj/item/organ/mmi_holder/posibrain/proc/setup_brain()
+/obj/item/organ/internal/mmi_holder/posibrain/proc/setup_brain()
 	if(owner)
 		stored_mmi.name = "positronic brain ([owner.name])"
 		stored_mmi.brainmob.real_name = owner.name
@@ -196,7 +196,7 @@
 //Terminator//
 //////////////
 
-/obj/item/organ/mmi_holder/posibrain/terminator
+/obj/item/organ/internal/mmi_holder/posibrain/terminator
 	name = BP_BRAIN
 	organ_tag = BP_BRAIN
 	parent_organ = BP_CHEST

code/modules/surgery/robotics.dm

@@ -422,7 +422,7 @@
 		"<span class='notice'>You have installed \the [tool] into [target]'s [affected.name].</span>")
 
 		var/obj/item/device/mmi/M = tool
-		var/obj/item/organ/mmi_holder/holder = new(target, 1)
+		var/obj/item/organ/internal/mmi_holder/holder = new(target, 1)
 		target.internal_organs_by_name[BP_BRAIN] = holder
 		user.drop_from_inventory(tool,holder)
 		holder.stored_mmi = tool

html/changelogs/mattatlas-imsosorry.yml

@@ -0,0 +1,42 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes: 
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.  
+author: MattAtlas
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - bugfix: "IPCs no longer die upon spawning."
+  - bugfix: "Fixed cloning instantly killing people."