funny

2020-11-12 23:34:42 -07:00
parent e8bd56a92d
commit 803bff4e5f
285 changed files with 285 additions and 285 deletions
--- a/code/datums/brain_damage/mild.dm
+++ b/code/datums/brain_damage/mild.dm
@@ -263,4 +263,4 @@
 			popleft(speak_dejavu) //Remove the oldest
 			speak_dejavu += speech_args[SPEECH_MESSAGE]
 	else
-		speak_dejavu += speech_args[SPEECH_MESSAGE]
+		speak_dejavu += speech_args[SPEECH_MESSAGE]
--- a/code/datums/components/crafting/glassware/glassware.dm
+++ b/code/datums/components/crafting/glassware/glassware.dm
@@ -451,4 +451,4 @@
 	if(istype(I, /obj/item/stack/sheet/glass))
 		if(do_after(user,10, target = src))
 			new next_step(user.loc, 1)
-			qdel(src)
+			qdel(src)
--- a/code/datums/components/crafting/glassware/lens_crafting.dm
+++ b/code/datums/components/crafting/glassware/lens_crafting.dm
@@ -95,4 +95,4 @@
 	name = "Handmade Glasses"
 	desc = "Handmade glasses that have not been polished at all making them useless. Selling them could still be worth a few credits."
 	icon = 'icons/obj/glass_ware.dmi'
-	icon_state = "frames_2"
+	icon_state = "frames_2"
--- a/code/datums/components/crafting/recipes/recipes_robot.dm
+++ b/code/datums/components/crafting/recipes/recipes_robot.dm
@@ -95,4 +95,4 @@
 	reqs = list(/obj/item/aicard = 1,
 					/obj/item/reagent_containers/food/snacks/grown/pumpkin = 1,
 					/obj/item/stack/cable_coil = 5)
-	category = CAT_ROBOT
+	category = CAT_ROBOT
--- a/code/datums/components/fantasy/prefixes.dm
+++ b/code/datums/components/fantasy/prefixes.dm
@@ -67,4 +67,4 @@
 /datum/fantasy_affix/vampiric/apply(datum/component/fantasy/comp, newName)
 	var/obj/item/master = comp.parent
 	comp.appliedComponents += master.AddComponent(/datum/component/lifesteal, comp.quality)
-	return "vampiric [newName]"
+	return "vampiric [newName]"
--- a/code/datums/components/igniter.dm
+++ b/code/datums/components/igniter.dm
@@ -36,4 +36,4 @@
 	if(isliving(target))
 		var/mob/living/L = target
 		L.adjust_fire_stacks(fire_stacks)
-		L.IgniteMob()
+		L.IgniteMob()
--- a/code/datums/components/knockoff.dm
+++ b/code/datums/components/knockoff.dm
@@ -41,4 +41,4 @@
 	RegisterSignal(H, COMSIG_HUMAN_DISARM_HIT, .proc/Knockoff, TRUE)

 /datum/component/knockoff/proc/OnDropped(datum/source, mob/living/M)
-	UnregisterSignal(M, COMSIG_HUMAN_DISARM_HIT)
+	UnregisterSignal(M, COMSIG_HUMAN_DISARM_HIT)
--- a/code/datums/components/magnetic_catch.dm
+++ b/code/datums/components/magnetic_catch.dm
@@ -31,4 +31,4 @@
 	UnregisterSignal(thing, COMSIG_MOVABLE_PRE_THROW)

 /datum/component/magnetic_catch/proc/throw_react(datum/source, list/arguments)
-	return COMPONENT_CANCEL_THROW
+	return COMPONENT_CANCEL_THROW
--- a/code/datums/components/shrink.dm
+++ b/code/datums/components/shrink.dm
@@ -39,4 +39,4 @@
 		if(ishuman(L))
 			var/mob/living/carbon/human/H = L
 			H.physiology.damage_resistance += 100
-	..()
+	..()
--- a/code/datums/components/sizzle.dm
+++ b/code/datums/components/sizzle.dm
@@ -22,4 +22,4 @@
 	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)
+	food.add_overlay(sizzling)
--- a/code/datums/components/spawner.dm
+++ b/code/datums/components/spawner.dm
@@ -53,4 +53,4 @@
 	spawned_mobs += L
 	L.nest = src
 	L.faction = src.faction
-	P.visible_message("<span class='danger'>[L] [spawn_text] [P].</span>")
+	P.visible_message("<span class='danger'>[L] [spawn_text] [P].</span>")
--- a/code/datums/components/summoning.dm
+++ b/code/datums/components/summoning.dm
@@ -68,4 +68,4 @@
 	spawn_location.visible_message("<span class='danger'>[L] [spawn_text].</span>")

 /datum/component/summoning/proc/on_spawned_death(mob/killed, gibbed)
-	spawned_mobs -= killed
+	spawned_mobs -= killed
--- a/code/datums/components/swarming.dm
+++ b/code/datums/components/swarming.dm
@@ -52,4 +52,4 @@
 	var/atom/movable/owner = parent
 	if(is_swarming)
 		animate(owner, pixel_x = owner.pixel_x - offset_x, pixel_y = owner.pixel_y - offset_y, time = 2)
-		is_swarming = FALSE
+		is_swarming = FALSE
--- a/code/datums/components/thermite.dm
+++ b/code/datums/components/thermite.dm
@@ -78,4 +78,4 @@

 /datum/component/thermite/proc/attackby_react(datum/source, obj/item/thing, mob/user, params)
 	if(thing.get_temperature())
-		thermite_melt(user)
+		thermite_melt(user)
--- a/code/datums/dash_weapon.dm
+++ b/code/datums/dash_weapon.dm
@@ -46,4 +46,4 @@
 	holder.update_action_buttons_icon()
 	if(recharge_sound)
 		playsound(dashing_item, recharge_sound, 50, 1)
-	to_chat(holder, "<span class='notice'>[src] now has [current_charges]/[max_charges] charges.</span>")
+	to_chat(holder, "<span class='notice'>[src] now has [current_charges]/[max_charges] charges.</span>")
--- a/code/datums/diseases/_MobProcs.dm
+++ b/code/datums/diseases/_MobProcs.dm
@@ -151,4 +151,4 @@
 	flags_1 |= SHOCKED_1

 /mob/living/proc/reset_shocked()
-	flags_1 &= ~ SHOCKED_1
+	flags_1 &= ~ SHOCKED_1
--- a/code/datums/diseases/advance/presets.dm
+++ b/code/datums/diseases/advance/presets.dm
@@ -39,4 +39,4 @@
 			symptoms += S

 	name = "Sample #[rand(1,10000)]"
-	..()
+	..()
--- a/code/datums/diseases/advance/symptoms/disfiguration.dm
+++ b/code/datums/diseases/advance/symptoms/disfiguration.dm
@@ -47,4 +47,4 @@ BONUS
 	if(!.)
 		return
 	if(A.affected_mob)
-		REMOVE_TRAIT(A.affected_mob, TRAIT_DISFIGURED, DISEASE_TRAIT)
+		REMOVE_TRAIT(A.affected_mob, TRAIT_DISFIGURED, DISEASE_TRAIT)
--- a/code/datums/diseases/advance/symptoms/dizzy.dm
+++ b/code/datums/diseases/advance/symptoms/dizzy.dm
@@ -52,4 +52,4 @@ Bonus
 			to_chat(M, "<span class='userdanger'>A wave of dizziness washes over you!</span>")
 			M.Dizzy(5)
 			if(power >= 2)
-				M.set_drugginess(5)
+				M.set_drugginess(5)
--- a/code/datums/diseases/advance/symptoms/flesh_eating.dm
+++ b/code/datums/diseases/advance/symptoms/flesh_eating.dm
@@ -134,4 +134,4 @@ Bonus
 		M.reagents.add_reagent_list(list(/datum/reagent/toxin/heparin = 2, /datum/reagent/toxin/lipolicide = 2))
 	if(zombie)
 		M.reagents.add_reagent(/datum/reagent/romerol, 1)
-	return 1
+	return 1
--- a/code/datums/diseases/advance/symptoms/headache.dm
+++ b/code/datums/diseases/advance/symptoms/headache.dm
@@ -59,4 +59,4 @@ BONUS
 		M.adjustStaminaLoss(25)
 	if(power >= 3 && A.stage >= 5)
 		to_chat(M, "<span class='userdanger'>[pick("Your head hurts!", "You feel a burning knife inside your brain!", "A wave of pain fills your head!")]</span>")
-		M.Stun(35)
+		M.Stun(35)
--- a/code/datums/diseases/advance/symptoms/itching.dm
+++ b/code/datums/diseases/advance/symptoms/itching.dm
@@ -53,4 +53,4 @@ BONUS
 		var/can_scratch = scratch && !M.incapacitated() && get_location_accessible(M, picked_bodypart)
 		M.visible_message("[can_scratch ? "<span class='warning'>[M] scratches [M.p_their()] [bodypart.name].</span>" : ""]", "<span class='warning'>Your [bodypart.name] itches. [can_scratch ? " You scratch it." : ""]</span>")
 		if(can_scratch)
-			bodypart.receive_damage(0.5)
+			bodypart.receive_damage(0.5)
--- a/code/datums/diseases/advance/symptoms/oxygen.dm
+++ b/code/datums/diseases/advance/symptoms/oxygen.dm
@@ -67,4 +67,4 @@ Bonus
 	if(!..())
 		return
 	if(A.stage >= 4)
-		REMOVE_TRAIT(A.affected_mob, TRAIT_NOBREATH, DISEASE_TRAIT)
+		REMOVE_TRAIT(A.affected_mob, TRAIT_NOBREATH, DISEASE_TRAIT)
--- a/code/datums/diseases/advance/symptoms/skin.dm
+++ b/code/datums/diseases/advance/symptoms/skin.dm
@@ -38,4 +38,4 @@ BONUS
 				M.reagents.add_reagent(color, 5)
 		else
 			if (prob(50)) // spam
-				M.visible_message("<span class='warning'>[M] looks rather vibrant...</span>", "<span class='notice'>The colors, man, the colors...</span>")
+				M.visible_message("<span class='warning'>[M] looks rather vibrant...</span>", "<span class='notice'>The colors, man, the colors...</span>")
--- a/code/datums/diseases/advance/symptoms/sneeze.dm
+++ b/code/datums/diseases/advance/symptoms/sneeze.dm
@@ -51,4 +51,4 @@ Bonus
 		else
 			M.emote("sneeze")
 			if(M.CanSpreadAirborneDisease()) //don't spread germs if they covered their mouth
-				A.spread(4 + power)
+				A.spread(4 + power)
--- a/code/datums/diseases/advance/symptoms/symptoms.dm
+++ b/code/datums/diseases/advance/symptoms/symptoms.dm
@@ -79,4 +79,4 @@
 	return

 /datum/symptom/proc/OnRemove(datum/disease/advance/A)	//But dont forget to remove them too.
-	return
+	return
--- a/code/datums/diseases/advance/symptoms/weight.dm
+++ b/code/datums/diseases/advance/symptoms/weight.dm
@@ -50,4 +50,4 @@ Bonus
 		else
 			to_chat(M, "<span class='warning'><i>[pick("So hungry...", "You'd kill someone for a bite of food...", "Hunger cramps seize you...")]</i></span>")
 			M.overeatduration = max(M.overeatduration - 100, 0)
-			M.adjust_nutrition(-100)
+			M.adjust_nutrition(-100)
--- a/code/datums/diseases/advance/symptoms/youth.dm
+++ b/code/datums/diseases/advance/symptoms/youth.dm
@@ -55,4 +55,4 @@ BONUS
 			if(5)
 				if(H.age > 21)
 					H.age = 21
-					to_chat(H, "<span class='notice'>You feel like you can take on the world!</span>")
+					to_chat(H, "<span class='notice'>You feel like you can take on the world!</span>")
--- a/code/datums/diseases/anxiety.dm
+++ b/code/datums/diseases/anxiety.dm
@@ -38,4 +38,4 @@
 													"<span class='userdanger'>You cough up butterflies!</span>")
 				new /mob/living/simple_animal/butterfly(affected_mob.loc)
 				new /mob/living/simple_animal/butterfly(affected_mob.loc)
-	return
+	return
--- a/code/datums/diseases/beesease.dm
+++ b/code/datums/diseases/beesease.dm
@@ -36,4 +36,4 @@
 				affected_mob.visible_message("<span class='danger'>[affected_mob] coughs up a swarm of bees!</span>", \
 													"<span class='userdanger'>You cough up a swarm of bees!</span>")
 				new /mob/living/simple_animal/hostile/poison/bees(affected_mob.loc)
-	return
+	return
--- a/code/datums/diseases/cold.dm
+++ b/code/datums/diseases/cold.dm
@@ -50,4 +50,4 @@
 				if(!affected_mob.disease_resistances.Find(/datum/disease/flu))
 					var/datum/disease/Flu = new /datum/disease/flu()
 					affected_mob.ForceContractDisease(Flu, FALSE, TRUE)
-					cure()
+					cure()
--- a/code/datums/diseases/cold9.dm
+++ b/code/datums/diseases/cold9.dm
@@ -36,4 +36,4 @@
 			if(prob(1))
 				to_chat(affected_mob, "<span class='danger'>Your throat feels sore.</span>")
 			if(prob(10))
-				to_chat(affected_mob, "<span class='danger'>You feel stiff.</span>")
+				to_chat(affected_mob, "<span class='danger'>You feel stiff.</span>")
--- a/code/datums/diseases/heart_failure.dm
+++ b/code/datums/diseases/heart_failure.dm
@@ -62,4 +62,4 @@
 				cure()

 	else
-		cure()
+		cure()
--- a/code/datums/diseases/magnitis.dm
+++ b/code/datums/diseases/magnitis.dm
@@ -65,4 +65,4 @@
 					var/iter = rand(1,3)
 					for(i=0,i<iter,i++)
 						step_towards(S,affected_mob)
-	return
+	return
--- a/code/datums/diseases/pierrot_throat.dm
+++ b/code/datums/diseases/pierrot_throat.dm
@@ -52,4 +52,4 @@

 /datum/disease/pierrot_throat/remove_disease()
 	UnregisterSignal(affected_mob, COMSIG_MOB_SAY)
-	return ..()
+	return ..()
--- a/code/datums/diseases/retrovirus.dm
+++ b/code/datums/diseases/retrovirus.dm
@@ -81,4 +81,4 @@
 				if(prob(50))
 					scramble_dna(affected_mob, 1, 0, rand(50,75))
 				else
-					scramble_dna(affected_mob, 0, 1, rand(50,75))
+					scramble_dna(affected_mob, 0, 1, rand(50,75))
--- a/code/datums/elements/update_icon_blocker.dm
+++ b/code/datums/elements/update_icon_blocker.dm
@@ -7,4 +7,4 @@
 	RegisterSignal(target, COMSIG_ATOM_UPDATE_ICON, .proc/block_update_icon)

 /datum/element/update_icon_blocker/proc/block_update_icon()
-	return COMSIG_ATOM_NO_UPDATE_ICON_STATE | COMSIG_ATOM_NO_UPDATE_OVERLAYS
+	return COMSIG_ATOM_NO_UPDATE_ICON_STATE | COMSIG_ATOM_NO_UPDATE_OVERLAYS
--- a/code/datums/looping_sounds/machinery_sounds.dm
+++ b/code/datums/looping_sounds/machinery_sounds.dm
@@ -51,4 +51,4 @@
 	mid_sounds = list('sound/machines/fryer/deep_fryer_1.ogg' = 1, 'sound/machines/fryer/deep_fryer_2.ogg' = 1)
 	volume = 10

-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
--- a/code/datums/martial/psychotic_brawl.dm
+++ b/code/datums/martial/psychotic_brawl.dm
@@ -66,4 +66,4 @@

 	if(atk_verb)
 		log_combat(A, D, "[atk_verb] (Psychotic Brawling)")
-	return TRUE
+	return TRUE
--- a/code/datums/mutations/radioactive.dm
+++ b/code/datums/mutations/radioactive.dm
@@ -16,4 +16,4 @@
 		visual_indicators[type] = list(mutable_appearance('icons/effects/genetics.dmi', "radiation", -MUTATIONS_LAYER))

 /datum/mutation/human/radioactive/get_visual_indicator()
-	return visual_indicators[type][1]
+	return visual_indicators[type][1]
--- a/code/datums/progressbar.dm
+++ b/code/datums/progressbar.dm
@@ -64,4 +64,4 @@
 	qdel(bar)
 	. = ..()

-#undef PROGRESSBAR_HEIGHT
+#undef PROGRESSBAR_HEIGHT
--- a/code/datums/wires/airalarm.dm
+++ b/code/datums/wires/airalarm.dm
@@ -72,4 +72,4 @@
 			var/area/AA = get_base_area(A)
 			if(AA.atmosalert(2, holder))
 				A.post_alert(2)
-			A.update_icon()
+			A.update_icon()
--- a/code/datums/wires/apc.dm
+++ b/code/datums/wires/apc.dm
@@ -55,4 +55,4 @@
 			if(mend)
 				A.aidisabled = FALSE
 			else
-				A.aidisabled = TRUE
+				A.aidisabled = TRUE
--- a/code/datums/wires/explosive.dm
+++ b/code/datums/wires/explosive.dm
@@ -79,4 +79,4 @@

 /datum/wires/explosive/gibtonite/explode()
 	var/obj/item/gibtonite/P = holder
-	P.GibtoniteReaction(null, 2)
+	P.GibtoniteReaction(null, 2)
--- a/code/datums/wires/mulebot.dm
+++ b/code/datums/wires/mulebot.dm
@@ -29,4 +29,4 @@
 		if(WIRE_MOTOR1, WIRE_MOTOR2)
 			holder.visible_message("<span class='notice'>[icon2html(M, viewers(holder))] The drive motor whines briefly.</span>")
 		else
-			holder.visible_message("<span class='notice'>[icon2html(M, viewers(holder))] You hear a radio crackle.</span>")
+			holder.visible_message("<span class='notice'>[icon2html(M, viewers(holder))] You hear a radio crackle.</span>")
--- a/code/datums/wires/particle_accelerator.dm
+++ b/code/datums/wires/particle_accelerator.dm
@@ -47,4 +47,4 @@
 				C.remove_strength()

 /datum/wires/particle_accelerator/control_box/emp_pulse() // to prevent singulo from pulsing wires
-	return
+	return
--- a/code/datums/wires/vending.dm
+++ b/code/datums/wires/vending.dm
@@ -57,4 +57,4 @@
 		if(WIRE_IDSCAN)
 			V.scan_id = mend
 		if(WIRE_SPEAKER)
-			V.shut_up = mend
+			V.shut_up = mend
--- a/code/datums/wounds/_scars.dm
+++ b/code/datums/wounds/_scars.dm
@@ -149,4 +149,4 @@
 /// Used to format a scar to safe in preferences for persistent scars
 /datum/scar/proc/format_amputated(body_zone)
 	description = pick(list("is several skintone shades paler than the rest of the body", "is a gruesome patchwork of artificial flesh", "has a large series of attachment scars at the articulation points"))
-	return "[SCAR_CURRENT_VERSION]|[body_zone]|[description]|amputated|[WOUND_SEVERITY_LOSS]"
+	return "[SCAR_CURRENT_VERSION]|[body_zone]|[description]|amputated|[WOUND_SEVERITY_LOSS]"