mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-23 12:07:27 +01:00
TG: Runtime fixes
Moved delete to trial admins because they can already mass delete and that's not particularly as helpful as regular delete (but a lot more destructive) Trialmins can now toggle adminhelp sounds without observing Revision: r3397 Author: quartz235
This commit is contained in:
@@ -53,7 +53,6 @@
|
||||
// Debug
|
||||
verbs += /client/proc/debug_variables
|
||||
verbs += /client/proc/cmd_modify_ticker_variables
|
||||
verbs += /client/proc/toggleadminhelpsound
|
||||
// Admin helpers
|
||||
verbs += /client/proc/toggle_view_range
|
||||
// Admin game intrusion
|
||||
@@ -65,6 +64,7 @@
|
||||
verbs += /client/proc/jumptomob
|
||||
verbs += /client/proc/jumptoturf
|
||||
verbs += /client/proc/jumptocoord
|
||||
verbs += /client/proc/cmd_admin_delete
|
||||
verbs += /client/proc/cmd_admin_add_freeform_ai_law
|
||||
verbs += /client/proc/cmd_admin_rejuvenate
|
||||
verbs += /client/proc/cmd_admin_drop_everything
|
||||
@@ -121,6 +121,8 @@
|
||||
|
||||
//Moderator
|
||||
if (holder.level >= 0)
|
||||
verbs += /obj/admins/proc/announce
|
||||
verbs += /obj/admins/proc/startnow
|
||||
verbs += /obj/admins/proc/toggleAI //Toggle the AI
|
||||
verbs += /obj/admins/proc/toggleenter //Toggle enterting
|
||||
// verbs += /obj/admins/proc/toggleguests //Toggle guests entering
|
||||
@@ -136,8 +138,6 @@
|
||||
verbs += /client/proc/cmd_admin_pm_panel
|
||||
verbs += /client/proc/cmd_admin_subtle_message
|
||||
verbs += /client/proc/warn
|
||||
verbs += /obj/admins/proc/announce
|
||||
verbs += /obj/admins/proc/startnow
|
||||
verbs += /client/proc/dsay
|
||||
verbs += /client/proc/admin_play
|
||||
verbs += /client/proc/admin_observe
|
||||
@@ -196,6 +196,7 @@
|
||||
verbs += /client/proc/toggleprayers
|
||||
verbs += /client/proc/deadmin_self
|
||||
verbs += /client/proc/tension_report
|
||||
verbs += /client/proc/toggleadminhelpsound
|
||||
verbs += /proc/possess
|
||||
verbs += /proc/release
|
||||
verbs += /client/proc/admin_deny_shuttle
|
||||
|
||||
@@ -840,12 +840,13 @@
|
||||
if(!reagents.total_volume)
|
||||
var/mob/M = usr
|
||||
var/obj/item/weapon/paper/paper = locate() in src
|
||||
M.visible_message( \
|
||||
"\blue [M] takes a piece of paper from the cookie!", \
|
||||
"\blue You take a piece of paper from the cookie! Read it!" \
|
||||
)
|
||||
M.put_in_hand(paper)
|
||||
paper.add_fingerprint(M)
|
||||
if(paper)
|
||||
M.visible_message( \
|
||||
"\blue [M] takes a piece of paper from the cookie!", \
|
||||
"\blue You take a piece of paper from the cookie! Read it!" \
|
||||
)
|
||||
M.put_in_hand(paper)
|
||||
paper.add_fingerprint(M)
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/badrecipe
|
||||
name = "Burned mess"
|
||||
|
||||
@@ -2425,7 +2425,7 @@ It can still be worn/put on as normal.
|
||||
var/obj/item/device/pda/pda = wear_id
|
||||
var/obj/item/weapon/card/id/id = wear_id
|
||||
if (istype(pda))
|
||||
if (pda.id)
|
||||
if (pda.id && istype(pda.id, /obj/item/weapon/card/id))
|
||||
. = pda.id.assignment
|
||||
else
|
||||
. = pda.ownjob
|
||||
|
||||
@@ -89,6 +89,8 @@
|
||||
|
||||
|
||||
/obj/item/weapon/grab/proc/s_click(obj/screen/S as obj)
|
||||
if (!affecting)
|
||||
return
|
||||
if (assailant.next_move > world.time)
|
||||
return
|
||||
if ((!( assailant.canmove ) || assailant.lying))
|
||||
|
||||
@@ -545,6 +545,8 @@ datum/preferences
|
||||
|
||||
|
||||
proc/process_link(mob/user, list/link_tags)
|
||||
if(!usr)
|
||||
return
|
||||
if(link_tags["occ"])
|
||||
if(link_tags["cancel"])
|
||||
user << browse(null, "window=\ref[user]occupation")
|
||||
|
||||
+13
-12
@@ -876,18 +876,19 @@
|
||||
malfai.malfhack = src
|
||||
malfai.malfhacking = 1
|
||||
sleep(600)
|
||||
if (!src.aidisabled)
|
||||
malfai.malfhack = null
|
||||
malfai.malfhacking = 0
|
||||
if (ticker.mode.config_tag == "malfunction")
|
||||
if (src.z == 1) //if (is_type_in_list(get_area(src), the_station_areas))
|
||||
ticker.mode:apcs++
|
||||
if(usr:parent)
|
||||
src.malfai = usr:parent
|
||||
else
|
||||
src.malfai = usr
|
||||
malfai << "Hack complete. The APC is now under your exclusive control."
|
||||
updateicon()
|
||||
if(src)
|
||||
if (!src.aidisabled)
|
||||
malfai.malfhack = null
|
||||
malfai.malfhacking = 0
|
||||
if (ticker.mode.config_tag == "malfunction")
|
||||
if (src.z == 1) //if (is_type_in_list(get_area(src), the_station_areas))
|
||||
ticker.mode:apcs++
|
||||
if(usr:parent)
|
||||
src.malfai = usr:parent
|
||||
else
|
||||
src.malfai = usr
|
||||
malfai << "Hack complete. The APC is now under your exclusive control."
|
||||
updateicon()
|
||||
|
||||
else if (href_list["occupyapc"])
|
||||
malfoccupy(usr)
|
||||
|
||||
Reference in New Issue
Block a user