From 7b2060d91a3ac2c2c07613ca650164a4607963d0 Mon Sep 17 00:00:00 2001 From: ZomgPonies Date: Tue, 17 Nov 2015 10:46:04 -0500 Subject: [PATCH 1/3] Re-added photocopying asses to refactored photocopiers --- code/modules/paperwork/photocopier.dm | 89 ++++++++++++++++++++++++++- 1 file changed, 88 insertions(+), 1 deletion(-) diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm index 78aa9174d5f..95546429e64 100644 --- a/code/modules/paperwork/photocopier.dm +++ b/code/modules/paperwork/photocopier.dm @@ -13,6 +13,7 @@ var/copies = 1 //how many copies to print! var/toner = 30 //how much toner is left! woooooo~ var/maxcopies = 10 //how many copies can be copied at once- idea shamelessly stolen from bs12's copier! + var/mob/living/carbon/ass = null /obj/machinery/photocopier/attack_ai(mob/user as mob) return attack_hand(user) @@ -21,7 +22,7 @@ user.set_machine(src) var/dat = "Photocopier

" - if(copyitem) + if(copyitem || (ass && (ass.loc == src.loc))) dat += "Remove Item
" if(toner) dat += "Copy
" @@ -57,6 +58,9 @@ else if (istype(copyitem, /obj/item/weapon/paper_bundle)) var/obj/item/weapon/paper_bundle/B = bundlecopy(copyitem) sleep(15*B.amount) + else if (ass && ass.loc == src.loc) + copyass() + sleep(15) else usr << "\The [copyitem] can't be copied by \the [src]." break @@ -70,6 +74,9 @@ usr << "You take \the [copyitem] out of \the [src]." copyitem = null updateUsrDialog() + else if(check_ass()) + ass << "You feel a slight pressure on your ass." + updateUsrDialog() else if(href_list["min"]) if(copies > 1) copies-- @@ -127,6 +134,17 @@ playsound(loc, 'sound/items/Ratchet.ogg', 50, 1) anchored = !anchored user << "You [anchored ? "wrench" : "unwrench"] \the [src]." + else if(istype(O, /obj/item/weapon/grab)) //For ass-copying. + var/obj/item/weapon/grab/G = O + if(ismob(G.affecting) && G.affecting != ass) + var/mob/GM = G.affecting + visible_message("[usr] drags [GM.name] onto the photocopier!") + GM.loc = get_turf(src) + ass = GM + if(copyitem) + copyitem.loc = src.loc + copyitem = null + updateUsrDialog() return /obj/machinery/photocopier/ex_act(severity) @@ -203,6 +221,40 @@ visible_message("A red light on \the [src] flashes, indicating that it is out of toner.") return p + +/obj/machinery/photocopier/proc/copyass() + 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." + return + if(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. + temp_img = icon("icons/ass/assalien.png") + else if(ishuman(ass)) //Suit checks are in check_ass + if(ass.gender == MALE) + temp_img = icon("icons/ass/assmale.png") + else if(ass.gender == FEMALE) + temp_img = icon("icons/ass/assfemale.png") + else //In case anyone ever makes the generic ass. For now I'll be using male asses. + temp_img = icon("icons/ass/assmale.png") + else + return + var/obj/item/weapon/photo/p = new /obj/item/weapon/photo (loc) + p.desc = "You see [ass]'s ass on the photo." + p.pixel_x = rand(-10, 10) + p.pixel_y = rand(-10, 10) + p.img = temp_img + var/icon/small_img = icon(temp_img) //Icon() is needed or else temp_img will be rescaled too >.> + var/icon/ic = icon('icons/obj/items.dmi',"photo") + small_img.Scale(8, 8) + ic.Blend(small_img,ICON_OVERLAY, 10, 13) + p.icon = ic + toner -= 5 + if(toner < 0) + toner = 0 + visible_message("A red light on \the [src] flashes, indicating that it is out of toner.") + return p + //If need_toner is 0, the copies will still be lightened when low on toner, however it will not be prevented from printing. TODO: Implement print queues for fax machines and get rid of need_toner /obj/machinery/photocopier/proc/bundlecopy(var/obj/item/weapon/paper_bundle/bundle, var/need_toner=1) var/obj/item/weapon/paper_bundle/p = new /obj/item/weapon/paper_bundle (src) @@ -227,6 +279,41 @@ p.pixel_x = rand(-9, 9) return p + +/obj/machinery/photocopier/MouseDrop_T(mob/target, mob/user) + check_ass() //Just to make sure that you can re-drag somebody onto it after they moved off. + if (!istype(target) || target.buckled || get_dist(user, src) > 1 || get_dist(user, target) > 1 || user.stat || istype(user, /mob/living/silicon/ai) || target == ass) + return + src.add_fingerprint(user) + if(target == user && !user.stat && !user.weakened && !user.stunned && !user.paralysis) + visible_message("[usr] jumps onto the photocopier!") + else if(target != user && !user.restrained() && !user.stat && !user.weakened && !user.stunned && !user.paralysis) + if(target.anchored) return + if(!ishuman(user)) return + visible_message("[usr] drags [target.name] onto the photocopier!") + target.loc = get_turf(src) + ass = target + if(copyitem) + copyitem.loc = src.loc + visible_message("[copyitem] is shoved out of the way by [ass]!") + copyitem = null + updateUsrDialog() + +/obj/machinery/photocopier/proc/check_ass() //I'm not sure wether I made this proc because it's good form or because of the name. + if(!ass) + return 0 + if(ass.loc != src.loc) + ass = null + updateUsrDialog() + return 0 + else if(istype(ass,/mob/living/carbon/human)) + if(!ass.get_item_by_slot(slot_w_uniform) && !ass.get_item_by_slot(slot_wear_suit)) + return 1 + else + return 0 + else + return 1 + /obj/item/device/toner name = "toner cartridge" icon_state = "tonercartridge" From 3756d5457e35dbfd00ac1066c3d04ac0f3e03142 Mon Sep 17 00:00:00 2001 From: ZomgPonies Date: Wed, 18 Nov 2015 10:16:26 -0500 Subject: [PATCH 2/3] Adds species-specific butts and fixes a few bugs --- .../mob/living/carbon/human/species/shadow.dm | 4 +-- .../living/carbon/human/species/species.dm | 2 +- .../living/carbon/human/species/station.dm | 19 ++++++++------- code/modules/paperwork/photocopier.dm | 23 +++++++++--------- icons/ass/assalien.png | Bin 2846 -> 0 bytes icons/ass/assfemale.png | Bin 1884 -> 0 bytes icons/ass/assmale.png | Bin 1966 -> 0 bytes icons/obj/butts.dmi | Bin 0 -> 26480 bytes 8 files changed, 25 insertions(+), 23 deletions(-) delete mode 100644 icons/ass/assalien.png delete mode 100644 icons/ass/assfemale.png delete mode 100644 icons/ass/assmale.png create mode 100644 icons/obj/butts.dmi diff --git a/code/modules/mob/living/carbon/human/species/shadow.dm b/code/modules/mob/living/carbon/human/species/shadow.dm index 3e888c026f8..e2541c7bcb0 100644 --- a/code/modules/mob/living/carbon/human/species/shadow.dm +++ b/code/modules/mob/living/carbon/human/species/shadow.dm @@ -1,7 +1,7 @@ /datum/species/shadow name = "Shadow" name_plural = "Shadows" - + icobase = 'icons/mob/human_races/r_shadow.dmi' deform = 'icons/mob/human_races/r_shadow.dmi' @@ -12,7 +12,7 @@ blood_color = "#CCCCCC" flesh_color = "#AAAAAA" - + butt = "plasma" has_organ = list( "brain" = /obj/item/organ/brain ) diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm index c65756fce62..dc1bae56c30 100644 --- a/code/modules/mob/living/carbon/human/species/species.dm +++ b/code/modules/mob/living/carbon/human/species/species.dm @@ -78,7 +78,7 @@ //Used in icon caching. var/race_key = 0 var/icon/icon_template - + var/butt = "human"//Determines which image to use for copier var/is_small var/show_ssd = 1 var/virus_immune diff --git a/code/modules/mob/living/carbon/human/species/station.dm b/code/modules/mob/living/carbon/human/species/station.dm index 26ef94d472a..55ddc09b787 100644 --- a/code/modules/mob/living/carbon/human/species/station.dm +++ b/code/modules/mob/living/carbon/human/species/station.dm @@ -53,7 +53,7 @@ heat_level_3_breathe = 1100 //Default 1000 flesh_color = "#34AF10" - + butt = "unathi" reagent_tag = PROCESS_ORG base_color = "#066000" @@ -98,7 +98,7 @@ clothing_flags = HAS_UNDERWEAR | HAS_UNDERSHIRT | HAS_SOCKS bodyflags = FEET_PADDED | HAS_TAIL | HAS_SKIN_COLOR | TAIL_WAGGING dietflags = DIET_OMNI - + butt = "tajaran" reagent_tag = PROCESS_ORG flesh_color = "#AFA59E" base_color = "#333333" @@ -134,7 +134,7 @@ clothing_flags = HAS_UNDERWEAR | HAS_UNDERSHIRT | HAS_SOCKS bodyflags = FEET_PADDED | HAS_TAIL | HAS_SKIN_COLOR | TAIL_WAGGING dietflags = DIET_OMNI - + butt = "vulp" reagent_tag = PROCESS_ORG flesh_color = "#966464" base_color = "#BE8264" @@ -163,7 +163,7 @@ clothing_flags = HAS_UNDERWEAR | HAS_UNDERSHIRT | HAS_SOCKS bodyflags = HAS_SKIN_COLOR dietflags = DIET_HERB - + butt = "skrell" flesh_color = "#8CD7A3" blood_color = "#1D2CBF" reagent_tag = PROCESS_ORG @@ -179,7 +179,7 @@ language = "Vox-pidgin" speech_sounds = list('sound/voice/shriek1.ogg') speech_chance = 20 - + butt = "vox" unarmed_type = /datum/unarmed_attack/claws //I dont think it will hurt to give vox claws too. blurb = "The Vox are the broken remnants of a once-proud race, now reduced to little more than \ @@ -309,7 +309,7 @@ clothing_flags = HAS_SOCKS bodyflags = FEET_CLAWS dietflags = DIET_HERB - + butt = "kidan" blood_color = "#FB9800" reagent_tag = PROCESS_ORG @@ -328,7 +328,7 @@ bodyflags = HAS_SKIN_COLOR bloodflags = BLOOD_SLIME dietflags = DIET_CARN - + butt = "slime" reagent_tag = PROCESS_ORG //ventcrawler = 1 //ventcrawling commented out @@ -355,7 +355,7 @@ flags = IS_WHITELISTED | HAS_LIPS | CAN_BE_FAT clothing_flags = HAS_UNDERWEAR | HAS_UNDERSHIRT | HAS_SOCKS dietflags = DIET_HERB - + butt = "grey" reagent_tag = PROCESS_ORG blood_color = "#A200FF" @@ -408,7 +408,7 @@ dietflags = 0 //Diona regenerate nutrition in light, no diet necessary body_temperature = T0C + 15 //make the plant people have a bit lower body temperature, why not - + butt = "diona" blood_color = "#004400" flesh_color = "#907E4A" @@ -503,6 +503,7 @@ clothing_flags = HAS_SOCKS bodyflags = HAS_SKIN_COLOR dietflags = 0 //IPCs can't eat, so no diet + butt = "machine" blood_color = "#1F181F" flesh_color = "#AAAAAA" virus_immune = 1 diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm index 95546429e64..5f4792fdbd5 100644 --- a/code/modules/paperwork/photocopier.dm +++ b/code/modules/paperwork/photocopier.dm @@ -13,7 +13,7 @@ var/copies = 1 //how many copies to print! var/toner = 30 //how much toner is left! woooooo~ var/maxcopies = 10 //how many copies can be copied at once- idea shamelessly stolen from bs12's copier! - var/mob/living/carbon/ass = null + var/mob/living/ass = null /obj/machinery/photocopier/attack_ai(mob/user as mob) return attack_hand(user) @@ -228,15 +228,16 @@ usr << "You feel kind of silly copying [ass == usr ? "your" : ass][ass == usr ? "" : "\'s"] ass with [ass == usr ? "your" : "their"] clothes on." return if(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. - temp_img = icon("icons/ass/assalien.png") - else if(ishuman(ass)) //Suit checks are in check_ass - if(ass.gender == MALE) - temp_img = icon("icons/ass/assmale.png") - else if(ass.gender == FEMALE) - temp_img = icon("icons/ass/assfemale.png") - else //In case anyone ever makes the generic ass. For now I'll be using male asses. - temp_img = icon("icons/ass/assmale.png") + if(ishuman(ass)) //Suit checks are in check_ass + var/mob/living/carbon/human/H = ass + temp_img = icon('icons/obj/butts.dmi', "[H.species.butt]") + else if(istype(ass,/mob/living/silicon/robot/drone)) + temp_img = icon('icons/obj/butts.dmi', "drone") + else if(istype(ass,/mob/living/simple_animal/diona)) + temp_img = icon('icons/obj/butts.dmi', "nymph") + else if(isalien(ass) || istype(ass,/mob/living/simple_animal/hostile/alien)) //Xenos have their own asses, thanks to Pybro. + temp_img = icon('icons/obj/butts.dmi', "xeno") + else return else return var/obj/item/weapon/photo/p = new /obj/item/weapon/photo (loc) @@ -285,7 +286,7 @@ if (!istype(target) || target.buckled || get_dist(user, src) > 1 || get_dist(user, target) > 1 || user.stat || istype(user, /mob/living/silicon/ai) || target == ass) return src.add_fingerprint(user) - if(target == user && !user.stat && !user.weakened && !user.stunned && !user.paralysis) + if(target == user && !user.incapacitated()) visible_message("[usr] jumps onto the photocopier!") else if(target != user && !user.restrained() && !user.stat && !user.weakened && !user.stunned && !user.paralysis) if(target.anchored) return diff --git a/icons/ass/assalien.png b/icons/ass/assalien.png deleted file mode 100644 index d7586f3b5ffd7cc0e16546df86e0ccbac9f1a0c6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2846 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 diff --git a/icons/ass/assmale.png b/icons/ass/assmale.png deleted file mode 100644 index c6091cf19154d816f7bd6da55b59b5dcc98eb84c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1966 zcmV;f2T}NmP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02*{fSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+qRNAp5A000LaNkl@rqPd~lZU-x&;z`OpKGiUZ%&-1J`YtNo2 zXU?1@OO|ZZsL{A_Cz>LppB0oKSmQq=oT+tyf}UO^s!^d5`p0D+qa+M_P@A&`SRt} zt5-K~-rTTZ!?0n)8aHlSwrtq~1qwvPiWO_ttl5MK6OJE0PARzO&!0myK_dwqMvFIY z+?X(Yy51C8Lvj~@yZWGTj+ zIdkNy_)(iSZRomu`7)(&rOCi4Isz#(lJT*lM~{viInpCO$`a(WpFe*hK&EK+=KA&P z>(;FsGGs{Y+O;D;J9qBXIYg-g4VOO~8Hdp4;nm<-IpsR<6;IAnlBqF1k8<)GX$U_cQB4wTFy5Ibta zv`@5W&mLi7LRZ*2!GVKG1x?s|CL!7IkpUoZ2tpo&+XJzo3_=bZIH3NKw!M4zZrEPW zg4rn07F82Ls8ZMl`(d3A5tv{FSw<@%X`b8;A3i*O{P;*q`QrglVO;qIz09HjauiCU zp{dl$I-^OsahPyM%#8s|OiU!*iy3*p1W+0>Kp@6n@tDlRhSSc?$O5#d;gOM9BwR7V zQD(HYbLY;DY#LEA-~>*X;82{vVdAe65hcuv8n#4c44+3v?}~#+^Ej!9cIqHlym)cs zjPxfQI|9Hl6QF^{96e|RB3XFvBqYR~h05q0=uS+cxt%+AZsp3Ak-qjvJY4}7s9+X2 zOoDvcz3_Cw0&SGKN8vA1dKt(Afyspn7rY8F0<>}jgdlJb7;;aF4Cp=>yLRmg8AHd) zOad7nTAj5<9FQGCk>kaZfWRRS6W&RQ`)efP{Q2_^-9?KQnX3k96H3Dzde{IdI#JYT z-@bj$?T9EIWP%RG0SBFYqtcPDH{`4BoRK~zf@y>pPasiExG{?ix_#wLO{`6Q+Xf66(7btb=biK=Bv9Q5576d3y;!QUWy_X@3m5W_HgDc+ zi4)LJ97eJcG~tdy?<6;0y*hR36fa&}Z;)kCASR%o)tPYha6;_fy<3Bh9z8mC*x6`) z_CzTVgo4;c@({TJ zHfx}M2VCsQ$lCSlPC8r z?9-=@j&df8)w@n*dqey3<;#78`}XbIph1K3<;zDsdh~E3TD^L;loe4~Fi{jrX?@V3 zLEtiF%7h?fU`&@TUFp)Lp=d;)zVbMzS+#1FVh$ZTw0-;bt`jyaa)IgJzyH*!Q~Al4 zaFvBFhPN+p-MV%2<;#~VS1ueWQltn31q&8*U2|!0p;B(!?pn2C#R>(tx4nAxa+i>_ zOIJjQFQ+eqlh20RJ^ib`E@*bCX3d(g2(bYa+tX3d&K#l(pdQMPE&f(qyrDpUZ3AY`Cc_^Ma0uF8~Ft5&T_ zl`5@Ux8{$`x{y41@?_1LHMVW8kL1`5c@W~l0al@h0kRbq-B}*2$#?V>Xv}vDp!ToFcjz+&WfY-88T#$WwK<+VgxeCoH=vg@XVH&Fs_vHq)$ diff --git a/icons/obj/butts.dmi b/icons/obj/butts.dmi new file mode 100644 index 0000000000000000000000000000000000000000..cddd1ca66591444578f4e5276e61e23086af3eb2 GIT binary patch literal 26480 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 Date: Wed, 18 Nov 2015 11:55:30 -0500 Subject: [PATCH 3/3] Cleaned up species code, remove naked requirement --- .../mob/living/carbon/human/species/shadow.dm | 1 - .../living/carbon/human/species/species.dm | 1 - .../living/carbon/human/species/station.dm | 10 ------ code/modules/paperwork/photocopier.dm | 36 ++++++++++++++----- 4 files changed, 27 insertions(+), 21 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species/shadow.dm b/code/modules/mob/living/carbon/human/species/shadow.dm index e2541c7bcb0..3727bd8de0a 100644 --- a/code/modules/mob/living/carbon/human/species/shadow.dm +++ b/code/modules/mob/living/carbon/human/species/shadow.dm @@ -12,7 +12,6 @@ blood_color = "#CCCCCC" flesh_color = "#AAAAAA" - butt = "plasma" has_organ = list( "brain" = /obj/item/organ/brain ) diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm index dc1bae56c30..c4c2711b1c3 100644 --- a/code/modules/mob/living/carbon/human/species/species.dm +++ b/code/modules/mob/living/carbon/human/species/species.dm @@ -78,7 +78,6 @@ //Used in icon caching. var/race_key = 0 var/icon/icon_template - var/butt = "human"//Determines which image to use for copier var/is_small var/show_ssd = 1 var/virus_immune diff --git a/code/modules/mob/living/carbon/human/species/station.dm b/code/modules/mob/living/carbon/human/species/station.dm index 55ddc09b787..bebe8381671 100644 --- a/code/modules/mob/living/carbon/human/species/station.dm +++ b/code/modules/mob/living/carbon/human/species/station.dm @@ -53,7 +53,6 @@ heat_level_3_breathe = 1100 //Default 1000 flesh_color = "#34AF10" - butt = "unathi" reagent_tag = PROCESS_ORG base_color = "#066000" @@ -98,7 +97,6 @@ clothing_flags = HAS_UNDERWEAR | HAS_UNDERSHIRT | HAS_SOCKS bodyflags = FEET_PADDED | HAS_TAIL | HAS_SKIN_COLOR | TAIL_WAGGING dietflags = DIET_OMNI - butt = "tajaran" reagent_tag = PROCESS_ORG flesh_color = "#AFA59E" base_color = "#333333" @@ -134,7 +132,6 @@ clothing_flags = HAS_UNDERWEAR | HAS_UNDERSHIRT | HAS_SOCKS bodyflags = FEET_PADDED | HAS_TAIL | HAS_SKIN_COLOR | TAIL_WAGGING dietflags = DIET_OMNI - butt = "vulp" reagent_tag = PROCESS_ORG flesh_color = "#966464" base_color = "#BE8264" @@ -163,7 +160,6 @@ clothing_flags = HAS_UNDERWEAR | HAS_UNDERSHIRT | HAS_SOCKS bodyflags = HAS_SKIN_COLOR dietflags = DIET_HERB - butt = "skrell" flesh_color = "#8CD7A3" blood_color = "#1D2CBF" reagent_tag = PROCESS_ORG @@ -179,7 +175,6 @@ language = "Vox-pidgin" speech_sounds = list('sound/voice/shriek1.ogg') speech_chance = 20 - butt = "vox" unarmed_type = /datum/unarmed_attack/claws //I dont think it will hurt to give vox claws too. blurb = "The Vox are the broken remnants of a once-proud race, now reduced to little more than \ @@ -309,7 +304,6 @@ clothing_flags = HAS_SOCKS bodyflags = FEET_CLAWS dietflags = DIET_HERB - butt = "kidan" blood_color = "#FB9800" reagent_tag = PROCESS_ORG @@ -328,7 +322,6 @@ bodyflags = HAS_SKIN_COLOR bloodflags = BLOOD_SLIME dietflags = DIET_CARN - butt = "slime" reagent_tag = PROCESS_ORG //ventcrawler = 1 //ventcrawling commented out @@ -355,7 +348,6 @@ flags = IS_WHITELISTED | HAS_LIPS | CAN_BE_FAT clothing_flags = HAS_UNDERWEAR | HAS_UNDERSHIRT | HAS_SOCKS dietflags = DIET_HERB - butt = "grey" reagent_tag = PROCESS_ORG blood_color = "#A200FF" @@ -408,7 +400,6 @@ dietflags = 0 //Diona regenerate nutrition in light, no diet necessary body_temperature = T0C + 15 //make the plant people have a bit lower body temperature, why not - butt = "diona" blood_color = "#004400" flesh_color = "#907E4A" @@ -503,7 +494,6 @@ clothing_flags = HAS_SOCKS bodyflags = HAS_SKIN_COLOR dietflags = 0 //IPCs can't eat, so no diet - butt = "machine" blood_color = "#1F181F" flesh_color = "#AAAAAA" virus_immune = 1 diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm index 5f4792fdbd5..39c5442c7e7 100644 --- a/code/modules/paperwork/photocopier.dm +++ b/code/modules/paperwork/photocopier.dm @@ -224,13 +224,36 @@ /obj/machinery/photocopier/proc/copyass() 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." - return if(check_ass()) //You have to be sitting on the copier and either be a xeno or a human without clothes on. if(ishuman(ass)) //Suit checks are in check_ass var/mob/living/carbon/human/H = ass - temp_img = icon('icons/obj/butts.dmi', "[H.species.butt]") + switch(H.get_species()) + if("Human") + temp_img = icon('icons/obj/butts.dmi', "human") + if("Tajaran") + temp_img = icon('icons/obj/butts.dmi', "tajaran") + if("Unathi") + temp_img = icon('icons/obj/butts.dmi', "unathi") + if("Skrell") + temp_img = icon('icons/obj/butts.dmi', "skrell") + if("Vox") + temp_img = icon('icons/obj/butts.dmi', "vox") + if("Kidan") + temp_img = icon('icons/obj/butts.dmi', "kidan") + if("Grey") + temp_img = icon('icons/obj/butts.dmi', "grey") + if("Diona") + temp_img = icon('icons/obj/butts.dmi', "diona") + if("Slime People") + temp_img = icon('icons/obj/butts.dmi', "slime") + if("Vulpkanin") + temp_img = icon('icons/obj/butts.dmi', "vulp") + if("Machine") + temp_img = icon('icons/obj/butts.dmi', "machine") + if("Plasmaman") + temp_img = icon('icons/obj/butts.dmi', "plasma") + else + temp_img = icon('icons/obj/butts.dmi', "human") else if(istype(ass,/mob/living/silicon/robot/drone)) temp_img = icon('icons/obj/butts.dmi', "drone") else if(istype(ass,/mob/living/simple_animal/diona)) @@ -307,11 +330,6 @@ ass = null updateUsrDialog() return 0 - else if(istype(ass,/mob/living/carbon/human)) - if(!ass.get_item_by_slot(slot_w_uniform) && !ass.get_item_by_slot(slot_wear_suit)) - return 1 - else - return 0 else return 1