Merge pull request #425 from Fox-McCloud/Balance-Fix-Tweak-Round1

Balance fix tweak round1

code/WorkInProgress/Cib/MedicalSideEffects.dm

@@ -81,7 +81,7 @@
 /datum/medical_effect/headache
 	name = "Headache"
 	triggers = list("cryoxadone" = 10, "bicaridine" = 15, "tricordrazine" = 15)
-	cures = list("alkysine", "tramadol")
+	cures = list("alkysine", "tramadol", "paracetamol", "oxycodone")
 	cure_message = "Your head stops throbbing..."
 
 /datum/medical_effect/headache/on_life(mob/living/carbon/human/H, strength)

code/game/machinery/Sleeper.dm

@@ -160,8 +160,8 @@
 	anchored = 1
 	var/orient = "LEFT" // "RIGHT" changes the dir suffix to "-r"
 	var/mob/living/carbon/human/occupant = null
-	var/available_chemicals = list("inaprovaline" = "Inaprovaline", "stoxin" = "Soporific", "anti_toxin" = "Dylovene", "dexalin" = "Dexalin")
-	var/amounts = list(10, 20)
+	var/available_chemicals = list("inaprovaline" = "Inaprovaline", "stoxin" = "Soporific", "paracetamol" = "Paracetamol", "anti_toxin" = "Dylovene", "dexalin" = "Dexalin")
+	var/amounts = list(5, 10)
 	var/obj/item/weapon/reagent_containers/glass/beaker = null
 	var/filtering = 0
 

code/game/objects/items/weapons/cigs_lighters.dm

@@ -297,7 +297,8 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	item_state = "pipeoff"
 	icon_on = "pipeon"  //Note - these are in masks.dmi
 	icon_off = "pipeoff"
-	smoketime = 100
+	smoketime = 1000
+	chem_volume = 50
 
 /obj/item/clothing/mask/cigarette/pipe/light(var/flavor_text = "[usr] lights the [name].")
 	if(!src.lit)
@@ -353,7 +354,8 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	item_state = "cobpipeoff"
 	icon_on = "cobpipeon"  //Note - these are in masks.dmi
 	icon_off = "cobpipeoff"
-	smoketime = 400
+	smoketime = 800
+	chem_volume = 40
 
 
 

code/game/objects/items/weapons/storage/bible.dm

@@ -12,8 +12,10 @@
 	autoignition_temperature = 522 // Kelvin
 
 	suicide_act(mob/user)
-		viewers(user) << "\red <b>[user] is farting lightly on the [src.name]! It looks like \he's  trying to commit suicide!</b>"
-		return (user.death(1))
+		user.emote("fart")
+		viewers(user) << "\red <b>[user] farts on the [src.name]!</b>"
+		viewers(user) << "\blue <b>A mysterious force smites [user]!</b>"
+		return (user.gib(1))
 
 
 /obj/item/weapon/storage/bible/booze

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

@@ -86,24 +86,32 @@
 	src.apply_damage(shock_damage, BURN, def_zone, used_weapon="Electrocution")
 
 	playsound(loc, "sparks", 50, 1, -1)
-	if (shock_damage > 10)
-		src.visible_message(
-			"\red [src] was shocked by the [source]!", \
-			"\red <B>You feel a powerful shock course through your body!</B>", \
-			"\red You hear a heavy electrical crack." \
-		)
-		Stun(10)//This should work for now, more is really silly and makes you lay there forever
-		Weaken(10)
-	else
+	if (shock_damage < 10)
 		src.visible_message(
 			"\red [src] was mildly shocked by the [source].", \
 			"\red You feel a mild shock course through your body.", \
 			"\red You hear a light zapping." \
 		)
+	if (shock_damage > 10)
+		if (shock_damage < 200)
+			src.visible_message(
+				"\red [src] was shocked by the [source]!", \
+				"\red <B>You feel a powerful shock course through your body!</B>", \
+				"\red You hear a heavy electrical crack." \
+			)
+		Stun(10)//This should work for now, more is really silly and makes you lay there forever
+		Weaken(10)
+	if (shock_damage > 200)
+		src.visible_message(
+			"\red [src] was arc flashed by the [source]!", \
+			"\red <B>The [source] arc flashes and electrocutes you!</B>", \
+			"\red You hear a lightning-like crack!" \
+		)
+		playsound(loc, "sound/effects/eleczap.ogg", 50, 1, -1)
+		explosion(src.loc,-1,0,2,2)
 	return shock_damage
 
 
-
 /mob/living/carbon/proc/swap_hand()
 	var/obj/item/item_in_hand = src.get_active_hand()
 	if(item_in_hand) //this segment checks if the item in your hand is twohanded.

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

@@ -28,18 +28,12 @@
 	if(embedded_flag)
 		handle_embedded_objects() //Moving with objects stuck in you can cause bad times.
 
-	var/hyperizine = reagents.has_reagent("hyperizine")
-	if(hyperizine && dna.mutantrace == "slime")
-		tally *= 2
-	else if(hyperizine || M_RUN in mutations || istype(loc, /turf/space))
-		return -1
+	if(reagents.has_reagent("hyperzine")) return -1
 
 	if(reagents.has_reagent("nuka_cola")) return -1
 
 	if((M_RUN in mutations)) return -1
 
-	if (istype(loc, /turf/space)) return -1 // It's hard to be slowed down in space by... anything
-
 	var/health_deficiency = (100 - health)
 
 	if(health_deficiency >= 40) tally += (health_deficiency / 25)

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

@@ -5,20 +5,24 @@
 /mob/living/carbon/proc/updateshock()
 	src.traumatic_shock = 			\
 	1	* src.getOxyLoss() + 		\
-	0.7  * src.getToxLoss() +     \
-	1.5  * src.getFireLoss() +     \
-	1.2  * src.getBruteLoss() +     \
-	1.7  * src.getCloneLoss() +     \
-	2  * src.halloss
+	0.7	* src.getToxLoss() + 		\
+	1.5	* src.getFireLoss() + 		\
+	1.2	* src.getBruteLoss() + 		\
+	1.7	* src.getCloneLoss() + 		\
+	2	* src.halloss
 
 	if(reagents.has_reagent("alkysine"))
 		src.traumatic_shock -= 10
 	if(reagents.has_reagent("inaprovaline"))
 		src.traumatic_shock -= 25
+	if(reagents.has_reagent("synaptizine"))
+		src.traumatic_shock -= 40
+	if(reagents.has_reagent("paracetamol"))
+		src.traumatic_shock -= 50
 	if(reagents.has_reagent("tramadol"))
-		src.traumatic_shock -= 20 // make synaptizine function as good painkiller
+		src.traumatic_shock -= 80
 	if(reagents.has_reagent("oxycodone"))
-		src.traumatic_shock -= 50 // make synaptizine function as good painkiller
+		src.traumatic_shock -= 200
 	if(src.slurring)
 		src.traumatic_shock -= 20
 	if(src.analgesic)

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

@@ -363,7 +363,7 @@
 	breath_type = "nitrogen"
 	poison_type = "oxygen"
 
-	flags = NO_SCAN | IS_WHITELISTED | NO_BLOOD
+	flags = NO_SCAN | IS_WHITELISTED
 
 	flesh_color = "#808D11"
 
@@ -522,7 +522,7 @@
 	heat_level_2 = 350
 	heat_level_3 = 700
 
-	flags = NO_BREATHE | REQUIRE_LIGHT | NO_SCAN | IS_PLANT | RAD_ABSORB | NO_BLOOD | IS_SLOW | NO_PAIN
+	flags = NO_BREATHE | REQUIRE_LIGHT | IS_PLANT | RAD_ABSORB | NO_BLOOD | IS_SLOW | NO_PAIN
 
 	body_temperature = T0C + 15		//make the plant people have a bit lower body temperature, why not
 
@@ -536,6 +536,7 @@
 
 	return ..()
 
+/*        //overpowered and dumb as hell; they get cloning back, though.
 /datum/species/diona/handle_death(var/mob/living/carbon/human/H)
 
 	var/mob/living/carbon/monkey/diona/S = new(get_turf(H))
@@ -551,7 +552,7 @@
 		else
 			del(D)
 
-	H.visible_message("\red[H] splits apart with a wet slithering noise!")
+	H.visible_message("\red[H] splits apart with a wet slithering noise!") */
 
 /datum/species/machine
 	name = "Machine"

code/modules/power/cell.dm

@@ -174,7 +174,11 @@
 			return min(rand(20,80),rand(20,80))
 		if (100 to 250-1)
 			return min(rand(20,65),rand(20,65))*/
-		if (1000000 to INFINITY)
+		if (5000000 to INFINITY)
+			return min(rand(200,300),rand(200,300))
+		if (4000000 to 5000000-1)
+			return min(rand(80,180),rand(80,180))
+		if (1000000 to 4000000-1)
 			return min(rand(50,160),rand(50,160))
 		if (200000 to 1000000-1)
 			return min(rand(25,80),rand(25,80))

code/modules/power/power.dm

@@ -373,7 +373,9 @@
 			return min(rand(20,65),rand(20,65))
 		if (1000 to 10000-1)
 			return min(rand(10,20),rand(10,20))*/
-		if (4000000 to INFINITY)
+		if (5000000 to INFINITY)
+			return min(rand(200,300),rand(200,300))
+		if (4000000 to 5000000)
 			return min(rand(80,180),rand(80,180))
 		if (1000000 to 4000000)
 			return min(rand(50,160),rand(50,160))
@@ -455,8 +457,8 @@
 //No animations will be performed by this proc.
 /proc/electrocute_mob(mob/living/carbon/M as mob, var/power_source, var/obj/source, var/siemens_coeff = 1.0)
 	if(istype(M.loc,/obj/mecha))	return 0	//feckin mechs are dumb
-	
-	//This is for performance optimization only. 
+
+	//This is for performance optimization only.
 	//DO NOT modify siemens_coeff here. That is checked in human/electrocute_act()
 	if(istype(M,/mob/living/carbon/human))
 		var/mob/living/carbon/human/H = M

code/modules/reagents/Chemistry-Reagents.dm

@@ -510,8 +510,8 @@ datum
 			description = "An effective hypnotic used to treat insomnia."
 			reagent_state = LIQUID
 			color = "#E895CC" // rgb: 232, 149, 204
-			toxod = 40
-			oxyod = 40
+			oxyod = 100
+			toxod = 100
 
 			on_mob_life(var/mob/living/M as mob)
 				if(!M) M = holder.my_atom
@@ -522,7 +522,7 @@ datum
 					if(15 to 25)
 						M.drowsyness  = max(M.drowsyness, 20)
 					if(25 to INFINITY)
-						M.Weaken(20)
+						M.Paralyse(20)
 						M.drowsyness  = max(M.drowsyness, 30)
 				data++
 				..()
@@ -1111,6 +1111,7 @@ datum
 			reagent_state = SOLID
 			color = "#C8A5DC" // rgb: 200, 165, 220
 			toxod = OVERDOSE/3
+			scannable = 1
 
 			on_mob_life(var/mob/living/M as mob)
 				if(!M) M = holder.my_atom
@@ -1240,6 +1241,7 @@ datum
 			toxod = OVERDOSE/4.5
 			oxyod = OVERDOSE/4.5
 			custom_metabolism = 0.25 // Lasts 10 minutes for 15 units
+			scannable = 1
 
 			on_mob_life(var/mob/living/M as mob)
 				if (volume > overdose)
@@ -1448,14 +1450,17 @@ datum
 					return
 
 		plantbgone
-			scannable = 1
 			name = "Plant-B-Gone"
 			id = "plantbgone"
 			description = "A harmful toxic mixture to kill plantlife. Do not ingest!"
 			reagent_state = LIQUID
 			color = "#49002E" // rgb: 73, 0, 46
-			toxod = OVERDOSE/3
-			burnod = OVERDOSE/3
+
+			on_mob_life(var/mob/living/M as mob)
+				if(!M) M = holder.my_atom
+				M.adjustToxLoss(2)
+				..()
+				return
 
 			// Clear off wallrot fungi
 			reaction_turf(var/turf/T, var/volume)
@@ -1500,7 +1505,6 @@ datum
 			reagent_state = LIQUID
 			color = "#C8A5DC" // rgb: 200, 165, 220
 			toxod = OVERDOSE
-			scannable = 1
 
 			on_mob_life(var/mob/living/M as mob)
 				if(!M) M = holder.my_atom
@@ -1546,6 +1550,7 @@ datum
 			color = "#E9D66B" // rgb: 233, 214, 107
 			toxod = OVERDOSE/1.5
 			burnod = OVERDOSE/1.5
+			scannable = 1
 
 			on_mob_life(var/mob/living/M as mob)
 				if(!M) M = holder.my_atom
@@ -1599,6 +1604,7 @@ datum
 			color = "#ECD540" // rgb: 236, 213, 64
 			toxod = OVERDOSE
 			bruteod = OVERDOSE
+			scannable = 1
 
 			on_mob_life(var/mob/living/M as mob)
 				if(M.stat == 2.0)
@@ -1697,7 +1703,7 @@ datum
 					return
 				if(!M) M = holder.my_atom
 				if(!alien || alien != IS_DIONA)
-					if(M.getOxyLoss()) M.adjustOxyLoss(-1*REM)
+					if(M.getOxyLoss() && prob(80)) M.adjustOxyLoss(-1*REM)
 					if(M.getBruteLoss() && prob(80)) M.heal_organ_damage(1*REM,0)
 					if(M.getFireLoss() && prob(80)) M.heal_organ_damage(0,1*REM)
 					if(M.getToxLoss() && prob(80)) M.adjustToxLoss(-1*REM)
@@ -1792,11 +1798,11 @@ datum
 		synaptizine
 			name = "Synaptizine"
 			id = "synaptizine"
-			description = "Synaptizine is used to treat various diseases."
+			description = "Synaptizine is a synaptic stimulant that can also be used to treat certain diseases."
 			reagent_state = LIQUID
 			color = "#C8A5DC" // rgb: 200, 165, 220
-			custom_metabolism = 0.01
-			toxod = OVERDOSE
+			custom_metabolism = 0.1
+			toxod = OVERDOSE/4.5
 			scannable = 1
 
 			on_mob_life(var/mob/living/M as mob)
@@ -1808,7 +1814,6 @@ datum
 				if(holder.has_reagent("mindbreaker"))
 					holder.remove_reagent("mindbreaker", 5)
 				M.hallucination = max(0, M.hallucination - 10)
-				if(prob(60))	M.adjustToxLoss(1)
 				..()
 				return
 
@@ -1854,6 +1859,7 @@ datum
 			color = "#BFFF00" // rgb: 191, 255, 0
 			toxod = OVERDOSE/1.5
 			burnod = OVERDOSE/1.5
+			scannable = 1
 
 			on_mob_life(var/mob/living/M as mob)
 				if(M.stat == 2.0)
@@ -2082,6 +2088,18 @@ datum
 					M.status_flags &= ~FAKEDEATH
 				..()8*/
 
+		mutetoxin
+			name = "Mute Toxin"
+			id = "mutetoxin"
+			description = "A toxin that temporarily paralyzes the vocal cords."
+			reagent_state = LIQUID
+			color = "#F0F8FF" // rgb: 240, 248, 255
+
+			on_mob_life(var/mob/living/M)
+				if(!M) M = holder.my_atom
+				M.silent += REM + 1
+				..()
+
 		mindbreaker
 			name = "Mindbreaker Toxin"
 			id = "mindbreaker"
@@ -2246,6 +2264,7 @@ datum
 			description = "A powerful oxidizer that reacts with ethanol."
 			reagent_state = SOLID
 			color = "#605048" // rgb: 96, 80, 72
+			scannable = 1
 
 			on_mob_life(var/mob/living/M as mob)
 				if(!M) M = holder.my_atom
@@ -2384,6 +2403,7 @@ datum
 			nutriment_factor = 10 * REAGENTS_METABOLISM
 			color = "#BBEDA4" // rgb: 187, 237, 164
 			toxod = OVERDOSE/2
+			scannable = 1
 
 			on_mob_life(var/mob/living/M as mob)
 				if(!M) M = holder.my_atom
@@ -3416,12 +3436,6 @@ datum
 			rum
 				name = "Rum"
 				id = "rum"
-				description = "Yohoho and all that."
-				color = "#664300" // rgb: 102, 67, 0
-
-			deadrum
-				name = "Deadrum"
-				id = "rum"
 				description = "Popular with the sailors. Not very popular with everyone else."
 				color = "#664300" // rgb: 102, 67, 0
 

code/modules/reagents/Chemistry-Recipes.dm

@@ -105,6 +105,13 @@ datum
 			required_reagents = list("inaprovaline" = 1, "ethanol" = 1, "oxygen" = 1)
 			result_amount = 3
 
+		paracetamol
+			name = "Paracetamol"
+			id = "paracetamol"
+			result = "paracetamol"
+			required_reagents = list("tramadol" = 1, "sugar" = 1, "water" = 1)
+			result_amount = 3
+
 		oxycodone
 			name = "Oxycodone"
 			id = "oxycodone"
@@ -494,6 +501,13 @@ datum
 			required_reagents = list("carpotoxin" = 1, "stoxin" = 1, "copper" = 1)
 			result_amount = 3
 
+		mutetoxin
+			name = "Mute toxin"
+			id = "mutetoxin"
+			result = "mutetoxin"
+			required_reagents = list("uranium" = 2, "water" = 1, "carbon" = 1)
+			result_amount = 2
+
 		rezadone
 			name = "Rezadone"
 			id = "rezadone"

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

@@ -201,7 +201,8 @@
 	icon_state = "thirteen_loko"
 	New()
 		..()
-		reagents.add_reagent("thirteenloko", 30)
+		reagents.add_reagent("thirteenloko", 25)
+		reagents.add_reagent("psilocybin", 5)
 		src.pixel_x = rand(-10.0, 10)
 		src.pixel_y = rand(-10.0, 10)
 
@@ -221,8 +222,7 @@
 	icon_state = "starkist"
 	New()
 		..()
-		reagents.add_reagent("cola", 15)
-		reagents.add_reagent("orangejuice", 15)
+		reagents.add_reagent("brownstar", 30)
 		src.pixel_x = rand(-10.0, 10)
 		src.pixel_y = rand(-10.0, 10)
 

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

@@ -1243,7 +1243,8 @@
 	icon_state = "chinese2"
 	New()
 		..()
-		reagents.add_reagent("nutriment", 6)
+		reagents.add_reagent("nutriment", 5)
+		reagents.add_reagent("carpotoxin", 1)
 		bitesize = 2
 
 /obj/item/weapon/reagent_containers/food/snacks/chinese/newdles
@@ -1261,7 +1262,8 @@
 	icon_state = "chinese4"
 	New()
 		..()
-		reagents.add_reagent("nutriment", 6)
+		reagents.add_reagent("nutriment", 3)
+		reagents.add_reagent("rice", 3)
 		bitesize = 2
 
 /obj/item/weapon/reagent_containers/food/snacks/syndicake

code/modules/reagents/reagent_containers/hypospray.dm

@@ -60,6 +60,7 @@
 	icon_state = "autoinjector"
 	item_state = "autoinjector"
 	amount_per_transfer_from_this = 5
+	possible_transfer_amounts = list(5)
 	volume = 5
 
 /obj/item/weapon/reagent_containers/hypospray/autoinjector/New()

code/modules/virus2/effect.dm

@@ -82,116 +82,20 @@
 
 // Bone White - Empty sypmtoms. There is a better way of handling this but this is much faster.
 
-/datum/disease2/effect/invisible_stage_onea
-	name = "Non-existant Syndrome"
-	stage = 1
-	activate(var/mob/living/carbon/mob,var/multiplier)
-		return
-/datum/disease2/effect/invisible_stage_oneb
-	name = "Non-existant Syndrome"
-	stage = 1
-	activate(var/mob/living/carbon/mob,var/multiplier)
-		return
-
-/datum/disease2/effect/invisible_stage_twoa
-	name = "Non-existant Syndrome"
-	stage = 2
-	activate(var/mob/living/carbon/mob,var/multiplier)
-		return
-/datum/disease2/effect/invisible_stage_twob
-	name = "Non-existant Syndrome"
-	stage = 2
-	activate(var/mob/living/carbon/mob,var/multiplier)
-		return
-/datum/disease2/effect/invisible_stage_twoc
-	name = "Non-existant Syndrome"
-	stage = 2
-	activate(var/mob/living/carbon/mob,var/multiplier)
-		return
-/datum/disease2/effect/invisible_stage_twod
-	name = "Non-existant Syndrome"
+/datum/disease2/effect/invisible_stage_two
+	name = "Patience Syndrome"
 	stage = 2
 	activate(var/mob/living/carbon/mob,var/multiplier)
 		return
 
-/datum/disease2/effect/invisible_stage_threea
-	name = "Non-existant Syndrome"
-	stage = 3
-	activate(var/mob/living/carbon/mob,var/multiplier)
-		return
-/datum/disease2/effect/invisible_stage_threeb
-	name = "Non-existant Syndrome"
-	stage = 3
-	activate(var/mob/living/carbon/mob,var/multiplier)
-		return
-/datum/disease2/effect/invisible_stage_threec
-	name = "Non-existant Syndrome"
-	stage = 3
-	activate(var/mob/living/carbon/mob,var/multiplier)
-		return
-/datum/disease2/effect/invisible_stage_threed
-	name = "Non-existant Syndrome"
-	stage = 3
-	activate(var/mob/living/carbon/mob,var/multiplier)
-		return
-/datum/disease2/effect/invisible_stage_threee
-	name = "Non-existant Syndrome"
-	stage = 3
-	activate(var/mob/living/carbon/mob,var/multiplier)
-		return
-/datum/disease2/effect/invisible_stage_threef
-	name = "Non-existant Syndrome"
-	stage = 3
-	activate(var/mob/living/carbon/mob,var/multiplier)
-		return
-/datum/disease2/effect/invisible_stage_threeg
-	name = "Non-existant Syndrome"
-	stage = 3
-	activate(var/mob/living/carbon/mob,var/multiplier)
-		return
-/datum/disease2/effect/invisible_stage_threeh
-	name = "Non-existant Syndrome"
+/datum/disease2/effect/invisible_stage_three
+	name = "Delayed Syndrome"
 	stage = 3
 	activate(var/mob/living/carbon/mob,var/multiplier)
 		return
 
-/datum/disease2/effect/invisible_stage_foura
-	name = "Non-existant Syndrome"
-	stage = 4
-	activate(var/mob/living/carbon/mob,var/multiplier)
-		return
-/datum/disease2/effect/invisible_stage_fourb
-	name = "Non-existant Syndrome"
-	stage = 4
-	activate(var/mob/living/carbon/mob,var/multiplier)
-		return
-/datum/disease2/effect/invisible_stage_fourc
-	name = "Non-existant Syndrome"
-	stage = 4
-	activate(var/mob/living/carbon/mob,var/multiplier)
-		return
-/datum/disease2/effect/invisible_stage_fourd
-	name = "Non-existant Syndrome"
-	stage = 4
-	activate(var/mob/living/carbon/mob,var/multiplier)
-		return
-/datum/disease2/effect/invisible_stage_foure
-	name = "Non-existant Syndrome"
-	stage = 4
-	activate(var/mob/living/carbon/mob,var/multiplier)
-		return
-/datum/disease2/effect/invisible_stage_fourf
-	name = "Non-existant Syndrome"
-	stage = 4
-	activate(var/mob/living/carbon/mob,var/multiplier)
-		return
-/datum/disease2/effect/invisible_stage_fourg
-	name = "Non-existant Syndrome"
-	stage = 4
-	activate(var/mob/living/carbon/mob,var/multiplier)
-		return
-/datum/disease2/effect/invisible_stage_fourh
-	name = "Non-existant Syndrome"
+/datum/disease2/effect/invisible_stage_four
+	name = "Anticipation Syndrome"
 	stage = 4
 	activate(var/mob/living/carbon/mob,var/multiplier)
 		return
@@ -227,10 +131,6 @@
 	activate(var/mob/living/carbon/mob,var/multiplier)
 		mob.gib()
 
-/datum/disease2/effect/blank_stage_4
-	name = "Nonexistant Syndrome"
-	stage = 4
-
 /datum/disease2/effect/radian
 	name = "Radian's Syndrome"
 	stage = 4