From 51842ce8faf4a7d7e1374e51f670af70ec189df2 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Sat, 13 Feb 2016 10:32:18 +1030 Subject: [PATCH] Corrects several Teshari code and icon issues. Makes Teshari suits available in the cycler. --- code/game/machinery/doors/windowdoor.dm | 3 +-- code/game/machinery/suit_storage_unit.dm | 7 +------ code/modules/mob/holder.dm | 5 +++-- icons/mob/human_races/masks/dam_seromi.dmi | Bin 3868 -> 2464 bytes icons/mob/human_races/r_seromi.dmi | Bin 2498 -> 2250 bytes 5 files changed, 5 insertions(+), 10 deletions(-) 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 70f16adf2a18e9e200a5047c283b6d4c583fbecd..c1bcc8baf1c265ab2376186d8c63ccb31cf46bac 100644 GIT binary patch delta 2431 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 literal 2498 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 M07*qoM6N<$f`1a*9RL6T