Merge branch 'master' into dev

code/modules/admin/admin.dm

@@ -806,7 +806,7 @@ var/global/floorIsLava = 0
 	set desc="Delay the game start/end"
 	set name="Delay"
 
-	if(!check_rights(R_ADMIN))	return
+	if(!check_rights(R_SERVER))	return
 	if (!ticker || ticker.current_state != GAME_STATE_PREGAME)
 		ticker.delay_end = !ticker.delay_end
 		log_admin("[key_name(usr)] [ticker.delay_end ? "delayed the round end" : "has made the round end normally"].")

code/modules/admin/verbs/vox_raiders.dm

@@ -66,7 +66,7 @@ var/global/vox_tick = 1
 	C.registered_user = src
 	var/obj/item/weapon/storage/wallet/W = new(src)
 	W.handle_item_insertion(C)
-	spawn_money(rand(100,300)*5,W)
+	spawn_money(rand(50,150)*10,W)
 	equip_to_slot_or_del(W, slot_wear_id)
 
 	var/obj/item/weapon/implant/cortical/I = new(src)

code/modules/mob/mob.dm

@@ -240,6 +240,8 @@ var/list/slot_equipment_priority = list( \
 	set category = "Object"
 	set src = usr
 
+	if(istype(loc,/obj/mecha)) return
+
 	if(hand)
 		var/obj/item/W = l_hand
 		if (W)

code/modules/organs/organ_external.dm

@@ -338,8 +338,9 @@ This function completely restores a damaged organ to perfect condition.
 
 	for(var/datum/wound/W in wounds)
 		// wounds can disappear after 10 minutes at the earliest
-		if(W.damage == 0 && W.created + 10 * 10 * 60 <= world.time)
+		if(W.damage <= 0 && W.created + 10 * 10 * 60 <= world.time)
 			wounds -= W
+			continue
 			// let the GC handle the deletion of the wound
 
 		// Internal wounds get worse over time. Low temperatures (cryo) stop them.
@@ -347,17 +348,14 @@ This function completely restores a damaged organ to perfect condition.
 			if(!owner.reagents.has_reagent("bicaridine"))	//bicard stops internal wounds from growing bigger with time, and also stop bleeding
 				W.open_wound(0.1 * wound_update_accuracy)
 				owner.vessel.remove_reagent("blood",0.05 * W.damage * wound_update_accuracy)
+
 			owner.vessel.remove_reagent("blood",0.02 * W.damage * wound_update_accuracy)//Bicaridine slows Internal Bleeding
 			if(prob(1 * wound_update_accuracy))
 				owner.custom_pain("You feel a stabbing pain in your [display_name]!",1)
 
-		//overdose of bicaridine begins healing IB
-		if(owner.reagents.has_reagent("bicaridine") && (owner.reagents.get_reagent_amount("bicaridine") >= 30))
-			var/healinternal = 0.2
-			if(W.damage <= healinternal)
-				W.damage = 0
-			else
-				W.damage -= healinternal
+			//overdose of bicaridine begins healing IB
+			if(owner.reagents.get_reagent_amount("bicaridine") >= 30)
+				W.damage = max(0, W.damage - 0.2)
 
 		// slow healing
 		var/heal_amt = 0
@@ -417,7 +415,10 @@ This function completely restores a damaged organ to perfect condition.
 	var/n_is = damage_state_text()
 	if (n_is != damage_state)
 		damage_state = n_is
-		owner.update_body(1)
+		if(status & ORGAN_DESTROYED)
+			owner.update_body(1)
+		else
+			owner.UpdateDamageIcon(1)
 		return 1
 	return 0
 

code/modules/reagents/Chemistry-Reagents.dm

@@ -3091,7 +3091,7 @@ datum
 							var/datum/organ/internal/heart/L = H.internal_organs["heart"]
 							if (istype(L))
 								L.take_damage(100, 0)
-
+				holder.remove_reagent(src.id, FOOD_METABOLISM)
 
 		ethanol/deadrum
 			name = "Deadrum"

code/modules/reagents/reagent_containers/food/snacks.dm

@@ -118,7 +118,7 @@
 	if(istype(W,/obj/item/weapon/storage))
 		..() // -> item/attackby()
 	if((slices_num <= 0 || !slices_num) || !slice_path)
-		return 1
+		return 0
 	var/inaccurate = 0
 	if( \
 			istype(W, /obj/item/weapon/kitchenknife) || \

code/modules/research/circuitprinter.dm

@@ -101,7 +101,7 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis).
 			user << "\The [name] must be linked to an R&D console first!"
 			return 1
 		if (O.is_open_container())
-			return 1
+			return 0
 		if (!istype(O, /obj/item/stack/sheet/glass) && !istype(O, /obj/item/stack/sheet/mineral/gold) && !istype(O, /obj/item/stack/sheet/mineral/diamond) && !istype(O, /obj/item/stack/sheet/mineral/uranium))
 			user << "\red You cannot insert this item into the [name]!"
 			return 1

code/modules/research/destructive_analyzer.dm

@@ -99,6 +99,7 @@ Note: Must be placed within 3 tiles of the R&D Console
 		spawn(10)
 			icon_state = "d_analyzer_l"
 			busy = 0
+		return 1
 	return
 
 //For testing purposes only.