This repository has been archived by the owner on Aug 21, 2024. It is now read-only.
Timelocks [SEMI-MODULAR] #28
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Я уже 4 раза конфикты чинил, какого фига |
|
Короче пусть Васелон допиливает |
blackcrystall
suggested changes
Jan 6, 2024
| //RUTGMC EDIT BEGIN | ||
| if(!CONFIG_GET(flag/use_exp_restrictions)) //ADDITION | ||
| return FALSE //ADDITION | ||
| //RUTGMC EDIT END |
There was a problem hiding this comment.
Неправильно стилизовано, //RUTGMC EDIT BEGIN в самый низ, табов ему не надо, а //ADDITION убрать
| if(!SSdbcore.Connect()) | ||
| return FALSE | ||
| if(!exp_requirements || !exp_type) | ||
| return FALSE | ||
| //RUTGMC EDIT BEGIN | ||
| /* |
| 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.
зачем еще раз коментнул? после /* добавил //
| @@ -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.
Окончание есть, !на доп строчке!, а оглавления нету!
| @@ -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 | |||
| /* | |||
| @@ -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.
читабельность 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 |
| 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.
ГДЕ РАЗДЕЛЕНИЕ НА ОРИГИНАЛ И ЭДИТ? ПОЧЕМУ НЕ В ОТДЕЛЬНОМ ФАЙЛЕ?
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Переоткрыл пр, нужно решить проблему с таймлоками, код Васелона не работает вроде