Conflict Resolution

Also fixes a compiling error with previous PR

code/modules/client/preference_setup/loadout/loadout_accessories.dm

@@ -243,9 +243,6 @@
 
 /datum/gear/accessory/locket
 	display_name = "locket"
-<<<<<<< HEAD
-	path = /obj/item/clothing/accessory/locket
-=======
 	path = /obj/item/clothing/accessory/locket
 
 /datum/gear/accessory/halfcape
@@ -280,4 +277,3 @@
 /datum/gear/accessory/cowledvest
 	display_name = "cowled vest"
 	path = /obj/item/clothing/accessory/cowledvest
->>>>>>> 3e9624c... Adds the Zaddat Race + Modifies pressure damage calculations (#5869)

code/modules/mob/living/carbon/human/species/station/station_vr.dm

@@ -330,6 +330,11 @@
 	reagent_tag = null
 	assisted_langs = list(LANGUAGE_EAL, LANGUAGE_ROOTLOCAL, LANGUAGE_ROOTGLOBAL, LANGUAGE_VOX)
 
+/datum/species/zaddat
+	spawn_flags = SPECIES_CAN_JOIN
+	min_age = 18
+	gluttonous = 0
+
 /datum/species/diona
 	spawn_flags = SPECIES_CAN_JOIN | SPECIES_IS_WHITELISTED
 	min_age = 18

code/modules/reagents/reagent_containers/hypospray.dm

@@ -241,8 +241,6 @@
 	name = "bone repair injector"
 	desc = "A refined version of the standard autoinjector, allowing greater capacity. This one excels at treating damage to bones."
 	filled_reagents = list("inaprovaline" = 5, "osteodaxon" = 10)
-<<<<<<< HEAD
-=======
 
 /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/glucose
 	name = "glucose hypo"
@@ -354,4 +352,3 @@
 	if(.) // Will occur if successfully injected.
 		infect_mob_random_lesser(H)
 		add_attack_logs(user, H, "Infected \the [H] with \the [src], by \the [user].")
->>>>>>> 3e9624c... Adds the Zaddat Race + Modifies pressure damage calculations (#5869)

code/modules/vore/fluffstuff/custom_items_vr.dm

@@ -623,7 +623,7 @@
 /obj/item/weapon/storage/backpack/saddlebag/tempest/ui_action_click()
 	ambulance = !(ambulance)
 	if(ambulance)
-		processing_objects.Add(src)
+		START_PROCESSING(SSobj, src)
 		item_state = "tempestsaddlebag-amb"
 		icon_state = "tempestbag-amb"
 		if (ismob(loc))
@@ -644,7 +644,7 @@
 
 /obj/item/weapon/storage/backpack/saddlebag/tempest/process()
 	if(!ambulance)
-		processing_objects.Remove(src)
+		STOP_PROCESSING(SSobj, src)
 		return
 	if(world.time - ambulance_last_switch > 15)
 		ambulance_state = !(ambulance_state)