diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 16b414c7035..8b43eca71f7 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -1479,7 +1479,8 @@ It can still be worn/put on as normal. target.internals.icon_state = "internal1" //update overlays // source.update_icons() - target.update_icons() + if(target) + target.update_icons() spawn(0) // <-- not sure why this spawn is here if(source) diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index eeca0b1a167..348a79faa1b 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -217,7 +217,7 @@ Please contact me on #coderbus IRC. ~Carn x lying_icon.Blend(new/icon('human_face.dmi', "mouth_[g]_l"), ICON_OVERLAY) //Underwear - if(underwear < 6 && underwear > 0) + if(underwear < 12 && underwear > 0) if(!fat) stand_icon.Blend(new /icon('human.dmi', "underwear[underwear]_[g]_s"), ICON_OVERLAY) lying_icon.Blend(new /icon('human.dmi', "underwear[underwear]_[g]_l"), ICON_OVERLAY) diff --git a/code/modules/mob/new_player/preferences.dm b/code/modules/mob/new_player/preferences.dm index 83f8f15ebaa..7192a1cbf7e 100644 --- a/code/modules/mob/new_player/preferences.dm +++ b/code/modules/mob/new_player/preferences.dm @@ -65,8 +65,8 @@ datum/preferences //Just like it sounds var/ooccolor = "#b82e00" var/underwear = 1 - var/list/underwear_m = list("White", "Grey", "Green", "Blue", "Black", "None") //Curse whoever made male/female underwear diffrent colours - var/list/underwear_f = list("Red", "White", "Yellow", "Blue", "Black", "None") + var/list/underwear_m = list("White", "Grey", "Green", "Blue", "Black", "Mankini", "Love-Hearts", "Black2", "Grey2", "Stripey", "Kinky", "None") //Curse whoever made male/female underwear diffrent colours + var/list/underwear_f = list("Red", "White", "Yellow", "Blue", "Black", "Thong", "Babydoll", "Baby-Blue", "Green", "Pink", "Kinky", "None") var/backbag = 2 var/list/backbaglist = list("Nothing", "Backpack", "Satchel") @@ -639,10 +639,7 @@ datum/preferences if(tempUnderwear) underwear = underwear_f.Find(tempUnderwear) if("random") - if(prob (75)) - underwear = pick(1,2,3,4,5) - else - underwear = 6 + underwear = rand(1,12) if(link_tags["backbag_type"]) switch(link_tags["backbag_type"]) @@ -746,7 +743,7 @@ datum/preferences character.hair_style = hair_style character.facial_hair_style = facial_hair_style - if(underwear > 6 || underwear < 1) + if(underwear > 12 || underwear < 1) underwear = 1 //I'm sure this is 100% unnecessary, but I'm paranoid... sue me. character.underwear = underwear diff --git a/code/modules/mob/new_player/preferences_setup.dm b/code/modules/mob/new_player/preferences_setup.dm index 1e365bd5019..c5d78e3f8d6 100644 --- a/code/modules/mob/new_player/preferences_setup.dm +++ b/code/modules/mob/new_player/preferences_setup.dm @@ -216,7 +216,7 @@ datum/preferences else preview_icon.Blend(rgb(-s_tone, -s_tone, -s_tone), ICON_SUBTRACT) - if (underwear < 6) + if (underwear < 12) preview_icon.Blend(new /icon('human.dmi', "underwear[underwear]_[g]_s"), ICON_OVERLAY) var/icon/eyes_s = new/icon("icon" = 'human_face.dmi', "icon_state" = "eyes_s") diff --git a/code/modules/mob/new_player/savefile.dm b/code/modules/mob/new_player/savefile.dm index c1c5a9f113f..be101f197db 100644 --- a/code/modules/mob/new_player/savefile.dm +++ b/code/modules/mob/new_player/savefile.dm @@ -109,7 +109,7 @@ datum/preferences/proc/savefile_load(mob/user) F["eyes_blue"] >> src.b_eyes F["blood_type"] >> src.b_type F["underwear"] >> src.underwear - if(underwear == 0) underwear = 6 //For old players who have 0 in their savefile + if(underwear == 0) underwear = 12 //For old players who have 0 in their savefile F["backbag"] >> src.backbag if(isnull(backbag)) backbag = 2 F["name_is_always_random"] >> src.be_random_name diff --git a/icons/misc/fullscreen.dmi b/icons/misc/fullscreen.dmi index 77da668e21f..116ea7cfdcc 100644 Binary files a/icons/misc/fullscreen.dmi and b/icons/misc/fullscreen.dmi differ diff --git a/icons/mob/human.dmi b/icons/mob/human.dmi index a20e7f983e6..1526448c6fd 100644 Binary files a/icons/mob/human.dmi and b/icons/mob/human.dmi differ diff --git a/icons/misc/AF.dmi b/icons/unused/AF.dmi similarity index 100% rename from icons/misc/AF.dmi rename to icons/unused/AF.dmi diff --git a/icons/obj/airtunnel.dmi b/icons/unused/airtunnel.dmi similarity index 100% rename from icons/obj/airtunnel.dmi rename to icons/unused/airtunnel.dmi diff --git a/icons/mob/dam_mask.dmi b/icons/unused/dam_mask.dmi similarity index 100% rename from icons/mob/dam_mask.dmi rename to icons/unused/dam_mask.dmi diff --git a/icons/misc/flags.dmi b/icons/unused/flags.dmi similarity index 100% rename from icons/misc/flags.dmi rename to icons/unused/flags.dmi diff --git a/icons/unused/human_unused.dmi b/icons/unused/human_unused.dmi new file mode 100644 index 00000000000..6acfd789006 Binary files /dev/null and b/icons/unused/human_unused.dmi differ diff --git a/icons/misc/mouse.dmi b/icons/unused/mouse.dmi similarity index 100% rename from icons/misc/mouse.dmi rename to icons/unused/mouse.dmi diff --git a/icons/misc/old_or_unused.dmi b/icons/unused/old_or_unused.dmi similarity index 100% rename from icons/misc/old_or_unused.dmi rename to icons/unused/old_or_unused.dmi diff --git a/icons/misc/old_or_unused_food.dmi b/icons/unused/old_or_unused_food.dmi similarity index 100% rename from icons/misc/old_or_unused_food.dmi rename to icons/unused/old_or_unused_food.dmi diff --git a/icons/mob/organs.dmi b/icons/unused/organs.dmi similarity index 100% rename from icons/mob/organs.dmi rename to icons/unused/organs.dmi diff --git a/icons/mob/suit_nosides.dmi b/icons/unused/suit_nosides.dmi similarity index 100% rename from icons/mob/suit_nosides.dmi rename to icons/unused/suit_nosides.dmi diff --git a/icons/mob/tajaran.dmi b/icons/unused/tajaran.dmi similarity index 100% rename from icons/mob/tajaran.dmi rename to icons/unused/tajaran.dmi diff --git a/icons/mob/tajaran_face.dmi b/icons/unused/tajaran_face.dmi similarity index 100% rename from icons/mob/tajaran_face.dmi rename to icons/unused/tajaran_face.dmi diff --git a/icons/unused/title_unused.dmi b/icons/unused/title_unused.dmi new file mode 100644 index 00000000000..351fc4fad24 Binary files /dev/null and b/icons/unused/title_unused.dmi differ diff --git a/icons/mob/uniform_fat_nosides.dmi b/icons/unused/uniform_fat_nosides.dmi similarity index 100% rename from icons/mob/uniform_fat_nosides.dmi rename to icons/unused/uniform_fat_nosides.dmi diff --git a/icons/mob/uniform_nosides.dmi b/icons/unused/uniform_nosides.dmi similarity index 100% rename from icons/mob/uniform_nosides.dmi rename to icons/unused/uniform_nosides.dmi