-
Notifications
You must be signed in to change notification settings - Fork 31
Conversation
Я уже 4 раза конфикты чинил, какого фига |
Короче пусть Васелон допиливает |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Раб словообразуется от работа
//RUTGMC EDIT BEGIN | ||
if(!CONFIG_GET(flag/use_exp_restrictions)) //ADDITION | ||
return FALSE //ADDITION | ||
//RUTGMC EDIT END |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Неправильно стилизовано, //RUTGMC EDIT BEGIN в самый низ, табов ему не надо, а //ADDITION убрать
if(!SSdbcore.Connect()) | ||
return FALSE | ||
if(!exp_requirements || !exp_type) | ||
return FALSE | ||
//RUTGMC EDIT BEGIN | ||
/* |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
В одну строчку
if(CONFIG_GET(flag/use_exp_restrictions_admin_bypass) && check_other_rights(C, R_ADMIN, FALSE)) | ||
return FALSE | ||
/* //ORIGINAL |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
зачем еще раз коментнул? после /* добавил //
@@ -44,7 +57,8 @@ GLOBAL_PROTECT(exp_to_update) | |||
if(!CONFIG_GET(flag/use_exp_restrictions_other) && !(job.job_flags & JOB_FLAG_ISCOMMAND)) | |||
return FALSE | |||
return TRUE | |||
|
|||
*/ | |||
//RUTGMC EDIT END |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Окончание есть, !на доп строчке!, а оглавления нету!
@@ -115,13 +129,22 @@ GLOBAL_PROTECT(exp_to_update) | |||
for(var/j in SSjob.joinable_occupations) | |||
var/datum/job/job = j | |||
if(job.exp_requirements && job.exp_type) | |||
//RUTGMC EDIT BEGIN | |||
/* |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Тоже самое что и с другим
@@ -262,7 +262,11 @@ | |||
return FALSE | |||
var/datum/job/xenojob = SSjob.GetJobType(/datum/job/xenomorph/queen) | |||
if(xenojob.required_playtime_remaining(client)) | |||
to_chat(src, span_warning("[get_exp_format(xenojob.required_playtime_remaining(client))] as [xenojob.get_exp_req_type()] required to play queen like roles.")) | |||
//RUTGMC EDIT BEGIN | |||
//ORIGINAL |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
читабельность 0, слишком много строчек под комиты, не нужные
/datum/outfit/job/command/captain | ||
belt = /obj/item/storage/holster/blade/officer/sabre/full | ||
glasses = /obj/item/clothing/glasses/sunglasses/aviator/yellow | ||
head = null |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
?
GLOBAL_LIST_INIT(jobs_support, list(PILOT_OFFICER, MECH_PILOT, REQUISITIONS_OFFICER, SYNTHETIC, SILICON_AI)) | ||
GLOBAL_LIST_INIT(jobs_engineering, list(CHIEF_SHIP_ENGINEER, SHIP_TECH)) | ||
GLOBAL_LIST_INIT(jobs_engineering, list(CHIEF_SHIP_ENGINEER, SHIP_TECH, SQUAD_ENGINEER)) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ГДЕ РАЗДЕЛЕНИЕ НА ОРИГИНАЛ И ЭДИТ? ПОЧЕМУ НЕ В ОТДЕЛЬНОМ ФАЙЛЕ?
Переоткрыл пр, нужно решить проблему с таймлоками, код Васелона не работает вроде