Merge branch 'master' into alcohol-intolerance

code/datums/components/butchering.dm

@@ -32,7 +32,7 @@
 
 	if(ishuman(M) && source.force && source.get_sharpness())
 		var/mob/living/carbon/human/H = M
-		if((H.health <= H.crit_threshold || (user.pulling == H && user.grab_state >= GRAB_NECK) || H.IsSleeping()) && user.zone_selected == BODY_ZONE_HEAD) // Only sleeping, neck grabbed, or crit, can be sliced.
+		if((H.health <= H.crit_threshold || (user.pulling == H && user.grab_state >= GRAB_NECK) || H.IsSleeping()) && user.zone_selected == BODY_ZONE_PRECISE_MOUTH) // Only sleeping, neck grabbed, or crit, can be sliced.
 			if(H.has_status_effect(/datum/status_effect/neck_slice))
 				user.show_message("<span class='warning'>[H]'s neck has already been already cut, you can't make the bleeding any worse!</span>", 1, \
 								"<span class='warning'>Their neck has already been already cut, you can't make the bleeding any worse!</span>")
@@ -120,4 +120,4 @@
 	if(eater.safety_mode || (eater.stat & (BROKEN|NOPOWER))) //I'm so sorry.
 		return
 	if(L.stat == DEAD && (L.butcher_results || L.guaranteed_butcher_results))
-		Butcher(parent, L)
+		Butcher(parent, L)

code/datums/components/nanites.dm

@@ -11,8 +11,9 @@
 	var/list/datum/nanite_program/programs = list()
 	var/max_programs = NANITE_PROGRAM_LIMIT
 
-	var/stealth = FALSE //if TRUE, does not appear on HUDs and health scans, and does not display the program list on nanite scans
-
+	var/stealth = FALSE //if TRUE, does not appear on HUDs and health scans
+	var/diagnostics = TRUE //if TRUE, displays program list when scanned by nanite scanners
+	
 /datum/component/nanites/Initialize(amount = 100, cloud = 0)
 	if(!isliving(parent) && !istype(parent, /datum/nanite_cloud_backup))
 		return COMPONENT_INCOMPATIBLE
@@ -252,8 +253,8 @@
 		to_chat(user, "<span class='info'>Cloud ID: [cloud_id ? cloud_id : "Disabled"]</span>")
 		to_chat(user, "<span class='info'>================</span>")
 		to_chat(user, "<span class='info'>Program List:</span>")
-		if(stealth)
-			to_chat(user, "<span class='alert'>%#$ENCRYPTED&^@</span>")
+		if(!diagnostics)
+			to_chat(user, "<span class='alert'>Diagnostics Disabled</span>")
 		else
 			for(var/X in programs)
 				var/datum/nanite_program/NP = X

code/datums/components/shrink.dm

@@ -0,0 +1,42 @@
+/datum/component/shrink
+	var/olddens
+	var/oldopac
+	dupe_mode = COMPONENT_DUPE_HIGHLANDER
+
+/datum/component/shrink/Initialize(shrink_time)
+	if(!isatom(parent))
+		return COMPONENT_INCOMPATIBLE
+	var/atom/parent_atom = parent
+	parent_atom.transform = parent_atom.transform.Scale(0.5,0.5)
+	olddens = parent_atom.density
+	oldopac = parent_atom.opacity
+	parent_atom.density = 0
+	parent_atom.opacity = 0
+	if(isliving(parent_atom))
+		var/mob/living/L = parent_atom
+		L.add_movespeed_modifier(MOVESPEED_ID_SHRINK_RAY, update=TRUE, priority=100, multiplicative_slowdown=4)
+		if(iscarbon(L))
+			var/mob/living/carbon/C = L
+			C.unequip_everything()
+			C.visible_message("<span class='warning'>[C]'s belongings fall off of [C.p_them()] as they shrink down!</span>",
+			"<span class='userdanger'>Your belongings fall away as everything grows bigger!</span>")
+			if(ishuman(C))
+				var/mob/living/carbon/human/H = C
+				H.physiology.damage_resistance -= 100//carbons take double damage while shrunk
+	parent_atom.visible_message("<span class='warning'>[parent_atom] shrinks down to a tiny size!</span>",
+	"<span class='userdanger'>Everything grows bigger!</span>")
+	QDEL_IN(src, shrink_time)
+
+
+/datum/component/shrink/Destroy()
+	var/atom/parent_atom = parent
+	parent_atom.transform = parent_atom.transform.Scale(2,2)
+	parent_atom.density = olddens
+	parent_atom.opacity = oldopac
+	if(isliving(parent_atom))
+		var/mob/living/L = parent_atom
+		L.remove_movespeed_modifier(MOVESPEED_ID_SHRINK_RAY)
+		if(ishuman(L))
+			var/mob/living/carbon/human/H = L
+			H.physiology.damage_resistance += 100
+	..()

code/datums/components/sizzle.dm

@@ -0,0 +1,25 @@
+/datum/component/sizzle
+	var/mutable_appearance/sizzling
+	var/sizzlealpha = 0
+	dupe_mode = COMPONENT_DUPE_UNIQUE_PASSARGS
+
+/datum/component/sizzle/Initialize()
+	if(!isatom(parent))
+		return COMPONENT_INCOMPATIBLE
+	setup_sizzle()
+
+/datum/component/sizzle/InheritComponent(datum/component/C, i_am_original)
+	var/atom/food = parent
+	sizzlealpha += 5
+	sizzling.alpha = sizzlealpha
+	food.cut_overlay(sizzling)
+	food.add_overlay(sizzling)
+
+/datum/component/sizzle/proc/setup_sizzle()
+	var/atom/food = parent
+	var/icon/grill_marks = icon(initial(food.icon), initial(food.icon_state))	//we only want to apply grill marks to the initial icon_state for each object
+	grill_marks.Blend("#fff", ICON_ADD) 	//fills the icon_state with white (except where it's transparent)
+	grill_marks.Blend(icon('icons/obj/kitchen.dmi', "grillmarks"), ICON_MULTIPLY) //adds grill marks and the remaining white areas become transparent
+	sizzling = new(grill_marks)
+	sizzling.alpha = sizzlealpha
+	food.add_overlay(sizzling)

code/datums/components/storage/concrete/_concrete.dm

@@ -66,7 +66,7 @@
 /datum/component/storage/concrete/_insert_physical_item(obj/item/I, override = FALSE)
 	. = TRUE
 	var/atom/real_location = real_location()
-	if(I.loc != real_location)
+	if(I.loc != real_location && real_location)
 		I.forceMove(real_location)
 	refresh_mob_views()
 

code/datums/emotes.dm

@@ -136,9 +136,10 @@
 /datum/emote/sound
 	var/sound //Sound to play when emote is called
 	var/vary = FALSE	//used for the honk borg emote
+	var/volume = 50
 	mob_type_allowed_typecache = list(/mob/living/brain, /mob/living/silicon)
 
 /datum/emote/sound/run_emote(mob/user, params)
 	. = ..()
 	if(.)
-		playsound(user.loc, sound, 50, vary)
+		playsound(user.loc, sound, volume, vary)

code/datums/looping_sounds/machinery_sounds.dm

@@ -4,7 +4,7 @@
 	mid_sounds = list('sound/machines/shower/shower_mid1.ogg'=1,'sound/machines/shower/shower_mid2.ogg'=1,'sound/machines/shower/shower_mid3.ogg'=1)
 	mid_length = 10
 	end_sound = 'sound/machines/shower/shower_end.ogg'
-	volume = 20
+	volume = 10
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -32,7 +32,7 @@
 	mid_sounds = list('sound/machines/fryer/deep_fryer_1.ogg' = 1, 'sound/machines/fryer/deep_fryer_2.ogg' = 1)
 	mid_length = 2
 	end_sound = 'sound/machines/fryer/deep_fryer_emerge.ogg'
-	volume = 15
+	volume = 5
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -43,3 +43,12 @@
 	mid_length = 10
 	end_sound = 'sound/machines/microwave/microwave-end.ogg'
 	volume = 90
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+/datum/looping_sound/grill
+	mid_length = 2
+	mid_sounds = list('sound/machines/fryer/deep_fryer_1.ogg' = 1, 'sound/machines/fryer/deep_fryer_2.ogg' = 1)
+	volume = 10
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

code/datums/martial.dm

@@ -8,6 +8,8 @@
 	var/deflection_chance = 0 //Chance to deflect projectiles
 	var/reroute_deflection = FALSE //Delete the bullet, or actually deflect it in some direction?
 	var/block_chance = 0 //Chance to block melee attacks using items while on throw mode.
+	var/dodge_chance = 0
+	var/restraining = 0 //used in cqc's disarm_act to check if the disarmed is being restrained and so whether they should be put in a chokehold or not
 	var/help_verb
 	var/pacifism_check = TRUE //are the martial arts combos/attacks unable to be used by pacifist.
 	var/allow_temp_override = TRUE //if this martial art can be overridden by temporary martial arts

code/datums/martial/cqc.dm

@@ -10,7 +10,6 @@
 	help_verb = /mob/living/carbon/human/proc/CQC_help
 	block_chance = 75
 	var/old_grab_state = null
-	var/restraining = FALSE
 
 /datum/martial_art/cqc/reset_streak(mob/living/carbon/human/new_target)
 	. = ..()

code/datums/martial/rising_bass.dm

@@ -0,0 +1,158 @@
+#define SIDE_KICK_COMBO "DH"
+#define SHOULDER_FLIP_COMBO "GHDGHH"
+#define REPULSE_PUNCH_COMBO "GHGH"
+#define FOOT_SMASH_COMBO "HH"
+#define DEFT_SWITCH_COMBO "GDD"
+
+/datum/martial_art/the_rising_bass
+	name = "The Rising Bass"
+	id = MARTIALART_RISINGBASS
+	dodge_chance = 100
+	allow_temp_override = FALSE
+	help_verb = /mob/living/carbon/human/proc/rising_bass_help
+
+/datum/martial_art/the_rising_bass/proc/check_streak(mob/living/carbon/human/A, mob/living/carbon/human/D)
+	if(findtext(streak,SIDE_KICK_COMBO))
+		streak = ""
+		sideKick(A,D)
+		return 1
+	if(findtext(streak,SHOULDER_FLIP_COMBO))
+		streak = ""
+		shoulderFlip(A,D)
+		return 1
+	if(findtext(streak,REPULSE_PUNCH_COMBO))
+		streak = ""
+		repulsePunch(A,D)
+		return 1
+	if(findtext(streak,FOOT_SMASH_COMBO))
+		streak = ""
+		footSmash(A,D)
+		return 1
+	if(findtext(streak,DEFT_SWITCH_COMBO))
+		streak = ""
+		deftSwitch(A,D)
+		return 1
+	return 0
+
+
+/datum/martial_art/the_rising_bass/proc/sideKick(mob/living/carbon/human/A, mob/living/carbon/human/D)
+	if(!D.IsKnockdown() || D.lying == 0)
+		var/turf/H = get_step(D, A.dir & (NORTH | SOUTH) ? pick(EAST, WEST) : pick(NORTH, SOUTH))
+		A.do_attack_animation(D, ATTACK_EFFECT_KICK)
+		D.visible_message("<span class='warning'>[A] kicks [D] in the side, sliding them over!</span>", \
+						  "<span class='userdanger'>[A] kicks you in the side, forcing you to step away!</span>")
+		playsound(get_turf(A), 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
+		D.apply_damage(5, BRUTE, BODY_ZONE_CHEST)
+		D.Knockdown(60)
+		var/L = H
+		for(var/obj/i in H.contents)
+			if(!istype(i,/mob) && i.density == 1)
+				L = D.loc
+		D.forceMove(L)
+		log_combat(A, D, "side kicked (Rising Bass)")
+		return 1
+	return basic_hit(A,D)
+
+/datum/martial_art/the_rising_bass/proc/shoulderFlip(mob/living/carbon/human/A, mob/living/carbon/human/D)
+	if(!D.IsKnockdown() || !D.lying)
+		var/turf/H = get_step(A, get_dir(D,A))
+		var/L = H
+		for(var/obj/i in H.contents)
+			if(!istype(i,/mob) && i.density == 1)//(i.anchored == 1 && i.density == 1) || istype(i,/obj/structure) || istype(i,/turf/closed)
+				L = A.loc
+		A.do_attack_animation(D, ATTACK_EFFECT_PUNCH)
+		D.visible_message("<span class='warning'>[A] flips [D] over their shoulder, slamming them into the ground!</span>", \
+						  "<span class='userdanger'>[A] flips you over their shoulder, slamming you into the ground!</span>")
+		playsound(get_turf(A), 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
+		D.emote("scream")
+		D.apply_damage(10, BRUTE, BODY_ZONE_CHEST)
+		D.apply_damage(30, BRUTE, BODY_ZONE_HEAD)
+		D.Sleeping(60)
+		D.Knockdown(300)
+		D.forceMove(L)
+		log_combat(A, D, "shoulder flipped (Rising Bass)")
+		return 1
+	return basic_hit(A,D)
+
+/datum/martial_art/the_rising_bass/proc/repulsePunch(mob/living/carbon/human/A, mob/living/carbon/human/D)
+	if(!D.IsKnockdown() || !D.lying)
+		A.do_attack_animation(D, ATTACK_EFFECT_PUNCH)
+		D.visible_message("<span class='warning'>[A] smashes [D] in the chest, throwing them away!</span>", \
+						  "<span class='userdanger'>[A] smashes you in the chest, repelling you away!</span>")
+		playsound(get_turf(A), 'sound/weapons/punch1.ogg', 50, 1, -1)
+		var/atom/F = get_edge_target_turf(D, get_dir(A, get_step_away(D, A)))
+		D.throw_at(F, 10, 1)
+		D.apply_damage(10, BRUTE, BODY_ZONE_CHEST)
+		D.Knockdown(90)
+		log_combat(A, D, "repulse punched (Rising Bass)")
+		return 1
+	return basic_hit(A,D)
+
+/datum/martial_art/the_rising_bass/proc/footSmash(mob/living/carbon/human/A, mob/living/carbon/human/D)
+	if(!D.IsKnockdown() || !D.lying)
+		A.do_attack_animation(D, ATTACK_EFFECT_KICK)
+		D.visible_message("<span class='warning'>[A] smashes their foot down on [D]'s foot!</span>", \
+						  "<span class='userdanger'>[A] smashes your foot!</span>")
+		playsound(get_turf(A), 'sound/weapons/punch1.ogg', 50, 1, -1)
+		D.apply_damage(5, BRUTE, pick(BODY_ZONE_L_LEG, BODY_ZONE_R_LEG))
+		D.dropItemToGround(D.get_active_held_item())
+		log_combat(A, D, "foot smashed (Rising Bass)")
+		return 1
+	return basic_hit(A,D)
+
+/datum/martial_art/the_rising_bass/proc/deftSwitch(mob/living/carbon/human/A, mob/living/carbon/human/D)
+	if(!D.IsKnockdown() || !D.lying)
+		if (D.get_active_held_item())
+			var/obj/item/G = D.get_active_held_item()
+			if (G && !(G.item_flags & (ABSTRACT|DROPDEL)) && D.temporarilyRemoveItemFromInventory(G))
+				A.put_in_hands(G)
+				D.visible_message("<span class='warning'>[A] slaps [D]'s hands, taking [G] from them!</span>", \
+					"<span class='userdanger'>[A] slaps you, taking [G] from you!</span>")
+				log_combat(A, D, "deft switched (Rising Bass)")
+				return 1
+			else
+				to_chat(A, "<i>[G] can't be taken out of [D]'s hands!</i>")
+	return 0
+
+/datum/martial_art/the_rising_bass/disarm_act(mob/living/carbon/human/A, mob/living/carbon/human/D)
+	add_to_streak("D",D)
+	if(check_streak(A,D))
+		return 1
+	return ..()
+
+/datum/martial_art/the_rising_bass/harm_act(mob/living/carbon/human/A, mob/living/carbon/human/D)
+	add_to_streak("H",D)
+	if(check_streak(A,D))
+		return 1
+	return ..()
+
+/datum/martial_art/the_rising_bass/grab_act(mob/living/carbon/human/A, mob/living/carbon/human/D)
+	add_to_streak("G",D)
+	if(check_streak(A,D))
+		return 1
+	return ..()
+
+/mob/living/carbon/human/proc/rising_bass_help()
+	set name = "Recall Teachings"
+	set desc = "Remember the martial techniques of the Rising Bass clan."
+	set category = "Rising Bass"
+
+	to_chat(usr, "<b><i>You retreat inward and recall the teachings of the Rising Bass...</i></b>")
+
+	to_chat(usr, "<span class='notice'>Side Kick</span>: Disarm Harm. Forces opponent to step to the side.")
+	to_chat(usr, "<span class='notice'>Shoulder Flip</span>: Grab Harm Disarm Grab Harm Harm. Flips opponent over your shoulder and stuns.")
+	to_chat(usr, "<span class='notice'>Repulse Punch</span>: Grab Harm Grab Harm. Slams the opponent far away from you.")
+	to_chat(usr, "<span class='notice'>Foot Smash</span>: Harm Harm. Stuns opponent, minor damage.")
+	to_chat(usr, "<span class='notice'>Deft Switch</span>: Grab Disarm Disarm. Switches the opponent's held item for your own. Most useful with nothing in your hand.")
+
+/datum/martial_art/the_rising_bass/teach(mob/living/carbon/human/H, make_temporary = FALSE)
+	. = ..()
+	if(!.)
+		return
+	ADD_TRAIT(H, TRAIT_NOGUNS, RISING_BASS_TRAIT)
+	ADD_TRAIT(H, TRAIT_AUTO_CATCH_ITEM, RISING_BASS_TRAIT)
+
+/datum/martial_art/the_rising_bass/on_remove(mob/living/carbon/human/H)
+	. = ..()
+	REMOVE_TRAIT(H, TRAIT_NOGUNS, RISING_BASS_TRAIT)
+	REMOVE_TRAIT(H, TRAIT_AUTO_CATCH_ITEM, RISING_BASS_TRAIT)

code/datums/martial/sleeping_carp.dm

@@ -185,9 +185,8 @@
 	righthand_file = 'icons/mob/inhands/weapons/staves_righthand.dmi'
 	block_chance = 50
 
-/obj/item/twohanded/bostaff/update_icon()
+/obj/item/twohanded/bostaff/update_icon_state()
 	icon_state = "bostaff[wielded]"
-	return
 
 /obj/item/twohanded/bostaff/attack(mob/target, mob/living/user)
 	add_fingerprint(user)

code/datums/mind.dm

@@ -135,6 +135,9 @@
 		if(L.client && L.client.prefs)
 			L.canbearoused = L.client.prefs.arousable //Technically this should make taking over a character mean the body gain the new minds setting...
 			L.update_arousal_hud() //Removes the old icon
+			if (L.client.prefs.auto_ooc)
+				if (L.client.prefs.chat_toggles & CHAT_OOC)
+					L.client.prefs.chat_toggles ^= CHAT_OOC
 
 	SEND_SIGNAL(src, COMSIG_MIND_TRANSFER, new_character, old_character)
 

code/datums/mood_events/generic_positive_events.dm

@@ -134,6 +134,12 @@
 	mood_change = 3
 	timeout = 3000
 
+/datum/mood_event/breakfast
+	description = "<span class='nicegreen'>Nothing like a hearty breakfast to start the shift.</span>\n"
+	mood_change = 2
+	timeout = 15 MINUTES
+
+//Power gamer stuff below
 /datum/mood_event/drankblood
 	description = "<span class='nicegreen'>I have fed greedly from that which nourishes me.</span>\n"
 	mood_change = 10
@@ -143,6 +149,7 @@
 	description = "<span class='nicegreen'>I slept in a coffin during the day. I feel whole again.</span>\n"
 	mood_change = 8
 	timeout = 1200
+
 //Cursed stuff below.
 
 /datum/mood_event/orgasm

code/datums/mutations/speech.dm

@@ -95,6 +95,7 @@
 		message = replacetext(message," ugly "," beautiful ")
 		message = replacetext(message," douchbag "," nice guy ")
 		message = replacetext(message," whore "," lady ")
+		message = replacetext(message," gamer "," intellectual ")
 		message = replacetext(message," nerd "," smarty pants ")
 		message = replacetext(message," moron "," fun person ")
 		message = replacetext(message," IT'S LOOSE "," EVERYTHING IS FINE ")

code/datums/radiation_wave.dm

@@ -3,6 +3,7 @@
 	var/turf/master_turf //The center of the wave
 	var/steps=0 //How far we've moved
 	var/intensity //How strong it was originaly
+	var/remaining_contam //How much contaminated material it still has
 	var/range_modifier //Higher than 1 makes it drop off faster, 0.5 makes it drop off half etc
 	var/move_dir //The direction of movement
 	var/list/__dirs //The directions to the side of the wave, stored for easy looping
@@ -18,6 +19,7 @@
 	__dirs+=turn(dir, -90)
 
 	intensity = _intensity
+	remaining_contam = intensity
 	range_modifier = _range_modifier
 	can_contaminate = _can_contaminate
 
@@ -46,8 +48,9 @@
 		qdel(src)
 		return
 
-	radiate(atoms, FLOOR(strength, 1))
-
+	if(radiate(atoms, FLOOR(min(strength,remaining_contam), 1)))
+		//oof ow ouch
+		remaining_contam = max(0,remaining_contam-((min(strength,remaining_contam)-RAD_MINIMUM_CONTAMINATION) * RAD_CONTAMINATION_STR_COEFFICIENT))
 	check_obstructions(atoms) // reduce our overall strength if there are radiation insulators
 
 /datum/radiation_wave/proc/get_rad_atoms()
@@ -89,7 +92,8 @@
 			intensity *= (1-((1-thing.rad_insulation)/width))
 
 /datum/radiation_wave/proc/radiate(list/atoms, strength)
-	var/contamination_chance = (strength-RAD_MINIMUM_CONTAMINATION) * RAD_CONTAMINATION_CHANCE_COEFFICIENT * min(1, 1/(steps*range_modifier))
+	var/can_contam = strength >= RAD_MINIMUM_CONTAMINATION
+	var/list/contam_atoms = list()
 	for(var/k in 1 to atoms.len)
 		var/atom/thing = atoms[k]
 		if(!thing)
@@ -109,8 +113,14 @@
 			))
 		if(!can_contaminate || blacklisted[thing.type])
 			continue
-		if(prob(contamination_chance)) // Only stronk rads get to have little baby rads
-			if(CHECK_BITFIELD(thing.rad_flags, RAD_NO_CONTAMINATE) || SEND_SIGNAL(thing, COMSIG_ATOM_RAD_CONTAMINATING, strength) & COMPONENT_BLOCK_CONTAMINATION)
-				continue
-			var/rad_strength = (strength-RAD_MINIMUM_CONTAMINATION) * RAD_CONTAMINATION_STR_COEFFICIENT
+		if(CHECK_BITFIELD(thing.rad_flags, RAD_NO_CONTAMINATE) || SEND_SIGNAL(thing, COMSIG_ATOM_RAD_CONTAMINATING, strength) & COMPONENT_BLOCK_CONTAMINATION)
+			continue
+		contam_atoms += thing
+	var/did_contam = 0
+	if(length(can_contam))
+		var/rad_strength = ((strength-RAD_MINIMUM_CONTAMINATION) * RAD_CONTAMINATION_STR_COEFFICIENT)/contam_atoms.len
+		for(var/k in 1 to contam_atoms.len)
+			var/atom/thing = contam_atoms[k]
 			thing.AddComponent(/datum/component/radioactive, rad_strength, source)
+			did_contam = 1
+	return did_contam

code/datums/ruins/station.dm

@@ -0,0 +1,21 @@
+/datum/map_template/ruin/station
+	prefix = "_maps/RandomRuins/StationRuins/"
+	cost = 0
+
+// Boxstation
+	// Engine
+
+/datum/map_template/ruin/station/box/engine
+	id = "engine_sm"
+	suffix = "Box/Engine/engine_sm.dmm"
+	name = "Engine SM"
+
+/datum/map_template/ruin/station/box/engine/singulo
+	id = "engine_singulo"
+	suffix = "Box/Engine/engine_singulo.dmm"
+	name = "Engine Singulo"
+
+/datum/map_template/ruin/station/box/engine/tesla
+	id = "engine_tesla"
+	suffix = "Box/Engine/engine_tesla.dmm"
+	name = "Engine Tesla"

code/datums/status_effects/buffs.dm

@@ -292,6 +292,7 @@
 			var/mob/living/carbon/C = owner
 			for(var/X in C.bodyparts)
 				var/obj/item/bodypart/BP = X
+				BP.max_damage *= 10
 				BP.brute_dam *= 10
 				BP.burn_dam *= 10
 		owner.toxloss *= 10
@@ -377,6 +378,7 @@
 			var/obj/item/bodypart/BP = X
 			BP.brute_dam *= 0.1
 			BP.burn_dam *= 0.1
+			BP.max_damage /= 10
 	owner.toxloss *= 0.1
 	owner.oxyloss *= 0.1
 	owner.cloneloss *= 0.1

code/datums/traits/good.dm

@@ -208,3 +208,15 @@
 /datum/quirk/bloodpressure/remove()
 	var/mob/living/M = quirk_holder
 	M.blood_ratio = 1
+
+/datum/quirk/night_vision
+	name = "Night Vision"
+	desc = "You can see slightly more clearly in full darkness than most people."
+	value = 1
+	mob_trait = TRAIT_NIGHT_VISION
+	gain_text = "<span class='notice'>The shadows seem a little less dark.</span>"
+	lose_text = "<span class='danger'>Everything seems a little darker.</span>"
+
+/datum/quirk/night_vision/on_spawn()
+	var/mob/living/carbon/human/H = quirk_holder
+	H.update_sight()

code/datums/traits/neutral.dm

@@ -88,15 +88,6 @@
 	if(quirk_holder)
 		quirk_holder.remove_client_colour(/datum/client_colour/monochrome)
 
-/datum/quirk/crocrin_immunity
-	name = "Crocin Immunity"
-	desc = "You're one of the few people in the galaxy who are genetically immune to Crocin and Hexacrocin products and their addictive properties! However, you can still get brain damage from Hexacrocin addiction."
-	mob_trait = TRAIT_CROCRIN_IMMUNE
-	value = 0
-	gain_text = "<span class='notice'>You feel more prudish.</span>"
-	lose_text = "<span class='notice'>You don't feel as prudish as before.</span>"
-	medical_record_text = "Patient exhibits a special gene that makes them immune to aphrodisiacs."
-
 /datum/quirk/libido
 	name = "Nymphomania"
 	desc = "You're always feeling a bit in heat. Also, you get aroused faster than usual."
@@ -131,26 +122,6 @@
 	gain_text = "<span class='notice'>You feel like exposing yourself to the world.</span>"
 	lose_text = "<span class='notice'>Indecent exposure doesn't sound as charming to you anymore.</span>"
 
-/datum/quirk/pharmacokinesis //Prevents unwanted organ additions.
-	name = "Acute hepatic pharmacokinesis"
-	desc = "You've a rare genetic disorder that causes Incubus draft and Sucubus milk to be absorbed by your liver instead."
-	value = 0
-	mob_trait = TRAIT_PHARMA
-	lose_text = "<span class='notice'>Your liver feels different.</span>"
-	medical_record_text = "Non-invasive tests report that the patient's metabolism is indeed incompatible with a certain \"stimulants\"."
-	var/active = FALSE
-	var/power = 0
-	var/cachedmoveCalc = 1
-
-/datum/quirk/assblastusa
-	name = "Buns of Steel"
-	desc = "You've never skipped ass day. With this trait, you are completely immune to all forms of ass slapping and anyone who tries to slap your rock hard ass usually gets a broken hand."
-	mob_trait = TRAIT_ASSBLASTUSA
-	value = 0
-	medical_record_text = "Patient never skipped ass day."
-	gain_text = "<span class='notice'>Your ass rivals those of golems.</span>"
-	lose_text = "<span class='notice'>Your butt feels more squishy and slappable.</span>"
-
 /datum/quirk/alcohol_intolerance
 	name = "Alcohol Intolerance"
 	desc = "You take toxin damage from alcohol rather than getting drunk."

code/datums/weather/weather_types/radiation_storm.dm

@@ -22,27 +22,17 @@
 	target_trait = ZTRAIT_STATION
 
 	immunity_type = "rad"
+	
+	var/radiation_intensity = 100
 
 /datum/weather/rad_storm/telegraph()
 	..()
 	status_alarm(TRUE)
 
-
 /datum/weather/rad_storm/weather_act(mob/living/L)
 	var/resist = L.getarmor(null, "rad")
-	if(prob(40))
-		if(ishuman(L))
-			var/mob/living/carbon/human/H = L
-			if(H.dna && !HAS_TRAIT(H, TRAIT_RADIMMUNE))
-				if(prob(max(0,100-resist)))
-					H.randmuti()
-					if(prob(50))
-						if(prob(90))
-							H.randmutb()
-						else
-							H.randmutg()
-						H.domutcheck()
-		L.rad_act(20)
+	var/ratio = 1 - (min(resist, 100) / 100)
+	L.rad_act(radiation_intensity * ratio)
 
 /datum/weather/rad_storm/end()
 	if(..())