From 9779600e818a50ae6a9a0744842560459f8a857a Mon Sep 17 00:00:00 2001 From: phil235 Date: Mon, 27 Oct 2014 20:27:03 +0100 Subject: [PATCH] Error message due to being clothed during ass photocopy only appears once now. You can no longer photocopy the ass of alien larvas, they have no ass. Weapon/paper now has a layer of 3 and won't appear in front of mobs. --- code/modules/paperwork/paper.dm | 2 +- code/modules/paperwork/photocopier.dm | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index c044c1b9d53..d11418c2cf3 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -14,7 +14,7 @@ w_class = 1.0 throw_range = 1 throw_speed = 1 - layer = 4 + layer = 3 pressure_resistance = 1 slot_flags = SLOT_HEAD body_parts_covered = HEAD diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm index 0c1045050c8..c3482e4c7e0 100644 --- a/code/modules/paperwork/photocopier.dm +++ b/code/modules/paperwork/photocopier.dm @@ -123,8 +123,9 @@ var/icon/temp_img if(ishuman(ass) && (ass.get_item_by_slot(slot_w_uniform) || ass.get_item_by_slot(slot_wear_suit))) usr << "You feel kind of silly copying [ass == usr ? "your" : ass][ass == usr ? "" : "\'s"] ass with [ass == usr ? "your" : "their"] clothes on." + break else if(toner >= 5 && !busy && check_ass()) //You have to be sitting on the copier and either be a xeno or a human without clothes on. - if(isalien(ass) || istype(ass,/mob/living/simple_animal/hostile/alien)) //Xenos have their own asses, thanks to Pybro. + if(isalienadult(ass) || istype(ass,/mob/living/simple_animal/hostile/alien)) //Xenos have their own asses, thanks to Pybro. temp_img = icon("icons/ass/assalien.png") else if(ishuman(ass)) //Suit checks are in check_ass if(ass.gender == MALE)