diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index a69aa62dc4b..9cf11ef187f 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -758,13 +758,12 @@ var/global/floorIsLava = 0 set category = "Server" set desc="Delay the game start/end" set name="Delay" + + if(!check_rights(R_ADMIN)) return if (!ticker || ticker.current_state != GAME_STATE_PREGAME) - if (src.rank in list("Badmin", "Game Admin", "Game Master")) - ticker.delay_end = !ticker.delay_end - log_admin("[key_name(usr)] [ticker.delay_end ? "delayed the round end" : "has made the round end normally"].") - message_admins("\blue [key_name(usr)] [ticker.delay_end ? "delayed the round end" : "has made the round end normally"].", 1) - else - usr << "\red You are not a high enough rank." + ticker.delay_end = !ticker.delay_end + log_admin("[key_name(usr)] [ticker.delay_end ? "delayed the round end" : "has made the round end normally"].") + message_admins("\blue [key_name(usr)] [ticker.delay_end ? "delayed the round end" : "has made the round end normally"].", 1) return //alert("Round end delayed", null, null, null, null, null) going = !( going ) if (!( going )) @@ -1090,4 +1089,4 @@ proc/move_alien_ship() alien_ship_location = 0 else alien_ship_location = 1 - return + return diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 46ba5457926..ae36eb7d6fe 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -68,7 +68,7 @@ var/list/admin_verbs_ban = list( /client/proc/unban_panel, /client/proc/jobbans, /client/proc/unjobban_panel, - /client/proc/DB_ban_panel + // /client/proc/DB_ban_panel ) var/list/admin_verbs_sounds = list( /client/proc/play_local_sound, @@ -88,7 +88,8 @@ var/list/admin_verbs_fun = list( /client/proc/cmd_admin_add_random_ai_law, /client/proc/make_sound, /client/proc/toggle_random_events, - /client/proc/set_ooc + /client/proc/set_ooc, + /client/proc/editappear ) var/list/admin_verbs_spawn = list( /datum/admins/proc/spawn_atom, /*allows us to spawn instances*/ @@ -632,12 +633,9 @@ var/list/admin_verbs_mod = list( set name = "Edit Appearance" set category = "Fun" - usr << "\red This proc has been temporarily disabled." - return + if(!check_rights(R_FUN)) return - //some random errors here, cbb fixing them right now - //todo - /*if(!istype(M, /mob/living/carbon/human)) + if(!istype(M, /mob/living/carbon/human)) usr << "\red You can only do this to humans!" return switch(alert("Are you sure you wish to edit this mob's appearance? Skrell, Soghun and Tajaran can result in unintended consequences.",,"Yes","No")) @@ -668,49 +666,14 @@ var/list/admin_verbs_mod = list( M.s_tone = -M.s_tone + 35 // hair - var/list/all_hairs = typesof(/datum/sprite_accessory/hair) - /datum/sprite_accessory/hair - var/list/hairs = list() - - // loop through potential hairs - for(var/x in all_hairs) - var/datum/sprite_accessory/hair/H = new x // create new hair datum based on type x - hairs.Add(H.name) // add hair name to hairs - del(H) // delete the hair after it's all done - - var/new_style = input("Please select hair style", "Character Generation") as null|anything in hairs - - // if new style selected (not cancel) - if (new_style) - M.h_style = new_style - - for(var/x in all_hairs) // loop through all_hairs again. Might be slightly CPU expensive, but not significantly. - var/datum/sprite_accessory/hair/H = new x // create new hair datum - if(H.name == new_style) - M.hair_style = H // assign the hair_style variable a new hair datum - break - else - del(H) // if hair H not used, delete. BYOND can garbage collect, but better safe than sorry + var/new_hstyle = input(usr, "Select a hair style", "Grooming") as null|anything in hair_styles_list + if(new_hstyle) + M.h_style = new_hstyle // facial hair - var/list/all_fhairs = typesof(/datum/sprite_accessory/facial_hair) - /datum/sprite_accessory/facial_hair - var/list/fhairs = list() - - for(var/x in all_fhairs) - var/datum/sprite_accessory/facial_hair/H = new x - fhairs.Add(H.name) - del(H) - - new_style = input("Please select facial style", "Character Generation") as null|anything in fhairs - - if(new_style) - M.f_style = new_style - for(var/x in all_fhairs) - var/datum/sprite_accessory/facial_hair/H = new x - if(H.name == new_style) - M.facial_hair_style = H - break - else - del(H) + var/new_fstyle = input(usr, "Select a facial hair style", "Grooming") as null|anything in facial_hair_styles_list + if(new_fstyle) + M.f_style = new_fstyle var/new_gender = alert(usr, "Please select gender.", "Character Generation", "Male", "Female") if (new_gender) @@ -718,10 +681,10 @@ var/list/admin_verbs_mod = list( M.gender = MALE else M.gender = FEMALE - M.rebuild_appearance() + M.update_hair() M.update_body() M.check_dna(M) - */ + /client/proc/playernotes() set name = "Show Player Info" set category = "Admin"