-
-
Notifications
You must be signed in to change notification settings - Fork 419
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Погребок #12282
Closed
DarthSidiousPalpatine
wants to merge
50
commits into
TauCetiStation:master
from
DarthSidiousPalpatine:preparation_rack
Closed
Погребок #12282
Changes from 31 commits
Commits
Show all changes
50 commits
Select commit
Hold shift + click to select a range
49fe23e
ГОТОВО, НЕВЕРОЯТНО
DarthSidiousPalpatine 1bdb7cb
Merge remote-tracking branch 'upstream/master' into preparation_rack
DarthSidiousPalpatine 8820428
Update preservation.dm
DarthSidiousPalpatine 6ab37bb
Update preservation.dm
DarthSidiousPalpatine a52ec35
небольшая переделка карт
DarthSidiousPalpatine ea0d265
Revert "небольшая переделка карт"
DarthSidiousPalpatine 39972b8
Update preservation.dm
DarthSidiousPalpatine b9f375a
Update preservation.dm
DarthSidiousPalpatine 483932f
Update preservation.dm
DarthSidiousPalpatine 1b9813b
Update preservation.dm
DarthSidiousPalpatine ad9954f
Update preservation.dm
DarthSidiousPalpatine de3f45e
g
DarthSidiousPalpatine 9e054c3
Готово
DarthSidiousPalpatine 99f8ab8
Delete roundstart_roundend.dm
DarthSidiousPalpatine 8302870
Update taucetistation.dme
DarthSidiousPalpatine 04434e2
Update continuity.dm
DarthSidiousPalpatine 7af6da1
a
DarthSidiousPalpatine bb697d1
Update packs.dm
DarthSidiousPalpatine 9ea22c1
Update preservation.dm
DarthSidiousPalpatine 3cf7ef7
Merge branch 'master' into preparation_rack
DarthSidiousPalpatine a7dcf6e
Merge branch 'master' into preparation_rack
DarthSidiousPalpatine 02c3643
Merge branch 'master' into preparation_rack
DarthSidiousPalpatine 1388b15
Update continuity.dm
DarthSidiousPalpatine 574e5df
Update continuity.dm
DarthSidiousPalpatine 97c185d
Update Chemistry-Recipes.dm
DarthSidiousPalpatine 7dacce8
s
DarthSidiousPalpatine f9bcc67
Merge remote-tracking branch 'upstream/master' into preparation_rack
DarthSidiousPalpatine 72200e8
Update boxstation.dmm
DarthSidiousPalpatine bfc72c1
Update boxstation.dmm
DarthSidiousPalpatine 4a01240
Update boxstation.dmm
DarthSidiousPalpatine 982d6d2
Update boxstation.dmm
DarthSidiousPalpatine e88b7bc
ф
DarthSidiousPalpatine 2fd7d53
Вишенка на торте
DarthSidiousPalpatine ac9beeb
Merge remote-tracking branch 'upstream/master' into preparation_rack
DarthSidiousPalpatine 65c3060
Update preservation.dm
DarthSidiousPalpatine a1cf9e4
Готово. Исправил всякое, добавил компост и компостер.
DarthSidiousPalpatine d7361f0
Добавил компостеры на карты.
DarthSidiousPalpatine 371b12d
Update preservation.dm
DarthSidiousPalpatine fac76df
Update preservation.dm
DarthSidiousPalpatine b95b348
Update preservation.dm
DarthSidiousPalpatine 599c662
Update preservation.dm
DarthSidiousPalpatine 6ce8dfe
Update preservation.dm
DarthSidiousPalpatine ea1a276
Пофиксил багулю. Теперь всё работает отлично.
DarthSidiousPalpatine bedef29
Убрал логи что были нужны для тестирования.
DarthSidiousPalpatine 2e9df0f
Если честно, работает даже лучше.
DarthSidiousPalpatine 116fe2b
я не пью
DarthSidiousPalpatine ff706de
Update can_be_saved.dm
DarthSidiousPalpatine 671b692
Убрал датумы в отдельный файл
DarthSidiousPalpatine 778646b
переименовал под имя системы - континуити
DarthSidiousPalpatine a991f80
Update taucetistation.dme
DarthSidiousPalpatine File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
SUBSYSTEM_DEF(continuity) | ||
name = "Continuity" | ||
init_order = SS_INIT_DEFAULT | ||
flags = SS_NO_FIRE | ||
|
||
/datum/controller/subsystem/continuity/proc/read_files() | ||
for(var/datum/continuity_object/object in subtypesof(/datum/continuity_object)) | ||
if(!object.filename) | ||
continue | ||
var/savefile/S = new /savefile("[PERSISTENT_CACHE_FOLDER]/[object.filename].sav") | ||
object.load(S) | ||
|
||
/datum/controller/subsystem/continuity/proc/write_files() | ||
for(var/datum/continuity_object/object in subtypesof(/datum/continuity_object)) | ||
if(!object.filename) | ||
continue | ||
var/savefile/S = new /savefile("[PERSISTENT_CACHE_FOLDER]/[object.filename].sav") | ||
object.save(S) | ||
|
||
// Add new subtype of this datum to include your object into continuity subsystem. | ||
/datum/continuity_object | ||
var/filename = null | ||
|
||
/datum/continuity_object/proc/load(savefile/S) | ||
return | ||
|
||
/datum/continuity_object/proc/save(savefile/S) | ||
return |
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -802,3 +802,9 @@ | |
animate(visual, pixel_x = (tile.x - our_tile.x) * world.icon_size + pointed_atom.pixel_x, pixel_y = (tile.y - our_tile.y) * world.icon_size + pointed_atom.pixel_y, time = 1.7, easing = EASE_OUT) | ||
|
||
return TRUE | ||
|
||
/atom/proc/continuity_read(list/arguments) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Сейчас система полностью хендлит всё:
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @volas Впиши своё мнение если не утрудняет пожалуйста, я в сомнениях. |
||
return | ||
|
||
/atom/proc/continuity_write() | ||
return "" |
Oops, something went wrong.
Oops, something went wrong.
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.
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.
@volas Я бы не называл это _object потому-что тогда выглядит будто это к конкретному (одному) объекту сохранение, а это для целой категории вещей