From 065d9b110c1b07de7436a3f63e01efa351c8d270 Mon Sep 17 00:00:00 2001 From: Segrain Date: Tue, 9 Dec 2014 14:52:43 +0300 Subject: [PATCH 1/3] Fix for #6476. --- code/modules/recycling/disposal.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index 48c16a2977..002ef71687 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -742,6 +742,7 @@ icon_state = "[base_icon_state]f" else icon_state = base_icon_state*/ + icon_state = base_icon_state return From 4ae3d3029f4a0055a4502864e75d46bc5a097574 Mon Sep 17 00:00:00 2001 From: Segrain Date: Tue, 9 Dec 2014 14:54:20 +0300 Subject: [PATCH 2/3] Fix for #6643. --- code/modules/recycling/disposal.dm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index 002ef71687..04fa4f6b7a 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -49,8 +49,6 @@ if(stat & BROKEN || !I || !user) return - if(isrobot(user) && !istype(I, /obj/item/weapon/storage/bag/trash)) - return src.add_fingerprint(user) if(mode<=0) // It's off if(istype(I, /obj/item/weapon/screwdriver)) @@ -123,7 +121,10 @@ msg_admin_attack("[usr] ([usr.ckey]) placed [GM] ([GM.ckey]) in a disposals unit. (JMP)") return - if(!I) return + if(isrobot(user)) + return + if(!I) + return user.drop_item() if(I) From 4fb83010e1c3dbaa2e3b7f60b62c9d3e4954286e Mon Sep 17 00:00:00 2001 From: Segrain Date: Tue, 9 Dec 2014 14:55:25 +0300 Subject: [PATCH 3/3] Fix for #7322. --- code/game/objects/items.dm | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 5ef7686e42..d73e2a5fc7 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -331,9 +331,7 @@ if(slot_l_ear) if(H.l_ear) return 0 - if( w_class < 2 ) - return 1 - if( !(slot_flags & SLOT_EARS) ) + if( (w_class > 1) && !(slot_flags & SLOT_EARS) ) return 0 if( (slot_flags & SLOT_TWOEARS) && H.r_ear ) return 0 @@ -341,9 +339,7 @@ if(slot_r_ear) if(H.r_ear) return 0 - if( w_class < 2 ) - return 1 - if( !(slot_flags & SLOT_EARS) ) + if( (w_class > 1) && !(slot_flags & SLOT_EARS) ) return 0 if( (slot_flags & SLOT_TWOEARS) && H.l_ear ) return 0