diff --git a/code/game/machinery/door_control.dm b/code/game/machinery/door_control.dm
index 8916beb413e..6662b20b671 100644
--- a/code/game/machinery/door_control.dm
+++ b/code/game/machinery/door_control.dm
@@ -65,7 +65,7 @@
use_power(5)
icon_state = "doorctrl1"
desiredstate = !desiredstate
- trigger()
+ trigger(user)
spawn(15)
update_icon()
diff --git a/code/modules/mob/language/monkey.dm b/code/modules/mob/language/monkey.dm
index f40a276bbcd..ce276a358ab 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 cd3d8bf07de..53c1b336880 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -1093,18 +1093,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]
@@ -1124,6 +1127,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)
@@ -1384,3 +1392,10 @@
return 0
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 f7a644646da..f4172060f97 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 cc53182440e..4d7b5d17417 100644
--- a/code/modules/mob/living/carbon/human/species/species.dm
+++ b/code/modules/mob/living/carbon/human/species/species.dm
@@ -108,6 +108,7 @@
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/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
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 6f75f8406a6..74293d11768 100644
--- a/code/modules/mob/living/carbon/human/species/station/monkey.dm
+++ b/code/modules/mob/living/carbon/human/species/station/monkey.dm
@@ -63,14 +63,14 @@
tail = "farwatail"
/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
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 abf187db1ea..032cf51db94 100644
--- a/code/modules/mob/living/carbon/human/species/station/station.dm
+++ b/code/modules/mob/living/carbon/human/species/station/station.dm
@@ -126,7 +126,7 @@
icobase = 'icons/mob/human_races/r_skrell.dmi'
deform = 'icons/mob/human_races/r_def_skrell.dmi'
eyes = "skrell_eyes_s"
- 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 69d98f11d63..12af8c4a7f6 100644
--- a/code/modules/reagents/reagent_containers/food/snacks.dm
+++ b/code/modules/reagents/reagent_containers/food/snacks.dm
@@ -1616,11 +1616,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 1ac40803aae..fd43b098702 100644
Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ
diff --git a/icons/mob/head.dmi.orig b/icons/mob/head.dmi.orig
new file mode 100644
index 00000000000..1ac40803aae
Binary files /dev/null and b/icons/mob/head.dmi.orig 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 90d89ad52fd..339a3b70058 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 d5b1cfd6cdc..d94ddd88806 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 e33858e7af2..1858d289253 100644
Binary files a/icons/obj/objects.dmi and b/icons/obj/objects.dmi differ