mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-12 19:22:56 +00:00
TG: - Assume direct control moved to view variables
- "Mapping debug" verb renamed to "Debug verbs" - assume direct control, jump to dead group, startup singulo verbs removed from admins. You can enable them by calling the verb 'debug verbs'. 'debug verbs' remains game-master only, as it is just for debugging stuff. For a non-game master to use the 'assume direct control' verb, they have to use view variables - it was added to the drop-down. Some procs were moved around. Please code things in the locations which make sense! If you are making a verb for /mob/living, then don't put it in mob.dm, put it in mob/living.dm. Thanks. Revision: r3461 Author: baloh.matevz
This commit is contained in:
@@ -498,7 +498,7 @@ client
|
|||||||
togglebuildmode(MOB)
|
togglebuildmode(MOB)
|
||||||
href_list["datumrefresh"] = href_list["build_mode"]
|
href_list["datumrefresh"] = href_list["build_mode"]
|
||||||
|
|
||||||
/* else if (href_list["direct_control"])
|
else if (href_list["direct_control"])
|
||||||
if(!href_list["direct_control"])
|
if(!href_list["direct_control"])
|
||||||
return
|
return
|
||||||
var/mob/MOB = locate(href_list["direct_control"])
|
var/mob/MOB = locate(href_list["direct_control"])
|
||||||
@@ -510,7 +510,7 @@ client
|
|||||||
return
|
return
|
||||||
|
|
||||||
if(usr.client)
|
if(usr.client)
|
||||||
usr.client.cmd_assume_direct_control(MOB)*/
|
usr.client.cmd_assume_direct_control(MOB)
|
||||||
|
|
||||||
else if (href_list["delall"])
|
else if (href_list["delall"])
|
||||||
if(!href_list["delall"])
|
if(!href_list["delall"])
|
||||||
|
|||||||
@@ -285,11 +285,12 @@
|
|||||||
verbs += /client/proc/get_admin_state
|
verbs += /client/proc/get_admin_state
|
||||||
verbs += /client/proc/reload_admins
|
verbs += /client/proc/reload_admins
|
||||||
verbs += /client/proc/cmd_debug_make_powernets
|
verbs += /client/proc/cmd_debug_make_powernets
|
||||||
|
verbs += /client/proc/enable_debug_verbs
|
||||||
verbs += /client/proc/everyone_random
|
verbs += /client/proc/everyone_random
|
||||||
verbs += /client/proc/only_one
|
verbs += /client/proc/only_one
|
||||||
verbs += /client/proc/deadmin_self
|
verbs += /client/proc/deadmin_self
|
||||||
verbs += /client/proc/getruntimelog //used by coders to retrieve runtime logs
|
verbs += /client/proc/getruntimelog //used by coders to retrieve runtime logs
|
||||||
verbs += /client/proc/enable_mapping_debug
|
verbs += /client/proc/enable_debug_verbs
|
||||||
verbs += /client/proc/kill_air
|
verbs += /client/proc/kill_air
|
||||||
verbs += /client/proc/callprocgen
|
verbs += /client/proc/callprocgen
|
||||||
verbs += /client/proc/callprocobj
|
verbs += /client/proc/callprocobj
|
||||||
@@ -403,6 +404,7 @@
|
|||||||
verbs -= /client/proc/cmd_admin_gib_self
|
verbs -= /client/proc/cmd_admin_gib_self
|
||||||
verbs -= /client/proc/restartcontroller
|
verbs -= /client/proc/restartcontroller
|
||||||
verbs -= /client/proc/play_local_sound
|
verbs -= /client/proc/play_local_sound
|
||||||
|
verbs -= /client/proc/enable_debug_verbs
|
||||||
verbs -= /client/proc/toggleprayers
|
verbs -= /client/proc/toggleprayers
|
||||||
verbs -= /client/proc/Blobize
|
verbs -= /client/proc/Blobize
|
||||||
verbs -= /client/proc/toggle_clickproc //TODO ERRORAGE (Temporary proc while the enw clickproc is being tested)
|
verbs -= /client/proc/toggle_clickproc //TODO ERRORAGE (Temporary proc while the enw clickproc is being tested)
|
||||||
@@ -452,7 +454,7 @@
|
|||||||
verbs -= /client/proc/jump_to_dead_group
|
verbs -= /client/proc/jump_to_dead_group
|
||||||
verbs -= /client/proc/playernotes
|
verbs -= /client/proc/playernotes
|
||||||
verbs -= /obj/admins/proc/show_skills
|
verbs -= /obj/admins/proc/show_skills
|
||||||
verbs -= /client/proc/enable_mapping_debug
|
verbs -= /client/proc/enable_debug_verbs
|
||||||
return
|
return
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -506,6 +506,8 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
|
|||||||
else
|
else
|
||||||
alert("Invalid mob")
|
alert("Invalid mob")
|
||||||
//feedback_add_details("admin_verb","GFA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
|
//feedback_add_details("admin_verb","GFA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
|
||||||
|
log_admin("[key_name(src)] has granted [M.key] full access.")
|
||||||
|
message_admins("\blue [key_name_admin(usr)] has granted [M.key] full access.", 1)
|
||||||
|
|
||||||
/client/proc/cmd_assume_direct_control(var/mob/M in world)
|
/client/proc/cmd_assume_direct_control(var/mob/M in world)
|
||||||
set category = "Admin"
|
set category = "Admin"
|
||||||
@@ -523,6 +525,9 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
|
|||||||
if( isobserver(adminmob) )
|
if( isobserver(adminmob) )
|
||||||
del(adminmob)
|
del(adminmob)
|
||||||
//feedback_add_details("admin_verb","ADC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
|
//feedback_add_details("admin_verb","ADC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
|
||||||
|
log_admin("[key_name(usr)] assumed direct control of [M].")
|
||||||
|
message_admins("\blue [key_name_admin(usr)] assumed direct control of [M].", 1)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/client/proc/cmd_admin_dress(var/mob/living/carbon/human/M in world)
|
/client/proc/cmd_admin_dress(var/mob/living/carbon/human/M in world)
|
||||||
@@ -559,6 +564,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
|
|||||||
var/dresscode = input("Select dress for [M]", "Robust quick dress shop") as null|anything in dresspacks
|
var/dresscode = input("Select dress for [M]", "Robust quick dress shop") as null|anything in dresspacks
|
||||||
if (isnull(dresscode))
|
if (isnull(dresscode))
|
||||||
return
|
return
|
||||||
|
//feedback_add_details("admin_verb","SEQ") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
|
||||||
for (var/obj/item/I in M)
|
for (var/obj/item/I in M)
|
||||||
if (istype(I, /obj/item/weapon/implant))
|
if (istype(I, /obj/item/weapon/implant))
|
||||||
continue
|
continue
|
||||||
@@ -879,4 +885,54 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
|
|||||||
M.equip_if_possible(W, M.slot_wear_id)
|
M.equip_if_possible(W, M.slot_wear_id)
|
||||||
|
|
||||||
M.update_clothing()
|
M.update_clothing()
|
||||||
return
|
|
||||||
|
log_admin("[key_name(usr)] changed the equipment of [key_name(M)] to [dresscode].")
|
||||||
|
message_admins("\blue [key_name_admin(usr)] changed the equipment of [key_name_admin(M)] to [dresscode]..", 1)
|
||||||
|
return
|
||||||
|
|
||||||
|
/client/proc/startSinglo()
|
||||||
|
|
||||||
|
if(alert("Are you sure? This will start up the engine. Should only be used during debug!",,"Yes","No") != "Yes")
|
||||||
|
return
|
||||||
|
|
||||||
|
for(var/obj/machinery/emitter/E in world)
|
||||||
|
if(E.anchored)
|
||||||
|
E.active = 1
|
||||||
|
|
||||||
|
for(var/obj/machinery/field_generator/F in world)
|
||||||
|
if(F.anchored)
|
||||||
|
F.Varedit_start = 1
|
||||||
|
spawn(30)
|
||||||
|
for(var/obj/machinery/the_singularitygen/G in world)
|
||||||
|
if(G.anchored)
|
||||||
|
var/obj/machinery/singularity/S = new /obj/machinery/singularity(get_turf(G), 50)
|
||||||
|
spawn(0)
|
||||||
|
del(G)
|
||||||
|
S.energy = 1750
|
||||||
|
S.current_size = 7
|
||||||
|
S.icon = '224x224.dmi'
|
||||||
|
S.icon_state = "singularity_s7"
|
||||||
|
S.pixel_x = -96
|
||||||
|
S.pixel_y = -96
|
||||||
|
S.grav_pull = 0
|
||||||
|
//S.consume_range = 3
|
||||||
|
S.dissipate = 0
|
||||||
|
//S.dissipate_delay = 10
|
||||||
|
//S.dissipate_track = 0
|
||||||
|
//S.dissipate_strength = 10
|
||||||
|
|
||||||
|
for(var/obj/machinery/power/rad_collector/Rad in world)
|
||||||
|
if(Rad.anchored)
|
||||||
|
if(!Rad.P)
|
||||||
|
var/obj/item/weapon/tank/plasma/Plasma = new/obj/item/weapon/tank/plasma(Rad)
|
||||||
|
Plasma.air_contents.toxins = 70
|
||||||
|
Rad.drainratio = 0
|
||||||
|
Rad.P = Plasma
|
||||||
|
Plasma.loc = Rad
|
||||||
|
|
||||||
|
if(!Rad.active)
|
||||||
|
Rad.toggle_power()
|
||||||
|
|
||||||
|
for(var/obj/machinery/power/smes/SMES in world)
|
||||||
|
if(SMES.anchored)
|
||||||
|
SMES.chargemode = 1
|
||||||
@@ -59,6 +59,7 @@ var/intercom_range_display_status = 0
|
|||||||
if(camera_range_display_status)
|
if(camera_range_display_status)
|
||||||
for(var/obj/machinery/camera/C in world)
|
for(var/obj/machinery/camera/C in world)
|
||||||
new/obj/effect/debugging/camera_range(C.loc)
|
new/obj/effect/debugging/camera_range(C.loc)
|
||||||
|
//feedback_add_details("admin_verb","mCRD") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -100,6 +101,7 @@ var/intercom_range_display_status = 0
|
|||||||
|
|
||||||
output += "</ul>"
|
output += "</ul>"
|
||||||
usr << browse(output,"window=airreport;size=1000x500")
|
usr << browse(output,"window=airreport;size=1000x500")
|
||||||
|
//feedback_add_details("admin_verb","mCRP") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
|
||||||
|
|
||||||
intercom_view()
|
intercom_view()
|
||||||
set category = "Mapping"
|
set category = "Mapping"
|
||||||
@@ -119,10 +121,11 @@ var/intercom_range_display_status = 0
|
|||||||
var/obj/effect/debugging/marker/F = new/obj/effect/debugging/marker(T)
|
var/obj/effect/debugging/marker/F = new/obj/effect/debugging/marker(T)
|
||||||
if (!(F in view(7,I.loc)))
|
if (!(F in view(7,I.loc)))
|
||||||
del(F)
|
del(F)
|
||||||
|
//feedback_add_details("admin_verb","mIRD") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
|
||||||
|
|
||||||
enable_mapping_debug()
|
enable_debug_verbs()
|
||||||
set category = "Debug"
|
set category = "Debug"
|
||||||
set name = "Mapping debug"
|
set name = "Debug verbs"
|
||||||
src.verbs += /client/proc/do_not_use_these //-errorage
|
src.verbs += /client/proc/do_not_use_these //-errorage
|
||||||
src.verbs += /client/proc/camera_view //-errorage
|
src.verbs += /client/proc/camera_view //-errorage
|
||||||
src.verbs += /client/proc/sec_camera_report //-errorage
|
src.verbs += /client/proc/sec_camera_report //-errorage
|
||||||
@@ -132,6 +135,10 @@ var/intercom_range_display_status = 0
|
|||||||
src.verbs += /client/proc/atmosscan //check plumbing
|
src.verbs += /client/proc/atmosscan //check plumbing
|
||||||
src.verbs += /client/proc/count_objects_on_z_level
|
src.verbs += /client/proc/count_objects_on_z_level
|
||||||
src.verbs += /client/proc/count_objects_all
|
src.verbs += /client/proc/count_objects_all
|
||||||
|
src.verbs += /client/proc/cmd_assume_direct_control //-errorage
|
||||||
|
src.verbs += /client/proc/jump_to_dead_group
|
||||||
|
src.verbs += /client/proc/startSinglo
|
||||||
|
//feedback_add_details("admin_verb","mDV") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
|
||||||
|
|
||||||
count_objects_on_z_level()
|
count_objects_on_z_level()
|
||||||
set category = "Mapping"
|
set category = "Mapping"
|
||||||
@@ -174,6 +181,7 @@ var/intercom_range_display_status = 0
|
|||||||
world << line*/
|
world << line*/
|
||||||
|
|
||||||
world << "There are [count] objects of type [type_path] on z-level [num_level]"
|
world << "There are [count] objects of type [type_path] on z-level [num_level]"
|
||||||
|
//feedback_add_details("admin_verb","mOBJZ") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
|
||||||
|
|
||||||
count_objects_all()
|
count_objects_all()
|
||||||
set category = "Mapping"
|
set category = "Mapping"
|
||||||
@@ -199,4 +207,5 @@ var/intercom_range_display_status = 0
|
|||||||
line += " no.[i+10+j]@\[[temp_atom.x], [temp_atom.y], [temp_atom.z]\]; "
|
line += " no.[i+10+j]@\[[temp_atom.x], [temp_atom.y], [temp_atom.z]\]; "
|
||||||
world << line*/
|
world << line*/
|
||||||
|
|
||||||
world << "There are [count] objects of type [type_path] in the game world"
|
world << "There are [count] objects of type [type_path] in the game world"
|
||||||
|
//feedback_add_details("admin_verb","mOBJ") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
|
||||||
Reference in New Issue
Block a user