From f04edd4700f76a99cb452eaae58a56e735281066 Mon Sep 17 00:00:00 2001 From: Neerti Date: Sun, 10 Jul 2016 01:01:05 -0400 Subject: [PATCH] Cleans up washing machines a bit Pun not intended. Now you can decontaminate armor vests and such. --- code/game/machinery/washing_machine.dm | 53 ++++---------------------- 1 file changed, 8 insertions(+), 45 deletions(-) diff --git a/code/game/machinery/washing_machine.dm b/code/game/machinery/washing_machine.dm index ad8976e121..93d161f2ea 100644 --- a/code/game/machinery/washing_machine.dm +++ b/code/game/machinery/washing_machine.dm @@ -20,6 +20,10 @@ var/gibs_ready = 0 var/obj/crayon var/list/washing = list() + var/list/disallowed_types = list( + /obj/item/clothing/suit/space, + /obj/item/clothing/head/helmet/space + ) /obj/machinery/washing_machine/New() circuit = new circuit(src) @@ -107,53 +111,12 @@ state = 3 else ..() - else if(istype(W,/obj/item/stack/material/hairlesshide) || \ - istype(W,/obj/item/clothing/under) || \ - istype(W,/obj/item/clothing/mask) || \ - istype(W,/obj/item/clothing/head) || \ - istype(W,/obj/item/clothing/gloves) || \ - istype(W,/obj/item/clothing/shoes) || \ - istype(W,/obj/item/clothing/suit) || \ - istype(W,/obj/item/weapon/bedsheet)) - //YES, it's hardcoded... saves a var/can_be_washed for every single clothing item. - if ( istype(W,/obj/item/clothing/suit/space ) ) - user << "This item does not fit." - return - if ( istype(W,/obj/item/clothing/suit/syndicatefake ) ) - user << "This item does not fit." - return -// if ( istype(W,/obj/item/clothing/suit/powered ) ) -// user << "This item does not fit." -// return - if ( istype(W,/obj/item/clothing/suit/cyborg_suit ) ) - user << "This item does not fit." - return - if ( istype(W,/obj/item/clothing/suit/bomb_suit ) ) - user << "This item does not fit." - return - if ( istype(W,/obj/item/clothing/suit/armor ) ) - user << "This item does not fit." - return - if ( istype(W,/obj/item/clothing/suit/armor ) ) - user << "This item does not fit." - return - if ( istype(W,/obj/item/clothing/mask/gas ) ) - user << "This item does not fit." - return - if ( istype(W,/obj/item/clothing/mask/smokable/cigarette ) ) - user << "This item does not fit." - return - if ( istype(W,/obj/item/clothing/head/syndicatefake ) ) - user << "This item does not fit." - return -// if ( istype(W,/obj/item/clothing/head/powered ) ) -// user << "This item does not fit." -// return - if ( istype(W,/obj/item/clothing/head/helmet ) ) - user << "This item does not fit." - return + else if(is_type_in_list(W, disallowed_types)) + user << "You can't fit \the [W] inside." + return + else if(istype(W, /obj/item/clothing)) if(washing.len < 5) if ( state in list(1, 3) ) user.drop_item()