From 6406f04a25078cb8e7837ba4fc097fb68c228737 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Sun, 28 Oct 2018 14:03:38 -0700
Subject: [PATCH 1/3] Update vampire.dm

---
 .../living/carbon/human/species_types/vampire.dm  | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/code/modules/mob/living/carbon/human/species_types/vampire.dm b/code/modules/mob/living/carbon/human/species_types/vampire.dm
index 6f7f227a80..8c6bb76a7f 100644
--- a/code/modules/mob/living/carbon/human/species_types/vampire.dm
+++ b/code/modules/mob/living/carbon/human/species_types/vampire.dm
@@ -128,3 +128,18 @@
 	charge_max = 50
 	cooldown_min = 50
 	shapeshift_type = /mob/living/simple_animal/hostile/retaliate/bat
+	var/ventcrawl_nude_only = TRUE
+
+/obj/effect/proc_holder/spell/targeted/shapeshift/bat/Shapeshift()			//cit change
+	var/obj/shapeshift_holder/H = locate() in caster
+	if(H)
+		to_chat(caster, "<span class='warning'>You're already shapeshifted!</span>")
+		return
+
+	var/mob/living/shape = new shapeshift_type(caster.loc)
+	H = new(shape,src,caster)
+	if(ventcrawl_nude_only && length(get_equipped_items(include_pockets = TRUE)))
+		H.ventcrawler = FALSE
+
+	clothes_req = 0
+	human_req = 0

From 77263f3ee28d1cd0cef9267c09bf08f112508ee5 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Sun, 28 Oct 2018 14:05:45 -0700
Subject: [PATCH 2/3] Update vampire.dm

---
 code/modules/mob/living/carbon/human/species_types/vampire.dm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/code/modules/mob/living/carbon/human/species_types/vampire.dm b/code/modules/mob/living/carbon/human/species_types/vampire.dm
index 8c6bb76a7f..bf6dc90423 100644
--- a/code/modules/mob/living/carbon/human/species_types/vampire.dm
+++ b/code/modules/mob/living/carbon/human/species_types/vampire.dm
@@ -129,6 +129,7 @@
 	cooldown_min = 50
 	shapeshift_type = /mob/living/simple_animal/hostile/retaliate/bat
 	var/ventcrawl_nude_only = TRUE
+	var/transfer_name = TRUE
 
 /obj/effect/proc_holder/spell/targeted/shapeshift/bat/Shapeshift()			//cit change
 	var/obj/shapeshift_holder/H = locate() in caster
@@ -140,6 +141,8 @@
 	H = new(shape,src,caster)
 	if(ventcrawl_nude_only && length(get_equipped_items(include_pockets = TRUE)))
 		H.ventcrawler = FALSE
+	if(transfer_name)
+		H.name = caster.name
 
 	clothes_req = 0
 	human_req = 0

From 63173c343c536163a87e472b1d3e886faae8fb94 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Sun, 28 Oct 2018 17:16:51 -0700
Subject: [PATCH 3/3] Update vampire.dm

---
 .../mob/living/carbon/human/species_types/vampire.dm      | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/code/modules/mob/living/carbon/human/species_types/vampire.dm b/code/modules/mob/living/carbon/human/species_types/vampire.dm
index bf6dc90423..4bc3d622ac 100644
--- a/code/modules/mob/living/carbon/human/species_types/vampire.dm
+++ b/code/modules/mob/living/carbon/human/species_types/vampire.dm
@@ -131,7 +131,7 @@
 	var/ventcrawl_nude_only = TRUE
 	var/transfer_name = TRUE
 
-/obj/effect/proc_holder/spell/targeted/shapeshift/bat/Shapeshift()			//cit change
+/obj/effect/proc_holder/spell/targeted/shapeshift/bat/Shapeshift(mob/living/caster)			//cit change
 	var/obj/shapeshift_holder/H = locate() in caster
 	if(H)
 		to_chat(caster, "<span class='warning'>You're already shapeshifted!</span>")
@@ -139,8 +139,10 @@
 
 	var/mob/living/shape = new shapeshift_type(caster.loc)
 	H = new(shape,src,caster)
-	if(ventcrawl_nude_only && length(get_equipped_items(include_pockets = TRUE)))
-		H.ventcrawler = FALSE
+	if(istype(H, /mob/living/simple_animal))
+		var/mob/living/simple_animal/SA = H
+		if(ventcrawl_nude_only && length(caster.get_equipped_items(include_pockets = TRUE)))
+			SA.ventcrawler = FALSE
 	if(transfer_name)
 		H.name = caster.name