From 271c66ad4033ad99825a783e1598c22e46a4fa61 Mon Sep 17 00:00:00 2001
From: Letter N <24603524+LetterN@users.noreply.github.com>
Date: Sat, 22 Aug 2020 17:03:10 +0800
Subject: [PATCH] travis moment

---
 code/modules/admin/verbs/playsound.dm | 4 ++--
 code/modules/paperwork/paperplane.dm  | 4 ++--
 code/modules/paperwork/photocopier.dm | 8 +++++---
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/code/modules/admin/verbs/playsound.dm b/code/modules/admin/verbs/playsound.dm
index f0b6f5c322..1c35e3907e 100644
--- a/code/modules/admin/verbs/playsound.dm
+++ b/code/modules/admin/verbs/playsound.dm
@@ -152,7 +152,7 @@
 				M?.client?.tgui_panel?.stop_music()
 			return
 
-		if(web_sound_url && !findtext(web_sound_url, GLOB.is_http_protocol))
+		if(web_sound_input && !findtext(web_sound_input, GLOB.is_http_protocol))
 			to_chat(src, "<span class='boldwarning'>BLOCKED: Content URL not using http(s) protocol</span>")
 			return
 
@@ -164,7 +164,7 @@
 			var/mob/M = m
 			var/client/C = M.client
 			if(C.prefs.toggles & SOUND_MIDI)
-				C.tgui_panel?.play_music(web_sound_url)
+				C.tgui_panel?.play_music(web_sound_input)
 
 	SSblackbox.record_feedback("tally", "admin_verb", 1, "Manual Play Internet Sound")
 
diff --git a/code/modules/paperwork/paperplane.dm b/code/modules/paperwork/paperplane.dm
index d496ae8068..53fe886d65 100644
--- a/code/modules/paperwork/paperplane.dm
+++ b/code/modules/paperwork/paperplane.dm
@@ -93,8 +93,8 @@
 	return ..()
 
 
-/obj/item/paperplane/throw_at(atom/target, range, speed, mob/thrower, spin=FALSE, diagonals_first = FALSE, datum/callback/callback, quickstart = TRUE)
-	. = ..(target, range, speed, thrower, FALSE, diagonals_first, callback, quickstart = quickstart)
+/obj/item/paperplane/throw_at(atom/target, range, speed, mob/thrower, spin=FALSE, diagonals_first = FALSE, datum/callback/callback)
+	. = ..(target, range, speed, thrower, FALSE, diagonals_first, callback)
 
 /obj/item/paperplane/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
 	if(iscarbon(hit_atom))
diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm
index 5425f0bc4a..f07ead2a0b 100644
--- a/code/modules/paperwork/photocopier.dm
+++ b/code/modules/paperwork/photocopier.dm
@@ -286,9 +286,11 @@
 /obj/machinery/photocopier/proc/make_ass_copy()
 	if(!check_ass())
 		return
-	if(ishuman(ass) && ass.is_groin_exposed()) //(ass.get_item_by_slot(ITEM_SLOT_ICLOTHING) || ass.get_item_by_slot(ITEM_SLOT_OCLOTHING)))
-		to_chat(usr, "<span class='notice'>You feel kind of silly, copying [ass == usr ? "your" : ass][ass == usr ? "" : "\'s"] ass with [ass == usr ? "your" : "[ass.p_their()]"] clothes on.</span>" )
-		return
+	if(ishuman(ass)) //(ass.get_item_by_slot(ITEM_SLOT_ICLOTHING) || ass.get_item_by_slot(ITEM_SLOT_OCLOTHING)))
+		var/mob/living/carbon/C = ass //have to typecast to this, is_groin_exposed is carbon level
+		if(is_groin_exposed.is_groin_exposed())
+			to_chat(usr, "<span class='notice'>You feel kind of silly, copying [ass == usr ? "your" : ass][ass == usr ? "" : "\'s"] ass with [ass == usr ? "your" : "[ass.p_their()]"] clothes on.</span>" )
+			return
 
 	var/icon/temp_img
 	if(isalienadult(ass) || istype(ass, /mob/living/simple_animal/hostile/alien)) //Xenos have their own asses, thanks to Pybro.