cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Vorestation edit fixes

Browse Source
This commit is contained in:
Aronai Sieyes
2020-03-15 15:17:27 -04:00
parent cb8548f5af
commit 9bbfd211a3
3 changed files with 3 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/modules/admin/admin_verbs.dm
View File

@@ -363,14 +363,8 @@ var/list/admin_verbs_mod = list(
/datum/admins/proc/view_atk_log //shows the server combat-log, doesn't do anything presently, /datum/admins/proc/view_atk_log //shows the server combat-log, doesn't do anything presently,
) )
//VOREStation Edit Start - Highly Modified List
var/list/admin_verbs_event_manager = list( var/list/admin_verbs_event_manager = list(
<<<<<<< HEAD /client/proc/cmd_admin_say, //VOREStation Edit - Event managers can use asay,
/client/proc/cmd_admin_say, //admin-only ooc chat,
/client/proc/cmd_mod_say,
/client/proc/cmd_event_say
=======
/client/proc/cmd_event_say,
/client/proc/cmd_admin_pm_context, /client/proc/cmd_admin_pm_context,
/client/proc/cmd_admin_pm_panel, /client/proc/cmd_admin_pm_panel,
/client/proc/admin_ghost, /client/proc/admin_ghost,

4
code/modules/admin/verbs/adminjump.dm
View File

@@ -39,13 +39,9 @@
/client/proc/jumptomob(var/mob/M in mob_list) /client/proc/jumptomob(var/mob/M in mob_list)
set category = "Admin" set category = "Admin"
set name = "Jump to Mob" set name = "Jump to Mob"
<<<<<<< HEAD
set popup_menu = FALSE //VOREStation Edit - Declutter. set popup_menu = FALSE //VOREStation Edit - Declutter.
if(!check_rights(R_ADMIN|R_MOD|R_DEBUG))
=======
if(!check_rights(R_ADMIN|R_MOD|R_DEBUG|R_EVENT)) if(!check_rights(R_ADMIN|R_MOD|R_DEBUG|R_EVENT))
>>>>>>> 0021a3b... Merge pull request #6818 from Neerti/event_manager_fix_electric_boogaloo
return return
if(config.allow_admin_jump) if(config.allow_admin_jump)

12
code/modules/client/preference_setup/general/03_body.dm
View File

@@ -398,11 +398,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
else else
return TOPIC_NOACTION return TOPIC_NOACTION
<<<<<<< HEAD if(((!(setting_species.spawn_flags & SPECIES_CAN_JOIN)) || (!is_alien_whitelisted(preference_mob(),setting_species))) && !check_rights(R_ADMIN|R_EVENT, 0) && !(setting_species.spawn_flags & SPECIES_WHITELIST_SELECTABLE)) //VOREStation Edit: selectability
if(((!(setting_species.spawn_flags & SPECIES_CAN_JOIN)) || (!is_alien_whitelisted(preference_mob(),setting_species))) && !check_rights(R_ADMIN, 0) && !(setting_species.spawn_flags & SPECIES_WHITELIST_SELECTABLE)) //VOREStation Edit: selectability
=======
if(((!(setting_species.spawn_flags & SPECIES_CAN_JOIN)) || (!is_alien_whitelisted(preference_mob(),setting_species))) && !check_rights(R_ADMIN|R_EVENT, 0))
>>>>>>> 0021a3b... Merge pull request #6818 from Neerti/event_manager_fix_electric_boogaloo
return TOPIC_NOACTION return TOPIC_NOACTION
var/prev_species = pref.species var/prev_species = pref.species
@@ -898,11 +894,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
dat += "<font color='red'><b>You cannot play as this species.</br><small>If you wish to be whitelisted, you can make an application post on <a href='?src=\ref[user];preference=open_whitelist_forum'>the forums</a>.</small></b></font></br>" dat += "<font color='red'><b>You cannot play as this species.</br><small>If you wish to be whitelisted, you can make an application post on <a href='?src=\ref[user];preference=open_whitelist_forum'>the forums</a>.</small></b></font></br>"
else if(restricted == 2) else if(restricted == 2)
dat += "<font color='red'><b>You cannot play as this species.</br><small>This species is not available for play as a station race..</small></b></font></br>" dat += "<font color='red'><b>You cannot play as this species.</br><small>This species is not available for play as a station race..</small></b></font></br>"
<<<<<<< HEAD if(!restricted || check_rights(R_ADMIN|R_EVENT, 0) || current_species.spawn_flags & SPECIES_WHITELIST_SELECTABLE) //VOREStation Edit: selectability
if(!restricted || check_rights(R_ADMIN, 0) || current_species.spawn_flags & SPECIES_WHITELIST_SELECTABLE) //VOREStation Edit: selectability
=======
if(!restricted || check_rights(R_ADMIN|R_EVENT, 0))
>>>>>>> 0021a3b... Merge pull request #6818 from Neerti/event_manager_fix_electric_boogaloo
dat += "\[<a href='?src=\ref[src];set_species=[pref.species_preview]'>select</a>\]" dat += "\[<a href='?src=\ref[src];set_species=[pref.species_preview]'>select</a>\]"
dat += "</center></body>" dat += "</center></body>"