Fixes a whole bunch of bugs. (#7984)

code/game/objects/structures/flora.dm

@@ -102,6 +102,8 @@
 /obj/structure/flora/pottedplant/attackby(obj/item/W, mob/user)
 	if(!ishuman(user))
 		return
+	if(istype(W, /obj/item/holder))
+		return //no hiding mobs in there
 	user.visible_message("[user] begins digging around inside of \the [src].", "You begin digging around in \the [src], trying to hide \the [W].")
 	playsound(loc, 'sound/effects/plantshake.ogg', 50, 1)
 	if(do_after(user, 20, act_target = src))

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

@@ -53,11 +53,11 @@
 /datum/species/monkey/handle_npc(var/mob/living/carbon/human/H)
 	if(H.stat != CONSCIOUS)
 		return
-	if(prob(33) && isturf(H.loc) && !H.pulledby) //won't move if being pulled
+	if(prob(33) && isturf(H.loc) && !H.pulledby && !ismob(H.loc)) //won't move if being pulled
 		step(H, pick(cardinal))
 
 	var/obj/held = H.get_active_hand()
-	if(held && prob(1))
+	if(held && prob(1) && !ismob(H.loc))
 		var/turf/T = get_random_turf_in_range(H, 7, 2)
 		if(T)
 			if(istype(held, /obj/item/gun) && prob(80))
@@ -67,7 +67,7 @@
 				H.throw_item(T)
 		else
 			H.drop_item()
-	if(!held && !H.restrained() && prob(5))
+	if(!held && !H.restrained() && prob(5) && !ismob(H.loc))
 		var/list/touchables = list()
 		for(var/obj/O in range(1,get_turf(H)))
 			if(O.simulated && O.Adjacent(H) && !is_type_in_list(O, no_touchie))

code/modules/modular_computers/computers/subtypes/dev_silicon.dm

@@ -8,7 +8,7 @@
 	icon_state_broken = "laptop-broken"
 	base_idle_power_usage = 5
 	base_active_power_usage = 25
-	max_hardware_size = 2
+	max_hardware_size = 3
 	max_damage = 50
 	w_class = 3
 	var/mob/living/silicon/computer_host		// Thing that contains this computer. Used for silicon computers

code/modules/modular_computers/computers/subtypes/preset_silicon.dm

@@ -3,9 +3,9 @@
 
 /obj/item/modular_computer/silicon/preset/install_default_hardware()
 	. = ..()
-	processor_unit = new/obj/item/computer_hardware/processor_unit(src)
-	hard_drive = new/obj/item/computer_hardware/hard_drive(src)
-	network_card = new/obj/item/computer_hardware/network_card(src)
+	processor_unit = new /obj/item/computer_hardware/processor_unit(src)
+	hard_drive = new /obj/item/computer_hardware/hard_drive(src)
+	network_card = new /obj/item/computer_hardware/network_card/advanced(src)
 
 
 /obj/item/modular_computer/silicon/preset/install_default_programs()

code/modules/organs/internal/_internal.dm

@@ -24,9 +24,6 @@
 	if(!istype(target))
 		return 0
 
-	if(status & ORGAN_CUT_AWAY)
-		return 0 //organs don't work very well in the body when they aren't properly attached
-
 	// robotic organs emulate behavior of the equivalent flesh organ of the species
 	if(BP_IS_ROBOTIC(src) || !species)
 		species = target.species

code/modules/psionics/complexus/complexus_process.dm

@@ -177,7 +177,7 @@
 					if(BP_IS_ROBOTIC(E))
 						continue
 
-					if(heal_internal && (E.status & ORGAN_BROKEN) && E.damage < (E.min_broken_damage * config.organ_health_multiplier)) // So we don't mend and autobreak.
+					if(heal_internal && (E.status & ORGAN_BROKEN) && E.damage < E.min_broken_damage) // So we don't mend and autobreak.
 						if(spend_power(heal_rate))
 							if(E.mend_fracture())
 								to_chat(H, span("notice", "Your autoredactive faculty coaxes together the shattered bones in your [E.name]."))

code/modules/surgery/organs_internal.dm

@@ -281,8 +281,7 @@
 	user.visible_message("<span class='notice'>[user] has transplanted \the [tool] into [target]'s [affected.name].</span>", \
 		"<span class='notice'>You have transplanted \the [tool] into [target]'s [affected.name].</span>")
 	var/obj/item/organ/O = tool
-	if(istype(O))
-		user.remove_from_mob(O)
+	if(istype(O) && user.unEquip(O))
 		O.replaced(target,affected)
 		playsound(target.loc, 'sound/effects/squelch1.ogg', 50, 1)
 

html/changelogs/mattatlas-miscfixes.yml

@@ -0,0 +1,45 @@
+################################
+# 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: "Organs no longer pop out of the body when transplanted."
+  - bugfix: "Redaction bone mend no longer mends the bones above the bone break threshold."
+  - bugfix: "You can no longer put mobs in potted plants."
+  - bugfix: "Monkeys no longer throw things while being held."
+  - tweak: "The silicon computer now starts with an advanced network card, which means much faster downloads."