diff --git a/code/modules/mob/holder.dm b/code/modules/mob/holder.dm
index 6347a091f4..1c43075978 100644
--- a/code/modules/mob/holder.dm
+++ b/code/modules/mob/holder.dm
@@ -54,7 +54,6 @@
return
//Mob specific holders.
-
/obj/item/weapon/holder/diona
name = "diona nymph"
desc = "It's a tiny plant critter."
@@ -98,4 +97,4 @@
/obj/item/weapon/holder/monkey/neaera
name = "neaera"
desc = "It's a neaera."
- icon_state = "neara"
+ icon_state = "neaera"
diff --git a/code/modules/mob/language/monkey.dm b/code/modules/mob/language/monkey.dm
index f40a276bbc..ce276a358a 100644
--- a/code/modules/mob/language/monkey.dm
+++ b/code/modules/mob/language/monkey.dm
@@ -7,7 +7,7 @@
key = "6"
/datum/language/skrell/monkey
- name = "Neara"
+ name = "Neaera"
desc = "Squik squik squik."
key = "8"
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 70646bd981..cbc8faabd7 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -1103,18 +1103,21 @@
else
dna.species = new_species
+ // No more invisible screaming wheelchairs because of set_species() typos.
+ if(!all_species[new_species])
+ new_species = "Human"
+
if(species)
if(species.name && species.name == new_species)
return
if(species.language)
remove_language(species.language)
-
if(species.default_language)
remove_language(species.default_language)
-
// Clear out their species abilities.
species.remove_inherent_verbs(src)
+ holder_type = null
species = all_species[new_species]
@@ -1134,6 +1137,11 @@
g_skin = 0
b_skin = 0
+ if(species.holder_type)
+ holder_type = species.holder_type
+
+ icon_state = lowertext(species.name)
+
species.create_organs(src)
species.handle_post_spawn(src)
@@ -1373,3 +1381,10 @@
if(istype(shoes, /obj/item/clothing/shoes/magboots) && (shoes.flags & NOSLIP)) //magboots + dense_object = no floating
return 1
return 0
+
+/mob/living/carbon/human/MouseDrop(var/atom/over_object)
+ var/mob/living/carbon/human/H = over_object
+ if(holder_type && a_intent == "help" && H.a_intent == "help" && istype(H) && !issmall(H) && Adjacent(H))
+ get_scooped(H)
+ return
+ return ..()
diff --git a/code/modules/mob/living/carbon/human/human_species.dm b/code/modules/mob/living/carbon/human/human_species.dm
index f7a644646d..f4172060f9 100644
--- a/code/modules/mob/living/carbon/human/human_species.dm
+++ b/code/modules/mob/living/carbon/human/human_species.dm
@@ -31,8 +31,8 @@
/mob/living/carbon/human/farwa/New(var/new_loc)
..(new_loc, "Farwa")
-/mob/living/carbon/human/neara/New(var/new_loc)
- ..(new_loc, "Neara")
+/mob/living/carbon/human/neaera/New(var/new_loc)
+ ..(new_loc, "Neaera")
/mob/living/carbon/human/stok/New(var/new_loc)
..(new_loc, "Stok")
diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm
index b1d523dd8d..9f171054b9 100644
--- a/code/modules/mob/living/carbon/human/species/species.dm
+++ b/code/modules/mob/living/carbon/human/species/species.dm
@@ -104,7 +104,8 @@
var/slowdown = 0 // Passive movement speed malus (or boost, if negative)
var/primitive_form // Lesser form, if any (ie. monkey for humans)
var/greater_form // Greater form, if any, ie. human for monkeys.
- var/gluttonous // Can eat some mobs. 1 for monkeys, 2 for people.
+ var/holder_type
+ var/gluttonous // Can eat some mobs. 1 for mice, 2 for monkeys, 3 for people.
var/rarity_value = 1 // Relative rarity/collector value for this species.
// Determines the organs that the species spawns with and
var/list/has_organ = list( // which required-organ checks are conducted.
diff --git a/code/modules/mob/living/carbon/human/species/station/monkey.dm b/code/modules/mob/living/carbon/human/species/station/monkey.dm
index 6ae24db2f6..d06b6b1d15 100644
--- a/code/modules/mob/living/carbon/human/species/station/monkey.dm
+++ b/code/modules/mob/living/carbon/human/species/station/monkey.dm
@@ -26,6 +26,7 @@
inherent_verbs = list(/mob/living/proc/ventcrawl)
hud_type = /datum/hud_data/monkey
meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/monkey
+ holder_type = /obj/item/weapon/holder/monkey
rarity_value = 0.1
total_health = 75
@@ -61,20 +62,22 @@
flesh_color = "#AFA59E"
base_color = "#333333"
tail = "farwatail"
+ holder_type = /obj/item/weapon/holder/monkey/farwa
/datum/species/monkey/skrell
- name = "Neara"
- name_plural = "Neara"
+ name = "Neaera"
+ name_plural = "Neaera"
- icobase = 'icons/mob/human_races/monkeys/r_neara.dmi'
- deform = 'icons/mob/human_races/monkeys/r_neara.dmi'
+ icobase = 'icons/mob/human_races/monkeys/r_neaera.dmi'
+ deform = 'icons/mob/human_races/monkeys/r_neaera.dmi'
greater_form = "Skrell"
- default_language = "Neara"
+ default_language = "Neaera"
flesh_color = "#8CD7A3"
blood_color = "#1D2CBF"
reagent_tag = IS_SKRELL
tail = null
+ holder_type = /obj/item/weapon/holder/monkey/neaera
/datum/species/monkey/unathi
name = "Stok"
@@ -89,3 +92,4 @@
flesh_color = "#34AF10"
base_color = "#066000"
reagent_tag = IS_UNATHI
+ holder_type = /obj/item/weapon/holder/monkey/stok
diff --git a/code/modules/mob/living/carbon/human/species/station/station.dm b/code/modules/mob/living/carbon/human/species/station/station.dm
index a6b39ba38b..010cfae341 100644
--- a/code/modules/mob/living/carbon/human/species/station/station.dm
+++ b/code/modules/mob/living/carbon/human/species/station/station.dm
@@ -117,7 +117,7 @@
deform = 'icons/mob/human_races/r_def_skrell.dmi'
eyes = "skrell_eyes_s"
language = "Skrellian"
- primitive_form = "Neara"
+ primitive_form = "Neaera"
unarmed_types = list(/datum/unarmed_attack/punch)
blurb = "An amphibious species, Skrell come from the star system known as Qerr'Vallis, which translates to 'Star of \
the royals' or 'Light of the Crown'.
Skrell are a highly advanced and logical race who live under the rule \
diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm
index 2446c60b69..4518776964 100644
--- a/code/modules/reagents/reagent_containers/food/snacks.dm
+++ b/code/modules/reagents/reagent_containers/food/snacks.dm
@@ -1617,11 +1617,11 @@
/obj/item/weapon/reagent_containers/food/snacks/monkeycube/neaeracube
name = "neaera cube"
- monkey_type = "Neara"
+ monkey_type = "Neaera"
/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/neaeracube
name = "neaera cube"
- monkey_type = "Neara"
+ monkey_type = "Neaera"
/obj/item/weapon/reagent_containers/food/snacks/spellburger
diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi
index defba34b0d..0ac465586b 100644
Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ
diff --git a/icons/mob/human_races/monkeys/r_neara.dmi b/icons/mob/human_races/monkeys/r_neaera.dmi
similarity index 100%
rename from icons/mob/human_races/monkeys/r_neara.dmi
rename to icons/mob/human_races/monkeys/r_neaera.dmi
diff --git a/icons/mob/items/lefthand.dmi b/icons/mob/items/lefthand.dmi
index 018309c709..cf4b9815e9 100644
Binary files a/icons/mob/items/lefthand.dmi and b/icons/mob/items/lefthand.dmi differ
diff --git a/icons/mob/items/righthand.dmi b/icons/mob/items/righthand.dmi
index f385093315..94747701a5 100644
Binary files a/icons/mob/items/righthand.dmi and b/icons/mob/items/righthand.dmi differ
diff --git a/icons/obj/objects.dmi b/icons/obj/objects.dmi
index 42c972fe06..9fca4e27b0 100644
Binary files a/icons/obj/objects.dmi and b/icons/obj/objects.dmi differ