More verb fixes

This commit is contained in:
Markolie
2015-01-06 22:46:11 +01:00
parent 0284c9ce87
commit 2e37a88639
10 changed files with 33 additions and 31 deletions
@@ -1,3 +1,4 @@
/obj/structure/stool/bed/chair/e_chair
name = "electric chair"
desc = "Looks absolutely SHOCKING!"
@@ -27,7 +28,8 @@
set name = "Toggle Electric Chair"
set category = "Object"
set src in oview(1)
if(usr.stat || !usr.canmove || usr.restrained())
return
if(on)
on = 0
icon_state = "echair0"
+8 -3
View File
@@ -39,8 +39,10 @@ var/can_call_ert
trigger_armed_response_team(1)
client/verb/JoinResponseTeam()
set category = "IC"
/mob/dead/observer/verb/JoinResponseTeam()
set category = "Ghost"
set name = "Join Emergency Response Team"
set desc = "Join the Emergency Response Team. Only possible if it has been called by the crew."
if(istype(usr,/mob/dead/observer) || istype(usr,/mob/new_player))
if(!send_emergency_team)
@@ -63,7 +65,10 @@ client/verb/JoinResponseTeam()
L.name = "Commando"
return
var/leader_selected = isemptylist(response_team_members)
var/mob/living/carbon/human/new_commando = create_response_team(L.loc, leader_selected, new_name)
if(!src.client)
return
var/client/C = src.client
var/mob/living/carbon/human/new_commando = C.create_response_team(L.loc, leader_selected, new_name)
del(L)
new_commando.mind.key = usr.key
new_commando.key = usr.key
-1
View File
@@ -146,7 +146,6 @@ var/list/admin_verbs_debug = list(
/client/proc/cmd_debug_mob_lists,
/client/proc/cmd_admin_delete,
/client/proc/cmd_debug_del_all,
/client/proc/cmd_debug_tog_aliens,
/client/proc/reload_admins,
/client/proc/restart_controller,
/client/proc/remake_distribution_map,
-9
View File
@@ -362,15 +362,6 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
message_admins("[key_name_admin(src)] has remade the powernets. makepowernets() called.", 0)
feedback_add_details("admin_verb","MPWN") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/cmd_debug_tog_aliens()
set category = "Event"
set name = "Toggle Aliens"
aliens_allowed = !aliens_allowed
log_admin("[key_name(src)] has turned aliens [aliens_allowed ? "on" : "off"].")
message_admins("[key_name_admin(src)] has turned aliens [aliens_allowed ? "on" : "off"].", 0)
feedback_add_details("admin_verb","TAL") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/cmd_admin_grantfullaccess(var/mob/M in mob_list)
set category = "Admin"
set name = "Grant Full Access"
+1 -1
View File
@@ -126,7 +126,7 @@
//be special
/client/verb/toggle_be_special(role in be_special_flags)
set name = "Toggle SpecialRole Candidacy"
set name = "Toggle Special Role Candidacy"
set category = "Preferences"
set desc = "Toggles which special roles you would like to be a candidate for, during events."
var/role_flag = be_special_flags[role]
@@ -13,6 +13,8 @@
set name = "Set transfer amount"
set category = "Object"
set src in range(0)
if(usr.stat || !usr.canmove || usr.restrained())
return
var/N = input("Amount per transfer from this:","[src]") as null|anything in possible_transfer_amounts
if (N)
amount_per_transfer_from_this = N
@@ -39,6 +39,8 @@
set name = "Set transfer amount"
set category = "Object"
set src in view(1)
if(usr.stat || !usr.canmove || usr.restrained())
return
var/N = input("Amount per transfer from this:","[src]") as null|anything in possible_transfer_amounts
if (N)
amount_per_transfer_from_this = N
+1
View File
@@ -254,6 +254,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
screen = 0.0
if(alert("Are you sure you want to maximize research levels?","Confirmation","Yes","No")=="No")
return
log_admin("[key_name(usr)] has maximized the research levels.")
message_admins("[key_name_admin(usr)] has maximized the research levels.")
spawn(30)
Maximize()