diff --git a/code/WorkInProgress/buildmode.dm b/code/WorkInProgress/buildmode.dm index 7c89b5533f..601fd3d694 100644 --- a/code/WorkInProgress/buildmode.dm +++ b/code/WorkInProgress/buildmode.dm @@ -1,4 +1,6 @@ /proc/togglebuildmode(mob/M as mob in world) + set name = "Toggle Build Mode" + set category = "Special Verbs" if(M.client) if(M.client.buildmode) M.client.buildmode = 0 diff --git a/code/WorkInProgress/optics/laser-pointer.dm b/code/WorkInProgress/optics/laser-pointer.dm index 6b6bc582cf..e06150f541 100644 --- a/code/WorkInProgress/optics/laser-pointer.dm +++ b/code/WorkInProgress/optics/laser-pointer.dm @@ -41,6 +41,7 @@ updateicon() verb/rotate() + set name = "Rotate" set src in view(1) turn_off() dir = turn(dir, -90) diff --git a/code/WorkInProgress/recycling/disposal-construction.dm b/code/WorkInProgress/recycling/disposal-construction.dm index ec8c95d401..2e8dc5884c 100644 --- a/code/WorkInProgress/recycling/disposal-construction.dm +++ b/code/WorkInProgress/recycling/disposal-construction.dm @@ -58,6 +58,7 @@ // flip and rotate verbs verb/rotate() + set name = "Rotate Pipe" set src in view(1) if(usr.stat) @@ -68,6 +69,7 @@ update() verb/flip() + set name = "Flip Pipe" set src in view(1) if(usr.stat) return diff --git a/code/_debug.dm b/code/_debug.dm index c0ce23cd7f..45c182a73f 100644 --- a/code/_debug.dm +++ b/code/_debug.dm @@ -517,7 +517,7 @@ Doing this because FindTurfs() isn't even used message_admins("[src.key] set the random event chance to [eventchance]%") /mob/verb/funbutton() - set category = "Debug" + set category = "Admin" set name = "Random Expl.(REMOVE ME)" if(!src.authenticated || !src.holder) src << "Only administrators may use this command." diff --git a/code/datums/chemical.dm b/code/datums/chemical.dm deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/code/defines/mob/living/carbon/alien.dm b/code/defines/mob/living/carbon/alien.dm index 94c717d9db..086dafdf5f 100644 --- a/code/defines/mob/living/carbon/alien.dm +++ b/code/defines/mob/living/carbon/alien.dm @@ -2,6 +2,7 @@ name = "alien" voice_name = "alien" voice_message = "hisses" + say_message = "hisses" icon = 'alien.dmi' toxloss = 250 diff --git a/code/defines/mob/living/carbon/alien_humanoid.dm b/code/defines/mob/living/carbon/alien_humanoid.dm index 57a9e72f89..326bb1f6b6 100644 --- a/code/defines/mob/living/carbon/alien_humanoid.dm +++ b/code/defines/mob/living/carbon/alien_humanoid.dm @@ -25,4 +25,7 @@ icon_state = "queen_s" /mob/living/carbon/alien/humanoid/rpbody - update_icon = 0 \ No newline at end of file + update_icon = 0 + + voice_message = "says" + say_message = "says" \ No newline at end of file diff --git a/code/defines/mob/living/carbon/changeling.dm b/code/defines/mob/living/carbon/changeling.dm deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/code/defines/mob/living/carbon/monkey.dm b/code/defines/mob/living/carbon/monkey.dm index ed0f8229b3..fd872c24ab 100644 --- a/code/defines/mob/living/carbon/monkey.dm +++ b/code/defines/mob/living/carbon/monkey.dm @@ -2,6 +2,7 @@ name = "monkey" voice_name = "monkey" voice_message = "chimpers" + say_message = "chimpers" icon = 'monkey.dmi' icon_state = "monkey1" gender = NEUTER @@ -12,3 +13,4 @@ /mob/living/carbon/monkey/rpbody // For admin RP update_icon = 0 voice_message = "says" + say_message = "says" diff --git a/code/defines/mob/mob.dm b/code/defines/mob/mob.dm index 0d423b941a..7ec9e96604 100644 --- a/code/defines/mob/mob.dm +++ b/code/defines/mob/mob.dm @@ -145,7 +145,8 @@ //husk = 64 var/voice_name = "unidentifiable voice" - var/voice_message = null + var/voice_message = null // When you are not understood by others (replaced with just screeches, hisses, chimpers etc.) + var/say_message = null // When you are understood by others. Currently only used by aliens and monkeys in their say_quote procs //Monkey/infected mode var/list/resistances = list() diff --git a/code/game/cellautomata.dm b/code/game/cellautomata.dm index bd0af3a427..ded8d44c38 100644 --- a/code/game/cellautomata.dm +++ b/code/game/cellautomata.dm @@ -159,6 +159,7 @@ // **** Note in 40.93.4, split into obj/mob/turf point verbs, no area /atom/verb/point() + set name = "Point To" set src in oview() if (!usr || !isturf(usr.loc)) diff --git a/code/game/gamemodes/nuclear/nuclearbomb.dm b/code/game/gamemodes/nuclear/nuclearbomb.dm index e83e3c1cce..4296bd7fb7 100644 --- a/code/game/gamemodes/nuclear/nuclearbomb.dm +++ b/code/game/gamemodes/nuclear/nuclearbomb.dm @@ -41,7 +41,7 @@ return /obj/machinery/nuclearbomb/verb/make_deployable() - set name = "make deployable" + set name = "Make Deployable" set src in oview(1) if (src.deployable) diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index b390b3ee58..c712ab206e 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -256,6 +256,7 @@ return /obj/machinery/sleeper/verb/eject() + set name = "Eject" set src in oview(1) if (usr.stat != 0) @@ -265,6 +266,7 @@ return /obj/machinery/sleeper/verb/move_inside() + set name = "Move Inside" set src in oview(1) if (usr.stat != 0) diff --git a/code/game/machinery/computer/engine.dm b/code/game/machinery/computer/engine.dm deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/code/game/machinery/doors/shuttledoor.dm b/code/game/machinery/doors/shuttledoor.dm deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm index b93096d6a1..428e18e454 100644 --- a/code/game/machinery/pipe/construction.dm +++ b/code/game/machinery/pipe/construction.dm @@ -54,6 +54,7 @@ Buildable meters // rotate the pipe item clockwise /obj/item/weapon/pipe/verb/rotate() + set name = "Rotate Pipe" set src in view(1) if ( usr.stat || usr.restrained() ) diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm index d54f671f67..d1c0813e58 100644 --- a/code/game/machinery/teleporter.dm +++ b/code/game/machinery/teleporter.dm @@ -278,6 +278,7 @@ return /obj/machinery/computer/data/verb/read(topic as text) + set name = "Read" set src in oview(1) if (src.topics[text("[]", topic)]) diff --git a/code/game/objects/alien/facehugger.dm b/code/game/objects/alien/facehugger.dm index bcd9511504..4c5cc501cc 100644 --- a/code/game/objects/alien/facehugger.dm +++ b/code/game/objects/alien/facehugger.dm @@ -138,7 +138,7 @@ verb/follow() set src in view() - set name = "follow me" + set name = "Follow Me" if(!alive) return if(!isalien(usr)) usr << text("\red The alien ignores you.") @@ -153,7 +153,7 @@ verb/stop() set src in view() - set name = "stop following" + set name = "Stop Following" if(!alive) return if(!isalien(usr)) usr << text("\red The alien ignores you.") diff --git a/code/game/objects/devices/device.dm b/code/game/objects/devices/device.dm deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/code/game/objects/items/item.dm b/code/game/objects/items/item.dm index a0ed3abe0d..c3b4e000c8 100644 --- a/code/game/objects/items/item.dm +++ b/code/game/objects/items/item.dm @@ -59,6 +59,7 @@ return /obj/item/verb/move_to_top() + set name = "Move To Top" set src in oview(1) if(!istype(src.loc, /turf) || usr.stat || usr.restrained() ) diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm index 83c547c5aa..9790bcf4c5 100644 --- a/code/game/objects/items/weapons/cards_ids.dm +++ b/code/game/objects/items/weapons/cards_ids.dm @@ -35,6 +35,7 @@ FINGERPRINT CARD return /obj/item/weapon/card/id/verb/read() + set name = "Read ID Card" set src in usr usr << text("\icon[] []: The current assignment on the card is [].", src, src.name, src.assignment) diff --git a/code/game/objects/stool.dm b/code/game/objects/stool.dm index b994b83304..9f9633dd9d 100644 --- a/code/game/objects/stool.dm +++ b/code/game/objects/stool.dm @@ -215,6 +215,7 @@ return /obj/stool/chair/verb/rotate() + set name = "Rotate Chair" set src in oview(1) src.dir = turn(src.dir, 90) diff --git a/code/game/objects/tank.dm b/code/game/objects/tank.dm index 03b764c908..2a5aa64a13 100644 --- a/code/game/objects/tank.dm +++ b/code/game/objects/tank.dm @@ -271,6 +271,7 @@ return /obj/item/weapon/tank/jetpack/verb/toggle() + set name = "Toggle Jetpack" src.on = !( src.on ) src.icon_state = text("jetpack[]", src.on) if(src.on) diff --git a/code/game/objects/window.dm b/code/game/objects/window.dm index dbf8f98c65..d97bc2fcd4 100644 --- a/code/game/objects/window.dm +++ b/code/game/objects/window.dm @@ -175,6 +175,7 @@ /obj/window/verb/rotate() + set name = "Rotate Window" set src in oview(1) if (src.anchored) diff --git a/code/game/sound.dm b/code/game/sound.dm index 6856fc3427..12bbc031af 100644 --- a/code/game/sound.dm +++ b/code/game/sound.dm @@ -49,6 +49,7 @@ src << S client/verb/Toggle_Soundscape() + set name = "Toggle Ambience" usr:client:no_ambi = !usr:client:no_ambi if(usr:client:no_ambi) usr << sound('shipambience.ogg', repeat = 0, wait = 0, volume = 0, channel = 2) diff --git a/code/game/verbs/begin.dm b/code/game/verbs/begin.dm deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/code/game/verbs/ooc.dm b/code/game/verbs/ooc.dm index 782ba1a498..e4206def3b 100644 --- a/code/game/verbs/ooc.dm +++ b/code/game/verbs/ooc.dm @@ -1,5 +1,5 @@ /mob/verb/listen_ooc() - set name = "(Un)Mute OOC" + set name = "Un/Mute OOC" if (src.client) src.client.listen_ooc = !src.client.listen_ooc @@ -9,6 +9,7 @@ src << "\blue You are no longer listening to messages on the OOC channel." /mob/verb/ooc(msg as text) + set name = "OOC Message" if (!src.client.authenticated || IsGuestKey(src.key)) src << "You are not authorized to communicate over these channels." return @@ -43,7 +44,9 @@ else if (C.listen_ooc) C << "OOC: [src.client.stealth ? src.client.fakekey : src.key]: [msg]" +/* /mob/verb/goonsay(msg as text) + set name = "Goonsay" if (!src.client.authenticated || !src.client.goon) src << "You are not authorized to communicate over these channels." return @@ -68,3 +71,6 @@ C << "GOONSAY: [src.key][src.client.stealth ? "/([src.client.fakekey])" : ""]: [msg]" else if(C.listen_ooc) C << "GOONSAY: [src.client.stealth ? src.client.fakekey : src.key]: [msg]" + + + -- Skie */ \ No newline at end of file diff --git a/code/game/verbs/who.dm b/code/game/verbs/who.dm index e843d135f1..ecf8698d4d 100644 --- a/code/game/verbs/who.dm +++ b/code/game/verbs/who.dm @@ -1,5 +1,5 @@ /mob/verb/who() - set name = "Who" + set name = "Who is Online" usr << "Current Players:" @@ -18,7 +18,7 @@ for (var/mob/M in world) if (!M.client) continue - + if (M.client.stealth && !usr.client.holder) peeps += "\t[M.client.fakekey]" else if (M.client.goon) //everyone is authed @@ -35,6 +35,7 @@ /client/verb/adminwho() set category = "Commands" + set name = "Admins Online" usr << "Current Admins:" diff --git a/code/game/vials.dm b/code/game/vials.dm index a1bdc5f810..16e7fccaaf 100644 --- a/code/game/vials.dm +++ b/code/game/vials.dm @@ -267,6 +267,7 @@ //step(src, direction) /proc/possess(obj/O as obj in world) + set name = "Possess Obj" usr.loc = O usr.real_name = O.name usr.name = O.name @@ -274,14 +275,17 @@ usr.control_object = O /proc/release(obj/O as obj in world) + set name = "Release Obj" //usr.loc = get_turf(usr) usr.loc = O.loc // Appear where the object you were controlling is -- TLE usr.client.eye = usr usr.control_object = null /proc/givetestverbs(mob/M as mob in world) + set desc = "Give this guy possess/release verbs" + set category = "Debug" + set name = "Give Possessing Verbs" M.verbs += /proc/possess M.verbs += /proc/release - /////////////////////////////////////////////////////blue \ No newline at end of file diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index 80d4a59611..e01d2147f9 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -11,6 +11,8 @@ var/showadminmessages = 1 M << rendered /proc/toggle_adminmsg() + set name = "Toggle Admin Messages" + set category = "Server" showadminmessages = !showadminmessages /obj/admins/Topic(href, href_list) @@ -1536,7 +1538,7 @@ var/showadminmessages = 1 /obj/admins/proc/vmode() - set category = "Special Verbs" + set category = "Server" set name = "Start Vote" set desc="Starts vote" var/confirm = alert("What vote would you like to start?", "Vote", "Restart", "Change Game Mode", "Cancel") @@ -1577,7 +1579,7 @@ var/showadminmessages = 1 CM.client.vote = "default" /obj/admins/proc/votekill() - set category = "Special Verbs" + set category = "Server" set name = "Abort Vote" set desc="Aborts a vote" if(vote.voting == 0) @@ -1597,7 +1599,7 @@ var/showadminmessages = 1 M.client.showvote = 0 /obj/admins/proc/voteres() - set category = "Special Verbs" + set category = "Server" set name = "Toggle Voting" set desc="Toggles Votes" var/confirm = alert("What vote would you like to toggle?", "Vote", "Restart [config.allow_vote_restart ? "Off" : "On"]", "Change Game Mode [config.allow_vote_mode ? "Off" : "On"]", "Cancel") @@ -1619,7 +1621,7 @@ var/showadminmessages = 1 vote.nextvotetime = world.timeofday /obj/admins/proc/restart() - set category = "Special Verbs" + set category = "Server" set name = "Restart" set desc="Restarts the world" var/confirm = alert("Restart the game world?", "Restart", "Yes", "Cancel") @@ -1643,7 +1645,7 @@ var/showadminmessages = 1 world << "\blue [usr.client.stealth ? "Administrator" : usr.key] Announces:\n \t [message]" log_admin("Announce: [key_name(usr)] : [message]") /obj/admins/proc/toggleooc() - set category = "Special Verbs" + set category = "Server" set desc="Toggle dis bitch" set name="Toggle OOC" ooc_allowed = !( ooc_allowed ) @@ -1655,7 +1657,7 @@ var/showadminmessages = 1 message_admins("[key_name_admin(usr)] toggled OOC.", 1) /obj/admins/proc/toggleoocdead() - set category = "Special Verbs" + set category = "Server" set desc="Toggle dis bitch" set name="Toggle Dead OOC" dooc_allowed = !( dooc_allowed ) @@ -1664,7 +1666,7 @@ var/showadminmessages = 1 message_admins("[key_name_admin(usr)] toggled Dead OOC.", 1) /obj/admins/proc/toggletraitorscaling() - set category = "Special Verbs" + set category = "Server" set desc="Toggle traitor scaling" set name="Toggle Traitor Scaling" traitor_scaling = !traitor_scaling @@ -1672,7 +1674,7 @@ var/showadminmessages = 1 message_admins("[key_name_admin(usr)] toggled Traitor Scaling [traitor_scaling ? "on" : "off"].", 1) /obj/admins/proc/togglegoonsay() - set category = "Special Verbs" + set category = "Server" set desc = "Toggle dis bitch" set name = "Toggle Goonsay" goonsay_allowed = !( goonsay_allowed ) @@ -1684,7 +1686,7 @@ var/showadminmessages = 1 message_admins("[key_name_admin(usr)] toggled GOONSAY [goonsay_allowed ? "on" : "off"]", 1) /obj/admins/proc/startnow() - set category = "Special Verbs" + set category = "Server" set desc="Start the round RIGHT NOW" set name="Start Now" if(!ticker) @@ -1700,7 +1702,7 @@ var/showadminmessages = 1 return 0 /obj/admins/proc/toggleenter() - set category = "Special Verbs" + set category = "Server" set desc="People can't enter" set name="Toggle Entering" enter_allowed = !( enter_allowed ) @@ -1713,7 +1715,7 @@ var/showadminmessages = 1 world.update_status() /obj/admins/proc/toggleAI() - set category = "Special Verbs" + set category = "Server" set desc="People can't be AI" set name="Toggle AI" config.allow_ai = !( config.allow_ai ) @@ -1725,7 +1727,7 @@ var/showadminmessages = 1 world.update_status() /obj/admins/proc/toggleaban() - set category = "Special Verbs" + set category = "Server" set desc="Respawn basically" set name="Toggle Respawn" abandon_allowed = !( abandon_allowed ) @@ -1738,7 +1740,7 @@ var/showadminmessages = 1 world.update_status() /obj/admins/proc/toggle_aliens() - set category = "Special Verbs" + set category = "Server" set desc="Toggle alien mobs" set name="Toggle Aliens" aliens_allowed = !aliens_allowed @@ -1746,7 +1748,7 @@ var/showadminmessages = 1 message_admins("[key_name_admin(usr)] toggled Aliens [aliens_allowed ? "on" : "off"].", 1) /obj/admins/proc/delay() - set category = "Special Verbs" + set category = "Server" set desc="Delay the game start" set name="Delay" if (ticker) @@ -1760,28 +1762,28 @@ var/showadminmessages = 1 log_admin("[key_name(usr)] removed the delay.") /obj/admins/proc/adjump() - set category = "Special Verbs" + set category = "Server" set desc="Toggle admin jumping" set name="Toggle Jump" config.allow_admin_jump = !(config.allow_admin_jump) message_admins("\blue Toggled admin jumping to [config.allow_admin_jump].") /obj/admins/proc/adspawn() - set category = "Special Verbs" + set category = "Server" set desc="Toggle admin spawning" set name="Toggle Spawn" config.allow_admin_spawning = !(config.allow_admin_spawning) message_admins("\blue Toggled admin item spawning to [config.allow_admin_spawning].") /obj/admins/proc/adrev() - set category = "Special Verbs" + set category = "Server" set desc="Toggle admin revives" set name="Toggle Revive" config.allow_admin_rev = !(config.allow_admin_rev) message_admins("\blue Toggled reviving to [config.allow_admin_rev].") /obj/admins/proc/immreboot() - set category = "Special Verbs" + set category = "Server" set desc="Reboots the server post haste" set name="Immediate Reboot" if( alert("Reboot server?",,"Yes","No") == "No") @@ -1791,7 +1793,7 @@ var/showadminmessages = 1 world.Reboot() /client/proc/deadchat() - set category = "Special Verbs" + set category = "Server" set desc="Toggles Deadchat" set name="Deadchat" if(deadchat == 0) @@ -1802,7 +1804,7 @@ var/showadminmessages = 1 usr << "Deadchat turned off" /obj/admins/proc/unprison(var/mob/M in world) - set category = "Special Verbs" + set category = "Admin" set name = "Unprison" if (M.z == 2) if (config.allow_admin_jump) diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index c98f97709a..19a3be7fc7 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -26,185 +26,195 @@ if ("Host") src.deadchat = 1 src.holder.level = 6 - src.verbs += /client/proc/stealthadmin - src.verbs += /client/proc/cmd_admin_delete - src.verbs += /proc/possess - src.verbs += /client/proc/cmd_admin_add_random_ai_law - src.verbs += /proc/release - src.verbs += /proc/givetestverbs - src.verbs += /obj/admins/proc/togglegoonsay src.verbs += /client/proc/debug_variables src.verbs += /client/proc/cmd_modify_object_variables - src.verbs += /client/proc/cmd_modify_ticker_variables - src.verbs += /client/proc/cmd_admin_pm - src.verbs += /client/proc/cmd_admin_say - src.verbs += /client/proc/dsay - src.verbs += /client/proc/cmd_admin_check_contents - src.verbs += /client/proc/cmd_debug_del_all - src.verbs += /client/proc/play_sound - src.verbs += /client/proc/modifytemperature - src.verbs += /client/proc/cmd_admin_gib - src.verbs += /client/proc/cmd_admin_gib_self - src.verbs += /proc/toggle_adminmsg -// src.verbs += /client/proc/grillify - src.verbs += /client/proc/jumptomob - src.verbs += /client/proc/Jump - src.verbs += /client/proc/jumptoturf - src.verbs += /client/proc/cmd_admin_rejuvenate - src.verbs += /client/proc/cmd_admin_robotize + src.verbs += /client/proc/admin_call_shuttle // -- Skie + src.verbs += /client/proc/admin_cancel_shuttle // -- Skie + src.verbs += /client/proc/air_report + src.verbs += /client/proc/air_status + src.verbs += /client/proc/callproc + src.verbs += /client/proc/Cell src.verbs += /client/proc/cmd_admin_alienize src.verbs += /client/proc/cmd_admin_changelinginize - src.verbs += /client/proc/Cell - src.verbs += /client/proc/ticklag - src.verbs += /client/proc/cmd_admin_mute - src.verbs += /client/proc/cmd_admin_drop_everything - src.verbs += /client/proc/cmd_admin_godmode - src.verbs += /client/proc/get_admin_state + src.verbs += /client/proc/cmd_admin_abominize // -- TLE + src.verbs += /client/proc/make_cultist // -- TLE + src.verbs += /client/proc/cmd_admin_monkeyize + src.verbs += /client/proc/cmd_admin_robotize src.verbs += /client/proc/cmd_admin_add_freeform_ai_law -// src.verbs += /client/proc/getmobs -// src.verbs += /client/proc/cmd_admin_list_admins + src.verbs += /client/proc/cmd_admin_add_random_ai_law + src.verbs += /client/proc/cmd_admin_check_contents + src.verbs += /client/proc/cmd_admin_create_centcom_report + src.verbs += /client/proc/cmd_admin_delete + src.verbs += /client/proc/cmd_admin_direct_narrate // -- TLE + src.verbs += /client/proc/cmd_admin_drop_everything + src.verbs += /client/proc/cmd_admin_gib + src.verbs += /client/proc/cmd_admin_gib_self + src.verbs += /client/proc/cmd_admin_godmode src.verbs += /client/proc/cmd_admin_list_occ - src.verbs += /proc/togglebuildmode - src.verbs += /client/proc/jumptokey - src.verbs += /client/proc/Getmob - src.verbs += /client/proc/jobbans - src.verbs += /client/proc/sendmob - src.verbs += /client/proc/Debug2 //debug toggle switch - src.verbs += /client/proc/callproc - src.verbs += /client/proc/funbutton + src.verbs += /client/proc/cmd_admin_mute + src.verbs += /client/proc/cmd_admin_pm src.verbs += /client/proc/cmd_admin_prison - src.verbs += /obj/admins/proc/vmode //start vote - src.verbs += /obj/admins/proc/votekill //abort vote - src.verbs += /obj/admins/proc/voteres //toggle votes - src.verbs += /obj/admins/proc/restart //restart - src.verbs += /obj/admins/proc/immreboot //immediate reboot + src.verbs += /client/proc/cmd_admin_rejuvenate + src.verbs += /client/proc/cmd_admin_remove_plasma + src.verbs += /client/proc/cmd_admin_say + src.verbs += /client/proc/cmd_admin_subtle_message + src.verbs += /client/proc/cmd_admin_world_narrate // -- TLE + src.verbs += /client/proc/cmd_debug_del_all + src.verbs += /client/proc/cmd_modify_ticker_variables + src.verbs += /client/proc/deadchat //toggles deadchat + src.verbs += /client/proc/Debug2 //debug toggle switch + src.verbs += /client/proc/drop_bomb // -- TLE + src.verbs += /client/proc/dsay + src.verbs += /client/proc/fix_next_move + src.verbs += /client/proc/funbutton + src.verbs += /client/proc/general_report + src.verbs += /client/proc/Getmob + src.verbs += /client/proc/get_admin_state + src.verbs += /client/proc/jobbans + src.verbs += /client/proc/Jump + src.verbs += /client/proc/jumptokey + src.verbs += /client/proc/jumptomob + src.verbs += /client/proc/jumptoturf + src.verbs += /client/proc/kill_air // -- TLE + src.verbs += /client/proc/make_sound // -- TLE + src.verbs += /client/proc/modifytemperature + src.verbs += /client/proc/object_talk // -- TLE + src.verbs += /client/proc/play_sound + src.verbs += /client/proc/sendmob + src.verbs += /client/proc/stealthadmin + src.verbs += /client/proc/ticklag + src.verbs += /client/proc/toggle_view_range + src.verbs += /client/proc/warn + src.verbs += /obj/admins/proc/adjump //toggle admin jumping + src.verbs += /obj/admins/proc/adrev //toggle admin revives + src.verbs += /obj/admins/proc/adspawn //toggle admin item spawning src.verbs += /obj/admins/proc/announce //global announce + src.verbs += /obj/admins/proc/delay //game start delay + src.verbs += /obj/admins/proc/immreboot //immediate reboot + src.verbs += /obj/admins/proc/restart //restart + src.verbs += /obj/admins/proc/startnow //start now bitch + src.verbs += /obj/admins/proc/toggleaban //abandon mob + src.verbs += /obj/admins/proc/toggleAI //Toggle the AI + src.verbs += /obj/admins/proc/toggleenter //Toggle enterting src.verbs += /obj/admins/proc/toggleooc //toggle ooc src.verbs += /obj/admins/proc/toggleoocdead //toggle ooc for dead/unc src.verbs += /obj/admins/proc/toggletraitorscaling //toggle traitor scaling - src.verbs += /obj/admins/proc/startnow //start now bitch - src.verbs += /obj/admins/proc/toggleenter //Toggle enterting - src.verbs += /obj/admins/proc/toggleAI //Toggle the AI - src.verbs += /obj/admins/proc/toggleaban //abandon mob - src.verbs += /obj/admins/proc/delay //game start delay - src.verbs += /client/proc/deadchat //toggles deadchat - src.verbs += /obj/admins/proc/adrev //toggle admin revives - src.verbs += /obj/admins/proc/adspawn //toggle admin item spawning - src.verbs += /obj/admins/proc/adjump //toggle admin jumping - src.verbs += /obj/admins/proc/unprison - src.verbs += /client/proc/cmd_admin_create_centcom_report - src.verbs += /client/proc/cmd_admin_subtle_message - src.verbs += /client/proc/cmd_admin_world_narrate // -- TLE - src.verbs += /client/proc/cmd_admin_direct_narrate // -- TLE - src.verbs += /client/proc/drop_bomb // -- TLE - src.verbs += /client/proc/make_cultist // -- TLE - src.verbs += /client/proc/make_sound // -- TLE - src.verbs += /client/proc/object_talk // -- TLE - src.verbs += /client/proc/kill_air // -- TLE - src.verbs += /client/proc/cmd_admin_abominize // -- TLE - src.verbs += /client/proc/cmd_admin_remove_plasma - - src.verbs += /client/proc/general_report - src.verbs += /client/proc/air_report - src.verbs += /client/proc/air_status - src.verbs += /client/proc/fix_next_move - - src.verbs += /client/proc/toggle_view_range src.verbs += /obj/admins/proc/toggle_aliens - src.verbs += /client/proc/warn - if ("Coder") - src.deadchat = 1 - src.holder.level = 5 - src.verbs += /client/proc/stealthadmin - src.verbs += /client/proc/cmd_admin_delete - src.verbs += /proc/possess - src.verbs += /client/proc/cmd_admin_add_random_ai_law - src.verbs += /proc/release - src.verbs += /proc/givetestverbs - src.verbs += /obj/admins/proc/togglegoonsay - src.verbs += /client/proc/debug_variables - src.verbs += /client/proc/cmd_debug_tog_aliens - src.verbs += /client/proc/cmd_modify_object_variables - src.verbs += /client/proc/cmd_modify_ticker_variables - src.verbs += /client/proc/cmd_admin_pm - src.verbs += /client/proc/cmd_admin_say - src.verbs += /client/proc/dsay - src.verbs += /client/proc/cmd_admin_check_contents - src.verbs += /client/proc/cmd_debug_del_all - src.verbs += /client/proc/play_sound - src.verbs += /client/proc/modifytemperature - src.verbs += /client/proc/cmd_admin_gib - src.verbs += /client/proc/cmd_admin_gib_self -// src.verbs += /proc/toggleai - src.verbs += /proc/toggle_adminmsg - src.verbs += /proc/togglebuildmode -// src.verbs += /client/proc/grillify - src.verbs += /client/proc/jumptomob - src.verbs += /client/proc/Jump - src.verbs += /client/proc/jumptoturf - src.verbs += /client/proc/cmd_admin_rejuvenate - src.verbs += /client/proc/cmd_admin_robotize - src.verbs += /client/proc/cmd_admin_alienize - src.verbs += /client/proc/cmd_admin_changelinginize - src.verbs += /client/proc/Cell - src.verbs += /client/proc/ticklag - src.verbs += /client/proc/cmd_admin_mute - src.verbs += /client/proc/cmd_admin_drop_everything - src.verbs += /client/proc/cmd_admin_godmode - src.verbs += /client/proc/get_admin_state - src.verbs += /client/proc/cmd_admin_add_freeform_ai_law -// src.verbs += /client/proc/getmobs -// src.verbs += /client/proc/cmd_admin_list_admins - src.verbs += /client/proc/cmd_admin_list_occ - src.verbs += /client/proc/jumptokey - src.verbs += /client/proc/Getmob - src.verbs += /client/proc/jobbans - src.verbs += /client/proc/sendmob - src.verbs += /client/proc/Debug2 //debug toggle switch - src.verbs += /client/proc/callproc - src.verbs += /client/proc/funbutton - src.verbs += /client/proc/cmd_admin_prison + src.verbs += /obj/admins/proc/unprison src.verbs += /obj/admins/proc/vmode //start vote src.verbs += /obj/admins/proc/votekill //abort vote src.verbs += /obj/admins/proc/voteres //toggle votes - src.verbs += /obj/admins/proc/restart //restart - src.verbs += /obj/admins/proc/immreboot //immediate reboot + src.verbs += /proc/givetestverbs + src.verbs += /proc/possess + src.verbs += /proc/release + src.verbs += /proc/togglebuildmode + src.verbs += /proc/toggle_adminmsg + +// src.verbs += /client/proc/grillify +// src.verbs += /client/proc/cmd_admin_list_admins +// src.verbs += /client/proc/getmobs +// src.verbs += /obj/admins/proc/togglegoonsay + + + if ("Coder") + src.deadchat = 1 + src.holder.level = 5 + src.verbs += /client/proc/debug_variables + src.verbs += /client/proc/cmd_modify_object_variables + src.verbs += /client/proc/admin_call_shuttle // -- Skie + src.verbs += /client/proc/admin_cancel_shuttle // -- Skie + src.verbs += /client/proc/air_report + src.verbs += /client/proc/air_status + src.verbs += /client/proc/callproc + src.verbs += /client/proc/Cell + src.verbs += /client/proc/cmd_admin_alienize + src.verbs += /client/proc/cmd_admin_changelinginize + src.verbs += /client/proc/cmd_admin_abominize // -- TLE + src.verbs += /client/proc/make_cultist // -- TLE + src.verbs += /client/proc/cmd_admin_monkeyize + src.verbs += /client/proc/cmd_admin_robotize + src.verbs += /client/proc/cmd_admin_add_freeform_ai_law + src.verbs += /client/proc/cmd_admin_add_random_ai_law + src.verbs += /client/proc/cmd_admin_check_contents + src.verbs += /client/proc/cmd_admin_create_centcom_report + src.verbs += /client/proc/cmd_admin_delete + src.verbs += /client/proc/cmd_admin_direct_narrate // -- TLE + src.verbs += /client/proc/cmd_admin_drop_everything + src.verbs += /client/proc/cmd_admin_gib + src.verbs += /client/proc/cmd_admin_gib_self + src.verbs += /client/proc/cmd_admin_godmode + src.verbs += /client/proc/cmd_admin_list_occ + src.verbs += /client/proc/cmd_admin_mute + src.verbs += /client/proc/cmd_admin_pm + src.verbs += /client/proc/cmd_admin_prison + src.verbs += /client/proc/cmd_admin_rejuvenate + src.verbs += /client/proc/cmd_admin_remove_plasma + src.verbs += /client/proc/cmd_admin_say + src.verbs += /client/proc/cmd_admin_subtle_message + src.verbs += /client/proc/cmd_admin_world_narrate // -- TLE + src.verbs += /client/proc/cmd_debug_del_all + src.verbs += /client/proc/cmd_debug_tog_aliens + src.verbs += /client/proc/cmd_modify_ticker_variables + src.verbs += /client/proc/deadchat //toggles deadchat + src.verbs += /client/proc/Debug2 //debug toggle switch + src.verbs += /client/proc/dsay + src.verbs += /client/proc/fix_next_move + src.verbs += /client/proc/funbutton + src.verbs += /client/proc/general_report + src.verbs += /client/proc/Getmob + src.verbs += /client/proc/get_admin_state + src.verbs += /client/proc/jobbans + src.verbs += /client/proc/Jump + src.verbs += /client/proc/jumptokey + src.verbs += /client/proc/jumptomob + src.verbs += /client/proc/jumptoturf + src.verbs += /client/proc/make_sound // -- Skie + src.verbs += /client/proc/modifytemperature + src.verbs += /client/proc/play_sound + src.verbs += /client/proc/sendmob + src.verbs += /client/proc/stealthadmin + src.verbs += /client/proc/ticklag + src.verbs += /client/proc/toggle_view_range + src.verbs += /client/proc/warn + src.verbs += /obj/admins/proc/adjump //toggle admin jumping + src.verbs += /obj/admins/proc/adrev //toggle admin revives + src.verbs += /obj/admins/proc/adspawn //toggle admin item spawning src.verbs += /obj/admins/proc/announce //global announce + src.verbs += /obj/admins/proc/delay //game start delay + src.verbs += /obj/admins/proc/immreboot //immediate reboot + src.verbs += /obj/admins/proc/restart //restart + src.verbs += /obj/admins/proc/spawn_atom + src.verbs += /obj/admins/proc/startnow //start now bitch + src.verbs += /obj/admins/proc/toggleaban //abandon mob + src.verbs += /obj/admins/proc/toggleAI //Toggle the AI + src.verbs += /obj/admins/proc/toggleenter //Toggle enterting src.verbs += /obj/admins/proc/toggleooc //toggle ooc src.verbs += /obj/admins/proc/toggleoocdead //toggle ooc for dead/unc src.verbs += /obj/admins/proc/toggletraitorscaling - src.verbs += /obj/admins/proc/startnow //start now bitch - src.verbs += /obj/admins/proc/toggleenter //Toggle enterting - src.verbs += /obj/admins/proc/toggleAI //Toggle the AI - src.verbs += /obj/admins/proc/toggleaban //abandon mob - src.verbs += /obj/admins/proc/delay //game start delay - src.verbs += /client/proc/deadchat //toggles deadchat - src.verbs += /obj/admins/proc/adrev //toggle admin revives - src.verbs += /obj/admins/proc/adspawn //toggle admin item spawning - src.verbs += /obj/admins/proc/adjump //toggle admin jumping - src.verbs += /obj/admins/proc/unprison - src.verbs += /client/proc/cmd_admin_create_centcom_report - src.verbs += /client/proc/cmd_admin_subtle_message - src.verbs += /client/proc/cmd_admin_remove_plasma - - src.verbs += /client/proc/general_report - src.verbs += /client/proc/air_report - src.verbs += /client/proc/air_status - src.verbs += /client/proc/fix_next_move - src.verbs += /obj/admins/proc/spawn_atom - - src.verbs += /client/proc/toggle_view_range src.verbs += /obj/admins/proc/toggle_aliens - src.verbs += /client/proc/warn + src.verbs += /obj/admins/proc/unprison + src.verbs += /obj/admins/proc/vmode //start vote + src.verbs += /obj/admins/proc/votekill //abort vote + src.verbs += /obj/admins/proc/voteres //toggle votes + src.verbs += /proc/givetestverbs + src.verbs += /proc/possess + src.verbs += /proc/release + src.verbs += /proc/togglebuildmode + src.verbs += /proc/toggle_adminmsg + +// src.verbs += /obj/admins/proc/togglegoonsay +// src.verbs += /client/proc/grillify +// src.verbs += /client/proc/cmd_admin_list_admins +// src.verbs += /client/proc/getmobs +// src.verbs += /proc/toggleai + - src.verbs += /client/proc/cmd_admin_world_narrate // -- TLE - src.verbs += /client/proc/cmd_admin_direct_narrate // -- TLE if ("Shit Guy") src.deadchat = 1 src.holder.level = 4 src.verbs += /client/proc/stealthadmin - src.verbs += /obj/admins/proc/togglegoonsay + //src.verbs += /obj/admins/proc/togglegoonsay src.verbs += /client/proc/debug_variables src.verbs += /proc/possess src.verbs += /client/proc/cmd_admin_add_random_ai_law @@ -229,6 +239,7 @@ src.verbs += /client/proc/cmd_admin_mute src.verbs += /client/proc/cmd_admin_drop_everything src.verbs += /client/proc/cmd_admin_robotize + src.verbs += /client/proc/cmd_admin_monkeyize src.verbs += /client/proc/cmd_admin_godmode src.verbs += /client/proc/cmd_admin_add_freeform_ai_law src.verbs += /client/proc/funbutton @@ -270,6 +281,9 @@ src.verbs += /client/proc/toggle_view_range src.verbs += /client/proc/warn + src.verbs += /client/proc/admin_call_shuttle // -- Skie + src.verbs += /client/proc/admin_cancel_shuttle // -- Skie + if ("Primary Administrator") src.deadchat = 1 @@ -282,7 +296,7 @@ src.verbs += /obj/admins/proc/toggleoocdead //toggle ooc for dead/unc src.verbs += /obj/admins/proc/toggletraitorscaling src.verbs += /client/proc/cmd_admin_drop_everything - src.verbs += /obj/admins/proc/togglegoonsay + //src.verbs += /obj/admins/proc/togglegoonsay src.verbs += /client/proc/debug_variables src.verbs += /client/proc/cmd_modify_object_variables src.verbs += /client/proc/cmd_modify_ticker_variables @@ -303,7 +317,7 @@ src.verbs += /obj/admins/proc/toggleooc //toggle ooc src.verbs += /obj/admins/proc/toggleoocdead //toggle ooc for dead/unc src.verbs += /obj/admins/proc/toggletraitorscaling - src.verbs += /obj/admins/proc/togglegoonsay + //src.verbs += /obj/admins/proc/togglegoonsay src.verbs += /client/proc/cmd_admin_say src.verbs += /client/proc/dsay src.verbs += /client/proc/cmd_admin_add_random_ai_law @@ -354,7 +368,7 @@ src.verbs += /obj/admins/proc/toggleaban //abandon mob src.verbs += /client/proc/deadchat //toggles deadchat - src.verbs += /obj/admins/proc/togglegoonsay + //src.verbs += /obj/admins/proc/togglegoonsay src.verbs += /client/proc/cmd_admin_pm src.verbs += /client/proc/cmd_admin_say src.verbs += /client/proc/dsay @@ -386,6 +400,9 @@ src.verbs += /client/proc/cmd_admin_subtle_message src.verbs += /client/proc/warn + src.verbs += /client/proc/admin_call_shuttle // -- Skie + src.verbs += /client/proc/admin_cancel_shuttle // -- Skie + if ("Secondary Administrator") src.holder.level = 1 src.verbs += /client/proc/stealthadmin @@ -394,7 +411,7 @@ src.verbs += /obj/admins/proc/toggleaban //abandon mob src.verbs += /client/proc/cmd_admin_check_contents - src.verbs += /obj/admins/proc/togglegoonsay + //src.verbs += /obj/admins/proc/togglegoonsay src.verbs += /client/proc/cmd_admin_pm src.verbs += /client/proc/cmd_admin_say @@ -425,7 +442,7 @@ if ("Moderator") src.holder.level = 0 src.verbs += /client/proc/stealthadmin - src.verbs += /obj/admins/proc/togglegoonsay + //src.verbs += /obj/admins/proc/togglegoonsay src.verbs += /client/proc/cmd_admin_pm src.verbs += /client/proc/cmd_admin_say src.verbs += /client/proc/dsay @@ -481,12 +498,12 @@ if(( src.holder.state == 2 ) || ( src.holder.level > 3 )) src.verbs += /client/proc/secrets - src.verbs += /client/proc/goons - src.verbs += /client/proc/beta_testers + //src.verbs += /client/proc/goons + //src.verbs += /client/proc/beta_testers /client/proc/clear_admin_verbs() src.deadchat = 0 - src.verbs -= /obj/admins/proc/togglegoonsay + //src.verbs -= /obj/admins/proc/togglegoonsay src.verbs -= /client/proc/debug_variables src.verbs -= /client/proc/cmd_modify_object_variables src.verbs -= /client/proc/cmd_modify_ticker_variables @@ -542,8 +559,8 @@ src.verbs -= /client/proc/unban_panel src.verbs -= /client/proc/secrets src.verbs -= /client/proc/voting - src.verbs -= /client/proc/goons - src.verbs -= /client/proc/beta_testers + //src.verbs -= /client/proc/goons + //src.verbs -= /client/proc/beta_testers src.verbs -= /client/proc/admin_play src.verbs -= /client/proc/admin_observe src.verbs -= /client/proc/stealth @@ -599,6 +616,7 @@ src << "\blue You are now playing" /client/proc/get_admin_state() + set name = "Get Admin State" set category = "Debug" for(var/mob/M in world) if(M.client && M.client.holder) @@ -619,7 +637,8 @@ return /client/proc/jobbans() - set category = "Debug" + set name = "Display Job bans" + set category = "Admin" if(src.holder) src.holder.Jobbans() return @@ -666,7 +685,7 @@ src.holder.Voting() /client/proc/funbutton() - set category = "Debug" + set category = "Admin" set name = "Boom Boom Boom Shake The Room" if(!src.authenticated || !src.holder) src << "Only administrators may use this command." @@ -675,7 +694,7 @@ for(var/turf/simulated/floor/T in world) if(prob(4) && T.z == 1 && istype(T)) spawn(50+rand(0,3000)) - explosion(T, 3, 1) + explosion(T, rand(1,5), rand(1,6), rand(3,10), 0) usr << "\blue Blowing up station ..." @@ -768,7 +787,7 @@ /client/proc/make_cultist(var/mob/M in world) // -- TLE - set category = "Special Verbs" + set category = "Admin" set name = "Make Cultist" set desc = "Makes target a cultist" if(M) @@ -823,7 +842,7 @@ src.verbs += /client/proc/cmd_admin_add_random_ai_law src.verbs += /proc/release src.verbs += /proc/givetestverbs - src.verbs += /obj/admins/proc/togglegoonsay + //src.verbs += /obj/admins/proc/togglegoonsay src.verbs += /client/proc/debug_variables src.verbs += /client/proc/cmd_modify_object_variables src.verbs += /client/proc/cmd_modify_ticker_variables @@ -901,7 +920,7 @@ src.verbs += /client/proc/cmd_admin_add_random_ai_law src.verbs += /proc/release src.verbs += /proc/givetestverbs - src.verbs += /obj/admins/proc/togglegoonsay + //src.verbs += /obj/admins/proc/togglegoonsay src.verbs += /client/proc/debug_variables src.verbs += /client/proc/cmd_debug_tog_aliens src.verbs += /client/proc/cmd_modify_object_variables @@ -978,7 +997,7 @@ src.verbs += /client/proc/warn if ("Shit Guy") - src.verbs += /obj/admins/proc/togglegoonsay + //src.verbs += /obj/admins/proc/togglegoonsay src.verbs += /client/proc/debug_variables src.verbs += /proc/possess src.verbs += /client/proc/cmd_admin_add_random_ai_law @@ -1050,7 +1069,7 @@ src.verbs += /obj/admins/proc/toggleooc //toggle ooc src.verbs += /obj/admins/proc/toggletraitorscaling src.verbs += /client/proc/cmd_admin_drop_everything - src.verbs += /obj/admins/proc/togglegoonsay + //src.verbs += /obj/admins/proc/togglegoonsay src.verbs += /client/proc/debug_variables src.verbs += /client/proc/cmd_modify_object_variables src.verbs += /client/proc/cmd_modify_ticker_variables @@ -1070,7 +1089,7 @@ src.verbs += /proc/togglebuildmode src.verbs += /obj/admins/proc/toggleooc //toggle ooc src.verbs += /obj/admins/proc/toggletraitorscaling - src.verbs += /obj/admins/proc/togglegoonsay + //src.verbs += /obj/admins/proc/togglegoonsay src.verbs += /client/proc/cmd_admin_say src.verbs += /client/proc/dsay src.verbs += /client/proc/cmd_admin_add_random_ai_law @@ -1118,7 +1137,7 @@ src.verbs += /client/proc/jumptokey src.verbs += /obj/admins/proc/toggleaban //abandon mob src.verbs += /client/proc/deadchat //toggles deadchat - src.verbs += /obj/admins/proc/togglegoonsay + //src.verbs += /obj/admins/proc/togglegoonsay src.verbs += /client/proc/cmd_admin_pm src.verbs += /client/proc/cmd_admin_say src.verbs += /client/proc/dsay @@ -1154,7 +1173,7 @@ if(src.holder.state == 2) //observing src.verbs += /obj/admins/proc/toggleaban //abandon mob src.verbs += /client/proc/cmd_admin_check_contents - src.verbs += /obj/admins/proc/togglegoonsay + //src.verbs += /obj/admins/proc/togglegoonsay src.verbs += /client/proc/cmd_admin_pm src.verbs += /client/proc/cmd_admin_say @@ -1182,7 +1201,7 @@ src.verbs += /client/proc/warn if ("Moderator") - src.verbs += /obj/admins/proc/togglegoonsay + //src.verbs += /obj/admins/proc/togglegoonsay src.verbs += /client/proc/cmd_admin_pm src.verbs += /client/proc/cmd_admin_say src.verbs += /client/proc/dsay @@ -1314,7 +1333,7 @@ src.verbs += /client/proc/cmd_admin_add_random_ai_law src.verbs -= /proc/release src.verbs -= /proc/givetestverbs - src.verbs += /obj/admins/proc/togglegoonsay + //src.verbs += /obj/admins/proc/togglegoonsay src.verbs -= /client/proc/debug_variables src.verbs += /client/proc/cmd_debug_tog_aliens src.verbs -= /client/proc/cmd_modify_object_variables @@ -1391,7 +1410,7 @@ src.verbs -= /client/proc/warn if ("Shit Guy") - src.verbs += /obj/admins/proc/togglegoonsay + //src.verbs += /obj/admins/proc/togglegoonsay src.verbs -= /client/proc/debug_variables src.verbs -= /proc/possess src.verbs += /client/proc/cmd_admin_add_random_ai_law @@ -1463,7 +1482,7 @@ src.verbs -= /proc/togglebuildmode src.verbs += /obj/admins/proc/toggleooc //toggle ooc src.verbs += /obj/admins/proc/toggletraitorscaling - src.verbs += /obj/admins/proc/togglegoonsay + //src.verbs += /obj/admins/proc/togglegoonsay src.verbs += /client/proc/cmd_admin_say src.verbs += /client/proc/dsay src.verbs += /client/proc/cmd_admin_add_random_ai_law @@ -1505,7 +1524,7 @@ //toggles deadchat - src.verbs += /obj/admins/proc/togglegoonsay + //src.verbs += /obj/admins/proc/togglegoonsay src.verbs -= /client/proc/cmd_admin_pm src.verbs += /client/proc/cmd_admin_say src.verbs += /client/proc/dsay @@ -1538,7 +1557,7 @@ if ("Secondary Administrator") - src.verbs += /obj/admins/proc/togglegoonsay + //src.verbs += /obj/admins/proc/togglegoonsay src.verbs -= /client/proc/cmd_admin_pm src.verbs += /client/proc/cmd_admin_say @@ -1566,7 +1585,7 @@ src.verbs -= /client/proc/warn if ("Moderator") - src.verbs += /obj/admins/proc/togglegoonsay + //src.verbs += /obj/admins/proc/togglegoonsay src.verbs -= /client/proc/cmd_admin_pm src.verbs += /client/proc/cmd_admin_say src.verbs += /client/proc/dsay diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm index 2f62265bad..0ff1de9895 100644 --- a/code/modules/admin/verbs/adminhelp.dm +++ b/code/modules/admin/verbs/adminhelp.dm @@ -1,6 +1,6 @@ /mob/verb/adminhelp(msg as text) set category = "Commands" - set name = "adminhelp" + set name = "-Adminhelp" if(!usr.client.authenticated) src << "Please authorize before sending these messages." return diff --git a/code/modules/admin/verbs/adminjump.dm b/code/modules/admin/verbs/adminjump.dm index 92de91f8b0..690cc74fdf 100644 --- a/code/modules/admin/verbs/adminjump.dm +++ b/code/modules/admin/verbs/adminjump.dm @@ -1,6 +1,7 @@ /client/proc/Jump(var/area/A in world) + set name = "Jump to Area" set desc = "Area to jump to" - set category = "Special Verbs" + set category = "Admin" if(!src.authenticated || !src.holder) src << "Only administrators may use this command." return @@ -14,6 +15,7 @@ alert("Admin jumping disabled") /client/proc/jumptoturf(var/turf/T in world) + set name = "Jump to Turf" if(!src.authenticated || !src.holder) src << "Only administrators may use this command." return @@ -26,7 +28,7 @@ return /client/proc/jumptomob(var/mob/M in world) - set category = "Special Verbs" + set category = "Admin" set name = "Jump to Mob" if(!src.authenticated || !src.holder) @@ -41,7 +43,7 @@ alert("Admin jumping disabled") /client/proc/jumptokey() - set category = "Special Verbs" + set category = "Admin" set name = "Jump to Key" if(!src.authenticated || !src.holder) @@ -63,7 +65,7 @@ alert("Admin jumping disabled") /client/proc/Getmob(var/mob/M in world) - set category = "Special Verbs" + set category = "Admin" set name = "Get Mob" set desc = "Mob to teleport" if(!src.authenticated || !src.holder) @@ -77,7 +79,7 @@ alert("Admin jumping disabled") /client/proc/sendmob(var/mob/M in world, var/area/A in world) - set category = "Special Verbs" + set category = "Admin" set name = "Send Mob" if(!src.authenticated || !src.holder) src << "Only administrators may use this command." diff --git a/code/modules/admin/verbs/adminsay.dm b/code/modules/admin/verbs/adminsay.dm index 7b42de43f0..2f4c0fb788 100644 --- a/code/modules/admin/verbs/adminsay.dm +++ b/code/modules/admin/verbs/adminsay.dm @@ -1,6 +1,6 @@ /client/proc/cmd_admin_say(msg as text) set category = "Special Verbs" - set name = "asay" + set name = "Admin Say" set hidden = 1 // All admins should be authenticated, but... what if? diff --git a/code/modules/admin/verbs/changetemperature.dm b/code/modules/admin/verbs/changetemperature.dm index efb4cdecc8..aacc70600c 100644 --- a/code/modules/admin/verbs/changetemperature.dm +++ b/code/modules/admin/verbs/changetemperature.dm @@ -1,7 +1,7 @@ //debug proc for testing body temperature /client/proc/modifytemperature(newtemp as num) set category = "Debug" - set name = "mass edit temperature" + set name = "Mass Edit Temperature" set desc="edit temperature of all turfs in view" /* if(Debug2) diff --git a/code/modules/admin/verbs/deadsay.dm b/code/modules/admin/verbs/deadsay.dm index 94b6c12fa8..bb316fdb58 100644 --- a/code/modules/admin/verbs/deadsay.dm +++ b/code/modules/admin/verbs/deadsay.dm @@ -1,6 +1,6 @@ /client/proc/dsay(msg as text) set category = "Special Verbs" - set name = "dsay" + set name = "Dead Say" set hidden = 1 // All admins should be authenticated, but... what if? if(!src.authenticated || !src.holder) diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index 5416961b4d..3a8356f922 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -120,6 +120,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that /client/proc/Cell() set category = "Debug" + set name = "Air Status in Location" if(!src.mob) return var/turf/T = src.mob.loc @@ -138,8 +139,8 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that usr.show_message(t, 1) /client/proc/cmd_admin_robotize(var/mob/M in world) - set category = "Debug" - set name = "Robotize" + set category = "Admin" + set name = "Make Robot" if(!ticker) alert("Wait until the game starts") @@ -154,8 +155,8 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that /client/proc/cmd_admin_alienize(var/mob/M in world) - set category = "Debug" - set name = "Alienize" + set category = "Admin" + set name = "Make Alien" if(!ticker) alert("Wait until the game starts") @@ -167,8 +168,23 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that else alert("Invalid mob") +/client/proc/cmd_admin_monkeyize(var/mob/M in world) + set category = "Admin" + set name = "Make Monkey" + + if(!ticker) + alert("Wait until the game starts") + return + if(istype(M, /mob/living/carbon/human)) + var/mob/living/carbon/human/target = M + log_admin("[key_name(src)] is attempting to monkeyize [M.key].") + spawn(10) + target.monkeyize() + else + alert("Invalid mob") + /client/proc/cmd_admin_changelinginize(var/mob/M in world) - set category = "Debug" + set category = "Admin" set name = "Make Changeling" if(!ticker) @@ -183,7 +199,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that alert("Invalid mob") /client/proc/cmd_admin_abominize(var/mob/M in world) - set category = "Debug" + set category = "Admin" set name = "Make Abomination" usr << "Ruby Mode disabled. Command aborted." @@ -213,7 +229,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that message_admins("[key_name_admin(src)] has deleted all instances of [hsbitem].", 0) /client/proc/cmd_debug_tog_aliens() - set category = "Debug" + set category = "Special Verbs" set name = "Toggle Aliens" aliens_allowed = !aliens_allowed diff --git a/code/modules/admin/verbs/diagnostics.dm b/code/modules/admin/verbs/diagnostics.dm index 0af3bae1d8..20883ea631 100644 --- a/code/modules/admin/verbs/diagnostics.dm +++ b/code/modules/admin/verbs/diagnostics.dm @@ -1,6 +1,7 @@ /client/proc general_report() - set category = "Diagnostics" + set category = "Debug" + set name = "Show General Report" if(!master_controller) usr << alert("Master_controller not found.") @@ -21,7 +22,8 @@ usr << browse(output,"window=generalreport") air_report() - set category = "Diagnostics" + set category = "Debug" + set name = "Show Air Report" if(!master_controller || !air_master) alert(usr,"Master_controller or air_master not found.","Air Report") @@ -62,7 +64,8 @@ usr << browse(output,"window=airreport") air_status(turf/target as turf) - set category = "Diagnostics" + set category = "Debug" + set name = "Display Air Status" if(!isturf(target)) return @@ -79,8 +82,8 @@ usr << "[trace_gas.type]: [trace_gas.moles]" fix_next_move() - set category = "Diagnostics" - set name = "Press this if everybody freezes up" + set category = "Debug" + set name = "Unfreeze Everyone" var/largest_move_time = 0 var/largest_click_time = 0 var/mob/largest_move_mob = null diff --git a/code/modules/admin/verbs/playsound.dm b/code/modules/admin/verbs/playsound.dm index 3e3c7257ef..dc5c6fe06e 100644 --- a/code/modules/admin/verbs/playsound.dm +++ b/code/modules/admin/verbs/playsound.dm @@ -1,6 +1,6 @@ /client/proc/play_sound(S as sound) set category = "Special Verbs" - set name = "play sound" + set name = "Play Global Sound" //if(Debug2) if(!src.authenticated || !src.holder) diff --git a/code/modules/admin/verbs/pray.dm b/code/modules/admin/verbs/pray.dm index 890075c7b4..aa4e321cd8 100644 --- a/code/modules/admin/verbs/pray.dm +++ b/code/modules/admin/verbs/pray.dm @@ -1,6 +1,6 @@ /mob/verb/pray(msg as text) set category = "Commands" - set name = "Pray" + set name = "-Pray" if(!usr.client.authenticated) src << "Please authorize before sending these messages." return diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 047587f4cf..555bd4f249 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -18,7 +18,7 @@ message_admins("[key_name_admin(usr)] made [key_name_admin(M)] drop everything!", 1) /client/proc/cmd_admin_prison(mob/M as mob in world) - set category = "Special Verbs" + set category = "Admin" set name = "Prison" if(!src.authenticated || !src.holder) src << "Only administrators may use this command." @@ -97,7 +97,7 @@ message_admins("\blue \bold DirectNarrate: [key_name(usr)] to ([M.name]/[M.key]): [msg]
", 1) /client/proc/cmd_admin_pm(mob/M as mob in world) - set category = "Special Verbs" + set category = "Admin" set name = "Admin PM" if(!src.authenticated || !src.holder) src << "Only administrators may use this command." @@ -131,7 +131,7 @@ /client/proc/cmd_admin_godmode(mob/M as mob in world) set category = "Special Verbs" - set name = "Toggle Godmode" + set name = "Godmode" if(!src.authenticated || !src.holder) src << "Only administrators may use this command." return @@ -146,8 +146,8 @@ message_admins("[key_name_admin(usr)] has toggled [key_name_admin(M)]'s nodamage to [(M.nodamage ? "On" : "Off")]", 1) /client/proc/cmd_admin_mute(mob/M as mob in world) - set category = null - set name = "Toggle Mute" + set category = "Special Verbs" + set name = "Admin Mute" if(!src.authenticated || !src.holder) src << "Only administrators may use this command." return @@ -163,7 +163,7 @@ /client/proc/cmd_admin_add_random_ai_law() - set category = "Debug" + set category = "Admin" set name = "Add Random AI Law" if(!src.authenticated || !src.holder) src << "Only administrators may use this command." @@ -227,8 +227,8 @@ /client/proc/cmd_admin_add_freeform_ai_law() - set category = "Debug" - set name = "Add AI law" + set category = "Admin" + set name = "Add Custom AI law" if(!src.authenticated || !src.holder) src << "Only administrators may use this command." return @@ -315,7 +315,7 @@ message_admins("[key_name_admin(src)] has created a command report", 1) /client/proc/cmd_admin_delete(atom/O as obj|mob|turf in world) - set category = "Debug" + set category = "Admin" set name = "Delete" if (!src.authenticated || !src.holder) @@ -328,7 +328,7 @@ del(O) /client/proc/cmd_admin_list_occ() - set category = "Debug" + set category = "Admin" set name = "List OOC" if (!src.authenticated || !src.holder) @@ -358,7 +358,7 @@ M.gib() /client/proc/cmd_admin_gib_self() - set name = "gibself" + set name = "Gibself" set category = "Special Verbs" if (istype(src.mob, /mob/dead/observer)) // so they don't spam gibs everywhere return @@ -468,10 +468,50 @@ /client/proc/toggle_view_range() set category = "Special Verbs" - set name = "Toggle View Range" + set name = "Change View Range" set desc = "switches between 1x and custom views" if(src.view == world.view) src.view = input("Select view range:", "FUCK YE", 7) in list(1,2,3,4,5,6,7,8,9,10,11,12,13,14) else - src.view = world.view \ No newline at end of file + src.view = world.view + + + + +/client/proc/admin_call_shuttle() + + set category = "Admin" + set name = "Call Shuttle" + + if ((!( ticker ) || emergency_shuttle.location)) + return + + if (!src.authenticated || !src.holder) + src << "Only administrators may use this command." + return + + emergency_shuttle.incall() + world << "\blue Alert: The emergency shuttle has been called. It will arrive in [round(emergency_shuttle.timeleft()/60)] minutes." + world << sound('shuttlecalled.ogg') + + return + +/client/proc/admin_cancel_shuttle() + + set category = "Admin" + set name = "Cancel Shuttle" + + if ((!( ticker ) || emergency_shuttle.location || emergency_shuttle.direction == 0)) + return + + if (!src.authenticated || !src.holder) + src << "Only administrators may use this command." + return + + world << "\blue Alert: The shuttle is going back!" + world << sound('shuttlerecalled.ogg') + + emergency_shuttle.recall() + + return \ No newline at end of file diff --git a/code/modules/mob/dead/dead.dm b/code/modules/mob/dead/dead.dm deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/code/modules/mob/living/carbon/alien/alien.dm b/code/modules/mob/living/carbon/alien/alien.dm deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm index 86a7597399..79563f3f71 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm @@ -607,7 +607,7 @@ to clean it up, or just beat the shit out of it (which takes ages). if (src.stunned >= 3) src.stunned -= 3 if (src.weakened >= 3) src.weakened -= 3 for(var/mob/O in viewers(src, null)) - O.show_message(text("\blue The monkey shakes [src] trying to wake him up!", ), 1) + O.show_message(text("\blue [M.name] shakes [src] trying to wake him up!", ), 1) else if (istype(src.wear_mask, /obj/item/clothing/mask/muzzle)) return diff --git a/code/modules/mob/living/carbon/alien/larva/larva.dm b/code/modules/mob/living/carbon/alien/larva/larva.dm index 101beb25c2..ebc9cdf25f 100644 --- a/code/modules/mob/living/carbon/alien/larva/larva.dm +++ b/code/modules/mob/living/carbon/alien/larva/larva.dm @@ -389,7 +389,7 @@ to clean it up, or just beat the shit out of it (which takes ages). if (src.stunned >= 3) src.stunned -= 3 if (src.weakened >= 3) src.weakened -= 3 for(var/mob/O in viewers(src, null)) - O.show_message(text("\blue The monkey shakes [src] trying to wake him up!", ), 1) + O.show_message(text("\blue [M.name] shakes [src] trying to wake him up!", ), 1) else if (istype(src.wear_mask, /obj/item/clothing/mask/muzzle)) return diff --git a/code/modules/mob/living/carbon/alien/say.dm b/code/modules/mob/living/carbon/alien/say.dm index 931764bf5a..c430328ef2 100644 --- a/code/modules/mob/living/carbon/alien/say.dm +++ b/code/modules/mob/living/carbon/alien/say.dm @@ -18,7 +18,7 @@ /mob/living/carbon/alien/say_quote(var/text) // var/ending = copytext(text, length(text)) - return "hisses, \"[text]\""; + return "[src.say_message], \"[text]\""; /mob/living/proc/alien_talk(var/message) diff --git a/code/modules/mob/living/carbon/beast/examine.dm b/code/modules/mob/living/carbon/beast/examine.dm deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/code/modules/mob/living/carbon/beast/life.dm b/code/modules/mob/living/carbon/beast/life.dm deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/code/modules/mob/living/carbon/beast/login.dm b/code/modules/mob/living/carbon/beast/login.dm deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/code/modules/mob/living/carbon/beast/say.dm b/code/modules/mob/living/carbon/beast/say.dm deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 3a4ff8c42a..8ced9325f1 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -1179,7 +1179,7 @@ if (src.stunned >= 3) src.stunned -= 3 if (src.weakened >= 3) src.weakened -= 3 for(var/mob/O in viewers(src, null)) - O.show_message(text("\blue The monkey shakes [] trying to wake him up!", src), 1) + O.show_message(text("\blue [M.name] shakes [] trying to wake him up!", src), 1) else if (istype(src.wear_mask, /obj/item/clothing/mask/muzzle)) return diff --git a/code/modules/mob/living/carbon/monkey/say.dm b/code/modules/mob/living/carbon/monkey/say.dm index 7d0c6c29d4..03a500575b 100644 --- a/code/modules/mob/living/carbon/monkey/say.dm +++ b/code/modules/mob/living/carbon/monkey/say.dm @@ -1,2 +1,2 @@ /mob/living/carbon/monkey/say_quote(var/text) - return "chimpers, \"[text]\""; + return "[src.say_message], \"[text]\""; diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 51ed160ae6..afdaa72dfe 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -1277,6 +1277,7 @@ src.client.changes = 1 /mob/verb/succumb() + set name = "Succumb" set hidden = 1 if ((src.health < 0 && src.health > -95.0)) @@ -1525,6 +1526,7 @@ return /atom/movable/verb/pull() + set name = "Pull" set src in oview(1) if (!( usr )) @@ -1534,6 +1536,7 @@ return /atom/verb/examine() + set name = "Examine" set src in oview(12) //make it work from farther away if (!( usr )) diff --git a/code/modules/mob/say.dm b/code/modules/mob/say.dm index 85052bcdbb..955f1fc3a2 100644 --- a/code/modules/mob/say.dm +++ b/code/modules/mob/say.dm @@ -2,10 +2,11 @@ return /mob/verb/whisper() + set name = "Whisper" return /mob/verb/say_verb(message as text) - set name = "say" + set name = "Say" usr.say(message) /mob/proc/say_dead(var/message) diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm index d90762ede2..20271bd5be 100644 --- a/code/modules/mob/transform_procs.dm +++ b/code/modules/mob/transform_procs.dm @@ -37,12 +37,7 @@ O.loc = src.loc O.a_intent = "hurt" O << "You are now a monkey." - /* - if (ticker.mode.name == "monkey") - O << "Don't be angry at the source as now you are just like him so deal with it." - O << "Follow your objective." - //SN src = null - */ + del(src) return diff --git a/code/modules/power/portable.dm b/code/modules/power/portable.dm deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/code/unused/modules/admin/ban.dm b/code/unused/modules/admin/ban.dm deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/goonstation.dme b/goonstation.dme index 1728805b55..e24a47f9f0 100644 --- a/goonstation.dme +++ b/goonstation.dme @@ -88,8 +88,6 @@ #define FILE_DIR "code/modules/power" #define FILE_DIR "code/modules/power/antimatter" #define FILE_DIR "code/unused" -#define FILE_DIR "code/unused/modules" -#define FILE_DIR "code/unused/modules/admin" #define FILE_DIR "code/WorkInProgress" #define FILE_DIR "code/WorkInProgress/computer2" #define FILE_DIR "code/WorkInProgress/optics" @@ -155,7 +153,6 @@ #include "code\ATMOSPHERICS\components\unary\vent_pump.dm" #include "code\ATMOSPHERICS\components\unary\vent_scrubber.dm" #include "code\datums\ai_laws.dm" -#include "code\datums\chemical.dm" #include "code\datums\computerfiles.dm" #include "code\datums\configuration.dm" #include "code\datums\datumvars.dm" @@ -192,7 +189,6 @@ #include "code\defines\mob\living\carbon\alien_humanoid.dm" #include "code\defines\mob\living\carbon\alien_larva.dm" #include "code\defines\mob\living\carbon\carbon.dm" -#include "code\defines\mob\living\carbon\changeling.dm" #include "code\defines\mob\living\carbon\human.dm" #include "code\defines\mob\living\carbon\monkey.dm" #include "code\defines\mob\living\silicon\ai.dm" @@ -347,7 +343,6 @@ #include "code\game\machinery\computer\communications.dm" #include "code\game\machinery\computer\computer.dm" #include "code\game\machinery\computer\crew.dm" -#include "code\game\machinery\computer\engine.dm" #include "code\game\machinery\computer\hologram.dm" #include "code\game\machinery\computer\medical.dm" #include "code\game\machinery\computer\Operating.dm" @@ -361,7 +356,6 @@ #include "code\game\machinery\doors\door.dm" #include "code\game\machinery\doors\firedoor.dm" #include "code\game\machinery\doors\poddoor.dm" -#include "code\game\machinery\doors\shuttledoor.dm" #include "code\game\machinery\doors\windowdoor.dm" #include "code\game\machinery\embedded_controller\access_controller.dm" #include "code\game\machinery\embedded_controller\airlock_controller.dm" @@ -424,7 +418,6 @@ #include "code\game\objects\closets\secure\security.dm" #include "code\game\objects\devices\aicard.dm" #include "code\game\objects\devices\chameleonproj.dm" -#include "code\game\objects\devices\device.dm" #include "code\game\objects\devices\flash.dm" #include "code\game\objects\devices\flashlight.dm" #include "code\game\objects\devices\igniter.dm" @@ -491,7 +484,6 @@ #include "code\game\verbs\ai_lockdown.dm" #include "code\game\verbs\AI_status.dm" #include "code\game\verbs\authorize.dm" -#include "code\game\verbs\begin.dm" #include "code\game\verbs\checkkarma.dm" #include "code\game\verbs\ooc.dm" #include "code\game\verbs\suicide.dm" @@ -521,12 +513,10 @@ #include "code\modules\mob\organs.dm" #include "code\modules\mob\say.dm" #include "code\modules\mob\transform_procs.dm" -#include "code\modules\mob\dead\dead.dm" #include "code\modules\mob\dead\observer\hud.dm" #include "code\modules\mob\dead\observer\login.dm" #include "code\modules\mob\dead\observer\observer.dm" #include "code\modules\mob\dead\observer\say.dm" -#include "code\modules\mob\living\living.dm" #include "code\modules\mob\living\say.dm" #include "code\modules\mob\living\carbon\carbon.dm" #include "code\modules\mob\living\carbon\alien\alien.dm" @@ -549,10 +539,6 @@ #include "code\modules\mob\living\carbon\beast\beast.dm" #include "code\modules\mob\living\carbon\beast\bodypart.dm" #include "code\modules\mob\living\carbon\beast\death.dm" -#include "code\modules\mob\living\carbon\beast\examine.dm" -#include "code\modules\mob\living\carbon\beast\life.dm" -#include "code\modules\mob\living\carbon\beast\login.dm" -#include "code\modules\mob\living\carbon\beast\say.dm" #include "code\modules\mob\living\carbon\human\death.dm" #include "code\modules\mob\living\carbon\human\emote.dm" #include "code\modules\mob\living\carbon\human\examine.dm" @@ -614,7 +600,6 @@ #include "code\modules\power\generator_type2.dm" #include "code\modules\power\lighting.dm" #include "code\modules\power\port_gen.dm" -#include "code\modules\power\portable.dm" #include "code\modules\power\power.dm" #include "code\modules\power\sd_DynamicAreaLighting.dm" #include "code\modules\power\smes.dm"