Merge pull request #5498 from phil235/PhotocopierFix1

No more larva ass photocopy...
This commit is contained in:
MrPerson
2014-10-29 01:25:34 -07:00
2 changed files with 3 additions and 2 deletions
+1 -1
View File
@@ -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
+2 -1
View File
@@ -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 << "<span class='notice'>You feel kind of silly copying [ass == usr ? "your" : ass][ass == usr ? "" : "\'s"] ass with [ass == usr ? "your" : "their"] clothes on.</span>"
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)