Revert "Merge pull request #16520 from SabreML/fix-bundle-4"

This reverts commit 9a62622fbc, reversing
changes made to 841ad0f1fd.

code/modules/awaymissions/mission_code/ruins/oldstation.dm

@@ -43,7 +43,7 @@
 /obj/item/card/id/away/old/apc
 	name = "APC Access ID"
 	desc = "A special ID card that allows access to APC terminals."
-	icon_state = "guest_invalid"
+	icon_state = "centcom_old"
 	access = list(ACCESS_ENGINE_EQUIP)
 
 /obj/item/storage/backpack/old

code/modules/events/blob.dm

@@ -27,7 +27,6 @@
 	var/mob/living/simple_animal/mouse/blobinfected/B = new(vent.loc)
 	var/mob/M = pick(candidates)
 	B.key = M.key
-	B.mind.special_role = SPECIAL_ROLE_BLOB
 	SSticker.mode.update_blob_icons_added(B.mind)
 
 	to_chat(B, "<span class='userdanger'>You are now a mouse, infected with blob spores. Find somewhere isolated... before you burst and become the blob! Use ventcrawl (alt-click on vents) to move around.</span>")

code/modules/events/rogue_drones.dm

@@ -22,7 +22,7 @@
 	else if(prob(50))
 		msg = "Contact has been lost with a combat drone wing operating out of the NSV Icarus. If any are sighted in the area, approach with caution."
 	else
-		msg = "Unidentified hackers have targeted a combat drone wing deployed from the NSV Icarus. If any are sighted in the area, approach with caution."
+		msg = "Unidentified hackers have targetted a combat drone wing deployed from the NSV Icarus. If any are sighted in the area, approach with caution."
 	GLOB.event_announcement.Announce(msg, "Rogue drone alert")
 
 /datum/event/rogue_drone/tick()

code/modules/food_and_drinks/food/foods/candy.dm

@@ -132,7 +132,6 @@
 	filling_color = "#7D5F46"
 	bitesize = 3
 	junkiness = 25
-	antable = FALSE
 	list_reagents = list("nutriment" = 1, "chocolate" = 1)
 	tastes = list("chocolate" = 1)
 

code/modules/food_and_drinks/food/foods/ethnic.dm

@@ -58,7 +58,6 @@
 	desc = "What is in this anyways?"
 	icon_state = "chinese1"
 	junkiness = 25
-	antable = FALSE
 	list_reagents = list("nutriment" = 1, "beans" = 3, "msg" = 4, "sugar" = 2)
 	tastes = list("noodle" = 1, "vegetables" = 1)
 

code/modules/food_and_drinks/food/foods/junkfood.dm

@@ -11,7 +11,6 @@
 	trash = /obj/item/trash/chips
 	filling_color = "#E8C31E"
 	junkiness = 20
-	antable = FALSE
 	list_reagents = list("nutriment" = 1, "sodiumchloride" = 1, "sugar" = 3)
 	tastes = list("crisps" = 1)
 
@@ -22,7 +21,6 @@
 	trash = /obj/item/trash/sosjerky
 	filling_color = "#631212"
 	junkiness = 25
-	antable = FALSE
 	list_reagents = list("protein" = 1, "sugar" = 3)
 	tastes = list("chewy beef" = 1)
 
@@ -33,7 +31,6 @@
 	trash = /obj/item/trash/pistachios
 	filling_color = "#BAD145"
 	junkiness = 20
-	antable = FALSE
 	list_reagents = list("plantmatter" = 2, "sodiumchloride" = 1, "sugar" = 4)
 	tastes = list("pistachios" = 1)
 
@@ -44,7 +41,6 @@
 	trash = /obj/item/trash/raisins
 	filling_color = "#343834"
 	junkiness = 25
-	antable = FALSE
 	list_reagents = list("plantmatter" = 2, "sugar" = 4)
 	tastes = list("dried raisins" = 1)
 
@@ -65,7 +61,6 @@
 	trash = /obj/item/trash/cheesie
 	filling_color = "#FFA305"
 	junkiness = 25
-	antable = FALSE
 	list_reagents = list("nutriment" = 1, "fake_cheese" = 2, "sugar" = 3)
 	tastes = list("cheese" = 1, "crisps" = 2)
 
@@ -76,7 +71,6 @@
 	filling_color = "#FF5D05"
 	trash = /obj/item/trash/syndi_cakes
 	bitesize = 3
-	antable = FALSE
 	list_reagents = list("nutriment" = 4, "salglu_solution" = 5)
 	tastes = list("sweetness" = 3, "cake" = 1)
 
@@ -87,7 +81,6 @@
 	trash = /obj/item/trash/tastybread
 	filling_color = "#A66829"
 	junkiness = 20
-	antable = FALSE
 	list_reagents = list("nutriment" = 2, "sugar" = 4)
 	tastes = list("bread" = 1)
 

code/modules/food_and_drinks/kitchen_machinery/gibber.dm

@@ -24,23 +24,6 @@
 	idle_power_usage = 2
 	active_power_usage = 500
 
-/obj/machinery/gibber/Initialize(mapload)
-	. = ..()
-	overlays += image('icons/obj/kitchen.dmi', "grjam")
-	component_parts = list()
-	component_parts += new /obj/item/circuitboard/gibber(null)
-	component_parts += new /obj/item/stock_parts/matter_bin(null)
-	component_parts += new /obj/item/stock_parts/manipulator(null)
-	RefreshParts()
-
-/obj/machinery/gibber/Destroy()
-	if(contents.len)
-		for(var/atom/movable/A in contents)
-			A.loc = get_turf(src)
-	if(occupant)
-		occupant = null
-	return ..()
-
 /obj/machinery/gibber/suicide_act(mob/user)
 	if(occupant || locked)
 		return FALSE
@@ -53,6 +36,21 @@
 	addtimer(CALLBACK(src, .proc/startgibbing, user), 33)
 	return OBLITERATION
 
+/obj/machinery/gibber/Destroy()
+	if(contents.len)
+		for(var/atom/movable/A in contents)
+			A.loc = get_turf(src)
+	if(occupant)
+		occupant = null
+	return ..()
+
+/obj/machinery/gibber/RefreshParts() //If you want to make the machine upgradable, this is where you would change any vars basd on its stock parts.
+	return
+
+/obj/machinery/gibber/New()
+	..()
+	overlays += image('icons/obj/kitchen.dmi', "grjam")
+
 /obj/machinery/gibber/update_icon()
 	overlays.Cut()
 

code/modules/mob/dead/observer/orbit.dm

@@ -31,6 +31,10 @@
 			update_static_data(owner, ui)
 			. = TRUE
 
+/datum/orbit_menu/ui_data(mob/user)
+	var/list/data = list()
+	return data
+
 /datum/orbit_menu/ui_static_data(mob/user)
 	var/list/data = list()
 
@@ -92,7 +96,6 @@
 					)
 					if(SSticker && SSticker.mode)
 						other_antags += list(
-							"Blob" = (mind.special_role == SPECIAL_ROLE_BLOB),
 							"Cultist" = (mind in SSticker.mode.cult),
 							"Wizard" = (mind in SSticker.mode.wizards),
 							"Wizard's Apprentice" = (mind in SSticker.mode.apprentices),
@@ -118,10 +121,6 @@
 					var/list/antag_serialized = serialized.Copy()
 					antag_serialized["antag"] = "Terror Spider"
 					antagonists += list(antag_serialized)
-				else if(istype(M, /mob/living/simple_animal/revenant))
-					var/list/antag_serialized = serialized.Copy()
-					antag_serialized["antag"] = "Revenant"
-					antagonists += list(antag_serialized)
 		else
 			misc += list(serialized)
 

code/modules/mob/living/carbon/carbon.dm

@@ -272,8 +272,6 @@
   * * target - The mob who is currently on fire
   */
 /mob/living/carbon/proc/pat_out(mob/living/target)
-	if(target == src)
-		return // Probably shouldn't be able to pat yourself out.
 	var/self_message = "<span class='warning'>You try to extinguish [target]!</span>"
 	if(prob(30) && ishuman(src)) // 30% chance of burning your hands
 		var/mob/living/carbon/human/H = src

code/modules/mob/living/carbon/human/emote.dm

@@ -170,13 +170,9 @@
 
 		if("growl", "growls")
 			var/M = handle_emote_param(param)
-			if(miming)
-				message = "<B>[src]</B> acts out a growl[M ? " at [M]" : ""]!"
-				m_type = 1
-			else
-				message = "<B>[src]</B> growls[M ? " at [M]" : ""]!"
-				playsound(loc, "growls", 80, 1, frequency = get_age_pitch())
-				m_type = 2
+			message = "<B>[src]</B> growls[M ? " at [M]" : ""]."
+			playsound(loc, "growls", 80, 1, frequency = get_age_pitch())
+			m_type = 2
 
 		if("ping", "pings")
 			var/M = handle_emote_param(param)

code/modules/mob/mob_helpers.dm

@@ -13,7 +13,6 @@
 	return 0
 
 /mob/proc/get_screen_colour()
-	return
 
 /mob/proc/update_client_colour(time = 10) //Update the mob's client.color with an animation the specified time in length.
 	if(!client) //No client_colour without client. If the player logs back in they'll be back through here anyway.

code/modules/recycling/sortingmachinery.dm

@@ -97,10 +97,12 @@
 		A.emp_act(severity)
 
 /obj/item/smallDelivery/attack_self(mob/user as mob)
-	if(wrapped?.loc == src) //sometimes items can disappear. For example, bombs. --rastaf0
-		wrapped.forceMove(get_turf(src))
+	if(wrapped && wrapped.loc) //sometimes items can disappear. For example, bombs. --rastaf0
+		wrapped.loc = user.loc
 		if(ishuman(user))
 			user.put_in_hands(wrapped)
+		else
+			wrapped.loc = get_turf(src)
 	playsound(src.loc, 'sound/items/poster_ripped.ogg', 50, 1)
 	qdel(src)
 
@@ -161,8 +163,6 @@
 
 	if(is_type_in_list(target, no_wrap))
 		return
-	if(is_type_in_list(A.loc, list(/obj/item/smallDelivery, /obj/structure/bigDelivery)))
-		return
 	if(target.anchored)
 		return
 	if(target in user)