diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index a02c66511ee..a8f78cd7512 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -174,6 +174,9 @@ GLOBAL_LIST_EMPTY(roundstart_races) ///Bitflag that controls what in game ways something can select this species as a spawnable source, such as magic mirrors. See [mob defines][code/__DEFINES/mobs.dm] for possible sources. var/changesource_flags = NONE + ///For custom overrides for species ass images + var/icon/ass_image + /////////// // PROCS // /////////// diff --git a/code/modules/mob/living/carbon/human/species_types/abductors.dm b/code/modules/mob/living/carbon/human/species_types/abductors.dm index 6bbf5c041cd..d86bf74515d 100644 --- a/code/modules/mob/living/carbon/human/species_types/abductors.dm +++ b/code/modules/mob/living/carbon/human/species_types/abductors.dm @@ -7,6 +7,7 @@ inherent_traits = list(TRAIT_VIRUSIMMUNE,TRAIT_CHUNKYFINGERS,TRAIT_NOHUNGER,TRAIT_NOBREATH) mutanttongue = /obj/item/organ/tongue/abductor changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN | SLIME_EXTRACT + ass_image = 'icons/ass/assgrey.png' /datum/species/abductor/on_species_gain(mob/living/carbon/C, datum/species/old_species) . = ..() diff --git a/code/modules/mob/living/carbon/human/species_types/felinid.dm b/code/modules/mob/living/carbon/human/species_types/felinid.dm index 7086823bda4..274758e9f5f 100644 --- a/code/modules/mob/living/carbon/human/species_types/felinid.dm +++ b/code/modules/mob/living/carbon/human/species_types/felinid.dm @@ -14,6 +14,7 @@ species_language_holder = /datum/language_holder/felinid var/original_felinid = TRUE //set to false for felinids created by mass-purrbation payday_modifier = 0.75 + ass_image = 'icons/ass/asscat.png' //SKYRAT EDIT REMOVAL BEGIN - CUSTOMIZATION (moved to modular) diff --git a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm index 57f226fe104..cef78557624 100644 --- a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm @@ -19,6 +19,7 @@ changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN | SLIME_EXTRACT inherent_factions = list("slime") species_language_holder = /datum/language_holder/jelly + ass_image = 'icons/ass/assslime.png' /datum/species/jelly/on_species_loss(mob/living/carbon/C) if(regenerate_limbs) diff --git a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm index 44f1530aa9f..9d3c47e2bd7 100644 --- a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm @@ -30,6 +30,8 @@ bodytemp_heat_damage_limit = (BODYTEMP_HEAT_DAMAGE_LIMIT + 20) // This puts lizards 10 above lavaland max heat for ash lizards. bodytemp_cold_damage_limit = (BODYTEMP_COLD_DAMAGE_LIMIT - 10) + ass_image = 'icons/ass/asslizard.png' + /// Lizards are cold blooded and do not stabilize body temperature naturally /datum/species/lizard/natural_bodytemperature_stabilization(datum/gas_mixture/environment, mob/living/carbon/human/H) return diff --git a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm index 67fa9c481ef..74ac041063d 100644 --- a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm +++ b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm @@ -34,6 +34,8 @@ // This effects how fast body temp stabilizes, also if cold resit is lost on the mob bodytemp_cold_damage_limit = (BODYTEMP_COLD_DAMAGE_LIMIT - 50) // about -50c + ass_image = 'icons/ass/assplasma.png' + /datum/species/plasmaman/on_species_gain(mob/living/carbon/C, datum/species/old_species, pref_load) . = ..() C.set_safe_hunger_level() @@ -86,7 +88,7 @@ if("Bartender", "Lawyer") O = new /datum/outfit/plasmaman/bar - + if("Psychologist") O = new /datum/outfit/plasmaman/psychologist diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm index 2c55c3e35f8..66934a34747 100644 --- a/code/modules/paperwork/photocopier.dm +++ b/code/modules/paperwork/photocopier.dm @@ -288,10 +288,17 @@ return var/icon/temp_img - if(isalienadult(ass) || istype(ass, /mob/living/simple_animal/hostile/alien)) //Xenos have their own asses, thanks to Pybro. + if(ishuman(ass)) + var/mob/living/carbon/human/H = ass + var/datum/species/spec = H.dna.species + if(spec.ass_image) + temp_img = spec.ass_image + else + temp_img = icon(ass.gender == FEMALE ? 'icons/ass/assfemale.png' : 'icons/ass/assmale.png') + else 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 - temp_img = icon(ass.gender == FEMALE ? 'icons/ass/assfemale.png' : 'icons/ass/assmale.png') + else if(issilicon(ass)) + temp_img = icon('icons/ass/assmachine.png') else if(isdrone(ass)) //Drones are hot temp_img = icon('icons/ass/assdrone.png') diff --git a/icons/ass/asscat.png b/icons/ass/asscat.png new file mode 100644 index 00000000000..47a9b8fefc3 Binary files /dev/null and b/icons/ass/asscat.png differ diff --git a/icons/ass/assgrey.png b/icons/ass/assgrey.png new file mode 100644 index 00000000000..63ebd9c2463 Binary files /dev/null and b/icons/ass/assgrey.png differ diff --git a/icons/ass/asslizard.png b/icons/ass/asslizard.png new file mode 100644 index 00000000000..726cee56781 Binary files /dev/null and b/icons/ass/asslizard.png differ diff --git a/icons/ass/assmachine.png b/icons/ass/assmachine.png new file mode 100644 index 00000000000..2ba447306c4 Binary files /dev/null and b/icons/ass/assmachine.png differ diff --git a/icons/ass/assplasma.png b/icons/ass/assplasma.png new file mode 100644 index 00000000000..0777e152383 Binary files /dev/null and b/icons/ass/assplasma.png differ diff --git a/icons/ass/assslime.png b/icons/ass/assslime.png new file mode 100644 index 00000000000..06721cd19bc Binary files /dev/null and b/icons/ass/assslime.png differ