[MIRROR] A bunch of small fixes (#6820)

Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>

code/datums/supplypacks/hospitality.dm

@@ -58,7 +58,7 @@
 /datum/supply_pack/hospitality/pizza
 	name = "Surprise pack of five pizzas"
 	contains = list(
-			/obj/random/pizzabox = 5,
+			/obj/random/pizzabox/supplypack = 5,
 			/obj/item/weapon/material/knife/plastic
 			)
 	cost = 15

code/datums/supplypacks/hospitality_vr.dm

@@ -1,7 +1,7 @@
 /datum/supply_pack/randomised/hospitality/pizza
 	cost = 50
 	contains = list(
-			/obj/random/pizzabox = 5,
+			/obj/random/pizzabox/supplypack = 5,
 			/obj/item/weapon/material/knife/plastic,
 			/obj/item/clothing/under/pizzaguy,
 			/obj/item/clothing/head/pizzaguy

code/game/objects/random/misc.dm

@@ -549,6 +549,9 @@
 				/obj/item/pizzabox/vegetable,
 				/obj/item/pizzabox/pineapple)
 
+/obj/random/pizzabox/supplypack
+	drop_get_turf = FALSE
+
 /obj/random/material //Random materials for building stuff
 	name = "random material"
 	desc = "This is a random material."

code/game/objects/structures/ghost_pods/ghost_pods_vr.dm

@@ -48,6 +48,7 @@
 	if(notify)
 		trigger()
 
-/obj/structure/ghost_pod/ghost_activated/Initialize()
+/obj/structure/ghost_pod/ghost_activated/Initialize(var/mapload)
 	. = ..()
-	ghostpod_startup(spawn_active)
+	if(!mapload)
+		ghostpod_startup(spawn_active)

code/modules/mob/living/simple_mob/on_click.dm

@@ -38,7 +38,7 @@
 		if(I_GRAB)
 			if(has_hands)
 				A.attack_hand(src)
-			else if(isliving(A) && src.client)
+			else if(isliving(A) && src.client && !vore_attack_override)
 				animal_nom(A)
 			else
 				attack_target(A)

code/modules/mob/living/simple_mob/simple_mob_vr.dm

@@ -48,6 +48,8 @@
 	//CHOMPEDIT end.
 	var/life_disabled = 0				// For performance reasons
 
+	var/vore_attack_override = FALSE	// Enable on mobs you want to have special behaviour on melee grab attack.
+
 	var/mount_offset_x = 5				// Horizontal riding offset.
 	var/mount_offset_y = 8				// Vertical riding offset
 

code/modules/mob/living/simple_mob/subtypes/slime/slime.dm

@@ -148,6 +148,7 @@ var/list/_slime_default_emotes = list(
 		var/hat_state = hat.item_state ? hat.item_state : hat.icon_state
 		var/image/I = image('icons/inventory/head/mob.dmi', src, hat_state)
 		I.pixel_y = -7 // Slimes are small.
+		I.color = hat.color
 		I.appearance_flags = RESET_COLOR | KEEP_APART
 		I.blend_mode = BLEND_OVERLAY
 		add_overlay(I)

code/modules/mob/living/simple_mob/subtypes/slime/xenobio/combat.dm

@@ -74,3 +74,10 @@
 
 		// Feed off of their flesh, if able.
 		consume(L, 5)
+
+
+/mob/living/simple_mob/slime/xenobio/AltClickOn(atom/movable/A)
+	if(isliving(A) && Adjacent(A))
+		animal_nom(A)
+	else
+		..()

code/modules/mob/living/simple_mob/subtypes/slime/xenobio/xenobio_vr.dm

@@ -1,6 +1,7 @@
 /mob/living/simple_mob/slime/xenobio
 	temperature_range = 5
 	mob_bump_flag = SLIME
+	vore_attack_override = TRUE
 
 /mob/living/simple_mob/slime/xenobio/Initialize(mapload, var/mob/living/simple_mob/slime/xenobio/my_predecessor)
 	. = ..()

code/modules/projectiles/guns/projectile/automatic.dm

@@ -501,7 +501,7 @@
 	else if(istype(ammo_magazine,/obj/item/ammo_magazine/m45tommydrum))
 		icon_state = "tommygun-drum"
 	else
-		icon_state = "tommygun-e"
+		icon_state = "tommygun-empty"
 	update_held_icon()
 
 /*

vorestation.dme

@@ -3414,7 +3414,6 @@
 #include "code\modules\mob\living\simple_mob\subtypes\slime\xenobio\defense.dm"
 #include "code\modules\mob\living\simple_mob\subtypes\slime\xenobio\discipline.dm"
 #include "code\modules\mob\living\simple_mob\subtypes\slime\xenobio\subtypes.dm"
-#include "code\modules\mob\living\simple_mob\subtypes\slime\xenobio\subtypes_vr.dm"
 #include "code\modules\mob\living\simple_mob\subtypes\slime\xenobio\xenobio.dm"
 #include "code\modules\mob\living\simple_mob\subtypes\slime\xenobio\xenobio_vr.dm"
 #include "code\modules\mob\living\simple_mob\subtypes\vore\bee.dm"