makes space bats holdable (yogstation13#14484)

* b * oop
TJatPBnJ · Jun 21, 2022 · 973d0ea · 973d0ea
1 parent 29e40d4
commit 973d0ea
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 10 deletions.
diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/bat.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/bat.dm
@@ -1,5 +1,5 @@
 /mob/living/simple_animal/hostile/retaliate/bat
-	name = "Space Bat"
+	name = "space bat"
 	desc = "A rare breed of bat which roosts in spaceships, probably not vampiric."
 	icon_state = "bat"
 	icon_living = "bat"
@@ -15,6 +15,7 @@
 	health = 15
 	spacewalk = TRUE
 	see_in_dark = 10
+	lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE
 	harm_intent_damage = 6
 	melee_damage_lower = 6
 	melee_damage_upper = 5
@@ -32,9 +33,7 @@
 	var/max_co2 = 0 //to be removed once metastation map no longer use those for Sgt Araneus
 	var/min_oxy = 0
 	var/max_tox = 0
-
-
-	//Space bats need no air to fly in.
-	atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+	atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0) //Space bats need no air to fly in.
 	minbodytemp = 0
+	can_be_held = TRUE
 
diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm
@@ -1,5 +1,5 @@
 /mob/living/simple_animal/hostile/retaliate/clown
-	name = "Clown"
+	name = "clown"
 	desc = "A denizen of clown planet."
 	icon = 'icons/mob/clown_mobs.dmi'
 	icon_state = "clown"
@@ -25,7 +25,7 @@
 	attack_sound = 'sound/items/bikehorn.ogg'
 	obj_damage = 0
 	environment_smash = ENVIRONMENT_SMASH_NONE
-	del_on_death = 1
+	del_on_death = TRUE
 	loot = list(/obj/effect/mob_spawn/human/clown/corpse)
 
 	atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0)

diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/retaliate.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/retaliate.dm
@@ -13,7 +13,7 @@
 		if(M.occupant)
 			return A
 	// yogs start
-	else if(istype(A, /obj/spacepod))
+	else if(isspacepod(A))
 		var/obj/spacepod/M = A
 		if(M.pilot || M.passengers.len)
 			return A

diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/spaceman.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/spaceman.dm
@@ -1,5 +1,5 @@
 /mob/living/simple_animal/hostile/retaliate/spaceman
-	name = "Spaceman"
+	name = "spaceman"
 	desc = "What in the actual hell..?"
 	icon_state = "old"
 	icon_living = "old"
@@ -22,7 +22,6 @@
 	attack_sound = 'sound/weapons/punch1.ogg'
 	obj_damage = 0
 	environment_smash = ENVIRONMENT_SMASH_NONE
-	del_on_death = 0
 
 	do_footstep = TRUE
 

diff --git a/icons/mob/animal.dmi b/icons/mob/animal.dmi
diff --git a/icons/mob/pets_held_lh.dmi b/icons/mob/pets_held_lh.dmi
diff --git a/icons/mob/pets_held_rh.dmi b/icons/mob/pets_held_rh.dmi