From ce019d526da3d868cbd5333a4ecdce58e5885df9 Mon Sep 17 00:00:00 2001 From: Erthilo Date: Sun, 3 Jun 2012 14:15:27 +0100 Subject: [PATCH] TG: Fixed r500 (faces displaying above glasses and such) Cause: face layer was set to MOB_LAYER. Fixed r501 (underwear not showing) Cause: bad indentation A possible fix for some very odd bugs caused by restarting the MC related to the usr variable being passed into the MC. *shrug* Very hard to test. Removed the need for the world to be in Debug2 mode to edit ticklag as the verb is hidden behind another proc now anyway, and it's become more of an annoyance than a thing to stop people accidentally clicking it. Revision: r3695 Author: elly1...@rocketmail.com --- code/modules/admin/verbs/MC.dm | 3 ++ code/modules/admin/verbs/ticklag.dm | 42 ++++++++--------- code/modules/mob/living/carbon/human/human.dm | 46 ++++++++----------- .../mob/new_player/preferences_setup.dm | 7 +-- 4 files changed, 43 insertions(+), 55 deletions(-) diff --git a/code/modules/admin/verbs/MC.dm b/code/modules/admin/verbs/MC.dm index a9481f7f348..a7bd0c0161f 100644 --- a/code/modules/admin/verbs/MC.dm +++ b/code/modules/admin/verbs/MC.dm @@ -1,8 +1,11 @@ /client/proc/restartcontroller() set category = "Debug" set name = "Restart Master Controller" + if(!holder) return switch(alert("Are you sure? If the control is still running it will now be running twice.",,"Yes","No")) if("Yes") + src = null + usr = null //weird things were happening after restarting MC. spawn(0) master_controller.process() if("No") diff --git a/code/modules/admin/verbs/ticklag.dm b/code/modules/admin/verbs/ticklag.dm index 933513c2a0c..1d9afa57a42 100644 --- a/code/modules/admin/verbs/ticklag.dm +++ b/code/modules/admin/verbs/ticklag.dm @@ -4,33 +4,29 @@ set category = "Debug" set name = "Set Ticklag" set desc = "Sets a new tick lag. Recommend you don't mess with this too much! Stable, time-tested ticklag value is 0.9" - if(Debug2) - if(src.holder) - if(!src.mob) return - if(src.holder.rank in list("Game Admin", "Game Master")) - var/newtick = input("Sets a new tick lag. Please don't mess with this too much! The stable, time-tested ticklag value is 0.9","Lag of Tick", world.tick_lag) as num|null - //I've used ticks of 2 before to help with serious singulo lags - if(newtick && newtick <= 2 && newtick > 0) - log_admin("[key_name(src)] has modified world.tick_lag to [newtick]", 0) - message_admins("[key_name(src)] has modified world.tick_lag to [newtick]", 0) - world.tick_lag = newtick - //feedback_add_details("admin_verb","TICKLAG") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + if(src.holder) + if(!src.mob) return - switch(alert("Enable Tick Compensation?","Tick Comp is currently: [config.Tickcomp]","Yes","No")) - if("Yes") - config.Tickcomp = 1 - else - config.Tickcomp = 0 + if(src.holder.rank in list("Game Admin", "Game Master")) + var/newtick = input("Sets a new tick lag. Please don't mess with this too much! The stable, time-tested ticklag value is 0.9","Lag of Tick", world.tick_lag) as num|null + //I've used ticks of 2 before to help with serious singulo lags + if(newtick && newtick <= 2 && newtick > 0) + log_admin("[key_name(src)] has modified world.tick_lag to [newtick]", 0) + message_admins("[key_name(src)] has modified world.tick_lag to [newtick]", 0) + world.tick_lag = newtick + feedback_add_details("admin_verb","TICKLAG") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! - return + switch(alert("Enable Tick Compensation?","Tick Comp is currently: [config.Tickcomp]","Yes","No")) + if("Yes") + config.Tickcomp = 1 + else + config.Tickcomp = 0 - - src << "\red Error: ticklag(): Invalid world.ticklag value. No changes made." return - src << "\red Error: ticklag(): You are not authorised to use this. Game Admins and higher only." + src << "\red Error: ticklag(): Invalid world.ticklag value. No changes made." return - else - src << "\red Error: ticklag(): You must first enable Debugging mode." - return \ No newline at end of file + + src << "\red Error: ticklag(): You are not authorised to use this. Game Admins and higher only." + return diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 811e58b2e7b..2c9cad25399 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -1379,25 +1379,19 @@ return 0 /mob/living/carbon/human/proc/update_body() - if(stand_icon) - del(stand_icon) - if(lying_icon) - del(lying_icon) - - if (mutantrace) - return + if(stand_icon) del(stand_icon) + if(lying_icon) del(lying_icon) + if(mutantrace) return var/g = "m" - if (gender == MALE) - g = "m" - else if (gender == FEMALE) - g = "f" + if(gender == FEMALE) g = "f" + var/husk = (HUSK in src.mutations) +// var/obese = (FAT in src.mutations) + //Base mob icon stand_icon = new /icon('human.dmi', "torso_[g]_s") lying_icon = new /icon('human.dmi', "torso_[g]_l") - var/husk = (HUSK in mutations) - stand_icon.Blend(new /icon('human.dmi', "chest_[g]_s"), ICON_OVERLAY) lying_icon.Blend(new /icon('human.dmi', "chest_[g]_l"), ICON_OVERLAY) @@ -1438,8 +1432,8 @@ stand_icon.Blend(husk_s, ICON_OVERLAY) lying_icon.Blend(husk_l, ICON_OVERLAY) - // Skin tone - if (s_tone >= 0) + //Skin tone + if(s_tone >= 0) stand_icon.Blend(rgb(s_tone, s_tone, s_tone), ICON_ADD) lying_icon.Blend(rgb(s_tone, s_tone, s_tone), ICON_ADD) else @@ -1449,11 +1443,14 @@ stand_icon.Blend(rgb(100,100,100)) lying_icon.Blend(rgb(100,100,100)) - if (underwear < 6 && underwear > 0) + //Underwear + if(underwear < 6 && underwear > 0) // if(!obese) 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) + + /mob/living/carbon/human/proc/update_face() if(organs) var/datum/organ/external/head = organs["head"] @@ -1463,17 +1460,12 @@ del(face_lying) return if(!facial_hair_style || !hair_style) return//Seems people like to lose their icons, this should stop the runtimes for now - del(face_standing) - del(face_lying) - - if (mutantrace) - return + if(face_standing) del(face_standing) + if(face_lying) del(face_lying) + if(mutantrace) return var/g = "m" - if (gender == MALE) - g = "m" - else if (gender == FEMALE) - g = "f" + if (gender == FEMALE) g = "f" var/icon/eyes_s = new/icon("icon" = 'human_face.dmi', "icon_state" = "eyes_s") var/icon/eyes_l = new/icon("icon" = 'human_face.dmi', "icon_state" = "eyes_l") @@ -1510,9 +1502,9 @@ face_standing = new /image() face_lying = new /image() face_standing.icon = eyes_s - face_standing.layer = MOB_LAYER + face_standing.layer = FACE_LAYER face_lying.icon = eyes_l - face_lying.layer = MOB_LAYER + face_lying.layer = FACE_LAYER del(mouth_l) del(mouth_s) diff --git a/code/modules/mob/new_player/preferences_setup.dm b/code/modules/mob/new_player/preferences_setup.dm index 49be3db4503..cf0861e366f 100644 --- a/code/modules/mob/new_player/preferences_setup.dm +++ b/code/modules/mob/new_player/preferences_setup.dm @@ -204,10 +204,7 @@ datum/preferences del(preview_icon) var/g = "m" - if (gender == MALE) - g = "m" - else if (gender == FEMALE) - g = "f" + if (gender == FEMALE) g = "f" if(species == "Tajaran") preview_icon = new /icon('tajaran.dmi', "body_[g]_s", "dir" = preview_dir) @@ -271,4 +268,4 @@ datum/preferences if(H.name == f_style) facial_hair_style = H else - del(H) + del(H) \ No newline at end of file