diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index 88eda4c774..2272cff0cc 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -72,12 +72,11 @@ sleep(50) close() return - var/mob/M = AM // we've returned by here if M is not a mob if (!( ticker )) return if (src.operating) return - if (src.density && !issmall(M) && src.allowed(AM)) + if (src.density && src.allowed(AM)) open() if(src.check_access(null)) sleep(50) diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index 0dc5b34b60..227ba52e0c 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -593,7 +593,7 @@ //Departments that the cycler can paint suits to look like. var/list/departments = list("Engineering","Mining","Medical","Security","Atmos") //Species that the suits can be configured to fit. - var/list/species = list("Human","Skrell","Unathi","Tajara") + var/list/species = list("Human","Skrell","Unathi","Tajara", "Teshari") var/target_department var/target_species @@ -622,35 +622,30 @@ model_text = "Engineering" req_access = list(access_construction) departments = list("Engineering","Atmos") - species = list("Human","Tajara","Skrell","Unathi") //Add Unathi when sprites exist for their suits. /obj/machinery/suit_cycler/mining name = "Mining suit cycler" model_text = "Mining" req_access = list(access_mining) departments = list("Mining") - species = list("Human","Tajara","Skrell","Unathi") /obj/machinery/suit_cycler/security name = "Security suit cycler" model_text = "Security" req_access = list(access_security) departments = list("Security") - species = list("Human","Tajara","Skrell","Unathi") /obj/machinery/suit_cycler/medical name = "Medical suit cycler" model_text = "Medical" req_access = list(access_medical) departments = list("Medical") - species = list("Human","Tajara","Skrell","Unathi") /obj/machinery/suit_cycler/syndicate name = "Nonstandard suit cycler" model_text = "Nonstandard" req_access = list(access_syndicate) departments = list("Mercenary") - species = list("Human","Tajara","Skrell","Unathi", "Teshari") can_repair = 1 /obj/machinery/suit_cycler/attack_ai(mob/user as mob) diff --git a/code/modules/mob/holder.dm b/code/modules/mob/holder.dm index 15c3dc321e..a0f655d2a6 100644 --- a/code/modules/mob/holder.dm +++ b/code/modules/mob/holder.dm @@ -98,8 +98,9 @@ var/list/holder_mob_icon_cache = list() /mob/living/MouseDrop(var/atom/over_object) var/mob/living/carbon/human/H = over_object - if(holder_type && istype(H) && !H.lying && !issmall(H) && Adjacent(H) && (src.a_intent == I_HELP && H.a_intent == I_HELP)) - get_scooped(H, (usr == src)) + if(holder_type && istype(H) && !H.lying && Adjacent(H) && (src.a_intent == I_HELP && H.a_intent == I_HELP)) + if(!issmall(H) || !istype(src, /mob/living/carbon/human)) + get_scooped(H, (usr == src)) return return ..() diff --git a/icons/mob/human_races/masks/dam_seromi.dmi b/icons/mob/human_races/masks/dam_seromi.dmi index 70f16adf2a..c1bcc8baf1 100644 Binary files a/icons/mob/human_races/masks/dam_seromi.dmi and b/icons/mob/human_races/masks/dam_seromi.dmi differ diff --git a/icons/mob/human_races/r_seromi.dmi b/icons/mob/human_races/r_seromi.dmi index ac06ea2fd2..ba8a7e2925 100644 Binary files a/icons/mob/human_races/r_seromi.dmi and b/icons/mob/human_races/r_seromi.dmi differ