shiptraits attempt2 #337
Merged
shiptraits attempt2 #337
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
ImJustKisik
added a commit
to ImJustKisik/Baystation12
that referenced
this pull request
Aug 29, 2022
ImJustKisik
added a commit
to ImJustKisik/Baystation12
that referenced
this pull request
Aug 29, 2022
ImJustKisik
added a commit
to ImJustKisik/Baystation12
that referenced
this pull request
Sep 2, 2022
overmap flags pt 1 Missiles, baby admin missiles and misc stuff Update thruster.dm sonar like sensors classes changes da skyrat connected computers disstres button Identify me, scanner-sempai~ я хочу умереть update update Feat: ship traits (ss220-space#337)
ImJustKisik
added a commit
to ImJustKisik/Baystation12
that referenced
this pull request
Sep 2, 2022
overmap flags pt 1 Missiles, baby admin missiles and misc stuff Update thruster.dm sonar like sensors classes changes da skyrat connected computers disstres button Identify me, scanner-sempai~ я хочу умереть update update Feat: ship traits (ss220-space#337) ракетки мои ракетки
ImJustKisik
added a commit
to ImJustKisik/Baystation12
that referenced
this pull request
Sep 23, 2022
overmap flags pt 1 Missiles, baby admin missiles and misc stuff Update thruster.dm sonar like sensors classes changes da skyrat connected computers disstres button Identify me, scanner-sempai~ я хочу умереть update update Feat: ship traits (ss220-space#337) ракетки мои ракетки
ImJustKisik
added a commit
to ImJustKisik/Baystation12
that referenced
this pull request
Oct 4, 2022
Pizdec ракеты мои ракеты overmap flags pt 1 Missiles, baby admin missiles and misc stuff Update thruster.dm sonar like sensors classes changes da skyrat connected computers disstres button Identify me, scanner-sempai~ я хочу умереть update update Feat: ship traits (ss220-space#337) ракетки мои ракетки Update sensors.dm апдейты фиксы да doors plus decor ракеты мои ракеты overmap flags pt 1 Missiles, baby admin missiles and misc stuff Update thruster.dm sonar like sensors classes changes da skyrat connected computers disstres button Identify me, scanner-sempai~ я хочу умереть update update Feat: ship traits (ss220-space#337) ракетки мои ракетки Update sensors.dm апдейты фиксы да doors plus decor cigs RPG missile launcher RPG for ICCG конфликты иконок обожаю Content cigs RPG for ICCG конфликты иконок обожаю Update missile_equipment.dm Update overmap.dmi Revert "Content" This reverts commit 106263e. desc's sensors updates another_portion_of_fixes desc's sensors updates Merge branch 'ship' into pizdec Merge pull request #10 from LordNest/pizdec Pizdec SNZ_fix Merge branch 'pizdec' of https://github.com/LordNest/Baystation12 into pizdec Minor_fixes Я_ЭТО_Починил Merge pull request #11 from LordNest/pizdec SNZ_teper'_rabotaet sexual perversions with smes Some emissive objects now have overlays that light over the lighting plane. da sexual perversions with smes Some emissive objects now have overlays that light over the lighting plane. da fix Merge pull request #6 from ImJustKisik/pizdec Pizdec-2 SNZ_fixes Merge pull request #12 from LordNest/pizdec SNZ_Incident TCOMS Merge pull request #7 from ImJustKisik/ship Ship clothing_fixes ICCGN faction Pulls terran stuff out of maps/torch, gives it a facelift and sets it up in the packs/faction_iccgn dir to help with multi map inclusion. Adds iccgn patches, badges, ranks, utility jacket Crew_and_hangar_fixes По причине того, что злоебучие шлюзы отказываются воспринимать шаттл, шаттл был убран в ангар, а над мостиком надстроена подстилка под ангар Merge pull request #13 from LordNest/pizdec SNZ_Hangar Update vending.dm
ImJustKisik
added a commit
to ImJustKisik/Baystation12
that referenced
this pull request
Oct 4, 2022
Pizdec ракеты мои ракеты overmap flags pt 1 Missiles, baby admin missiles and misc stuff Update thruster.dm sonar like sensors classes changes da skyrat connected computers disstres button Identify me, scanner-sempai~ я хочу умереть update update Feat: ship traits (ss220-space#337) ракетки мои ракетки Update sensors.dm апдейты фиксы да doors plus decor ракеты мои ракеты overmap flags pt 1 Missiles, baby admin missiles and misc stuff Update thruster.dm sonar like sensors classes changes da skyrat connected computers disstres button Identify me, scanner-sempai~ я хочу умереть update update Feat: ship traits (ss220-space#337) ракетки мои ракетки Update sensors.dm апдейты фиксы да doors plus decor cigs RPG missile launcher RPG for ICCG конфликты иконок обожаю Content cigs RPG for ICCG конфликты иконок обожаю Update missile_equipment.dm Update overmap.dmi Revert "Content" This reverts commit 106263e. desc's sensors updates another_portion_of_fixes desc's sensors updates Merge branch 'ship' into pizdec Merge pull request #10 from LordNest/pizdec Pizdec SNZ_fix Merge branch 'pizdec' of https://github.com/LordNest/Baystation12 into pizdec Minor_fixes Я_ЭТО_Починил Merge pull request #11 from LordNest/pizdec SNZ_teper'_rabotaet sexual perversions with smes Some emissive objects now have overlays that light over the lighting plane. da sexual perversions with smes Some emissive objects now have overlays that light over the lighting plane. da fix Merge pull request #6 from ImJustKisik/pizdec Pizdec-2 SNZ_fixes Merge pull request #12 from LordNest/pizdec SNZ_Incident TCOMS Merge pull request #7 from ImJustKisik/ship Ship clothing_fixes ICCGN faction Pulls terran stuff out of maps/torch, gives it a facelift and sets it up in the packs/faction_iccgn dir to help with multi map inclusion. Adds iccgn patches, badges, ranks, utility jacket Crew_and_hangar_fixes По причине того, что злоебучие шлюзы отказываются воспринимать шаттл, шаттл был убран в ангар, а над мостиком надстроена подстилка под ангар Merge pull request #13 from LordNest/pizdec SNZ_Hangar Update vending.dm
ImJustKisik
added a commit
to ImJustKisik/Baystation12
that referenced
this pull request
Oct 4, 2022
overmap flags pt 1 Missiles, baby admin missiles and misc stuff Update thruster.dm sonar like sensors classes changes da skyrat connected computers disstres button Identify me, scanner-sempai~ я хочу умереть update update Feat: ship traits (ss220-space#337) ракетки мои ракетки
ImJustKisik
added a commit
to ImJustKisik/Baystation12
that referenced
this pull request
Oct 4, 2022
Pizdec ракеты мои ракеты overmap flags pt 1 Missiles, baby admin missiles and misc stuff Update thruster.dm sonar like sensors classes changes da skyrat connected computers disstres button Identify me, scanner-sempai~ я хочу умереть update update Feat: ship traits (ss220-space#337) ракетки мои ракетки Update sensors.dm апдейты фиксы да doors plus decor ракеты мои ракеты overmap flags pt 1 Missiles, baby admin missiles and misc stuff Update thruster.dm sonar like sensors classes changes da skyrat connected computers disstres button Identify me, scanner-sempai~ я хочу умереть update update Feat: ship traits (ss220-space#337) ракетки мои ракетки Update sensors.dm апдейты фиксы да doors plus decor cigs RPG missile launcher RPG for ICCG конфликты иконок обожаю Content cigs RPG for ICCG конфликты иконок обожаю Update missile_equipment.dm Update overmap.dmi Revert "Content" This reverts commit 106263e. desc's sensors updates another_portion_of_fixes desc's sensors updates Merge branch 'ship' into pizdec Merge pull request #10 from LordNest/pizdec Pizdec SNZ_fix Merge branch 'pizdec' of https://github.com/LordNest/Baystation12 into pizdec Minor_fixes Я_ЭТО_Починил Merge pull request #11 from LordNest/pizdec SNZ_teper'_rabotaet sexual perversions with smes Some emissive objects now have overlays that light over the lighting plane. da sexual perversions with smes Some emissive objects now have overlays that light over the lighting plane. da fix Merge pull request #6 from ImJustKisik/pizdec Pizdec-2 SNZ_fixes Merge pull request #12 from LordNest/pizdec SNZ_Incident TCOMS Merge pull request #7 from ImJustKisik/ship Ship clothing_fixes ICCGN faction Pulls terran stuff out of maps/torch, gives it a facelift and sets it up in the packs/faction_iccgn dir to help with multi map inclusion. Adds iccgn patches, badges, ranks, utility jacket Crew_and_hangar_fixes По причине того, что злоебучие шлюзы отказываются воспринимать шаттл, шаттл был убран в ангар, а над мостиком надстроена подстилка под ангар Merge pull request #13 from LordNest/pizdec SNZ_Hangar Update vending.dm
Bizzonium
pushed a commit
that referenced
this pull request
Dec 22, 2022
* Yeah, squash it~ Pizdec ракеты мои ракеты overmap flags pt 1 Missiles, baby admin missiles and misc stuff Update thruster.dm sonar like sensors classes changes da skyrat connected computers disstres button Identify me, scanner-sempai~ я хочу умереть update update Feat: ship traits (#337) ракетки мои ракетки Update sensors.dm апдейты фиксы да doors plus decor ракеты мои ракеты overmap flags pt 1 Missiles, baby admin missiles and misc stuff Update thruster.dm sonar like sensors classes changes da skyrat connected computers disstres button Identify me, scanner-sempai~ я хочу умереть update update Feat: ship traits (#337) ракетки мои ракетки Update sensors.dm апдейты фиксы да doors plus decor cigs RPG missile launcher RPG for ICCG конфликты иконок обожаю Content cigs RPG for ICCG конфликты иконок обожаю Update missile_equipment.dm Update overmap.dmi Revert "Content" This reverts commit 106263e. desc's sensors updates another_portion_of_fixes desc's sensors updates Merge branch 'ship' into pizdec Merge pull request #10 from LordNest/pizdec Pizdec SNZ_fix Merge branch 'pizdec' of https://github.com/LordNest/Baystation12 into pizdec Minor_fixes Я_ЭТО_Починил Merge pull request #11 from LordNest/pizdec SNZ_teper'_rabotaet sexual perversions with smes Some emissive objects now have overlays that light over the lighting plane. da sexual perversions with smes Some emissive objects now have overlays that light over the lighting plane. da fix Merge pull request #6 from ImJustKisik/pizdec Pizdec-2 SNZ_fixes Merge pull request #12 from LordNest/pizdec SNZ_Incident TCOMS Merge pull request #7 from ImJustKisik/ship Ship clothing_fixes ICCGN faction Pulls terran stuff out of maps/torch, gives it a facelift and sets it up in the packs/faction_iccgn dir to help with multi map inclusion. Adds iccgn patches, badges, ranks, utility jacket Crew_and_hangar_fixes По причине того, что злоебучие шлюзы отказываются воспринимать шаттл, шаттл был убран в ангар, а над мостиком надстроена подстилка под ангар Merge pull request #13 from LordNest/pizdec SNZ_Hangar Update vending.dm * ракеты мои ракеты overmap flags pt 1 Missiles, baby admin missiles and misc stuff Update thruster.dm sonar like sensors classes changes da skyrat connected computers disstres button Identify me, scanner-sempai~ я хочу умереть update update Feat: ship traits (#337) ракетки мои ракетки * Content cigs RPG for ICCG конфликты иконок обожаю * Revert "Content" This reverts commit 106263e. * ICCGN faction Pulls terran stuff out of maps/torch, gives it a facelift and sets it up in the packs/faction_iccgn dir to help with multi map inclusion. Adds iccgn patches, badges, ranks, utility jacket * Yeah, squash it~ Pizdec ракеты мои ракеты overmap flags pt 1 Missiles, baby admin missiles and misc stuff Update thruster.dm sonar like sensors classes changes da skyrat connected computers disstres button Identify me, scanner-sempai~ я хочу умереть update update Feat: ship traits (#337) ракетки мои ракетки Update sensors.dm апдейты фиксы да doors plus decor ракеты мои ракеты overmap flags pt 1 Missiles, baby admin missiles and misc stuff Update thruster.dm sonar like sensors classes changes da skyrat connected computers disstres button Identify me, scanner-sempai~ я хочу умереть update update Feat: ship traits (#337) ракетки мои ракетки Update sensors.dm апдейты фиксы да doors plus decor cigs RPG missile launcher RPG for ICCG конфликты иконок обожаю Content cigs RPG for ICCG конфликты иконок обожаю Update missile_equipment.dm Update overmap.dmi Revert "Content" This reverts commit 106263e. desc's sensors updates another_portion_of_fixes desc's sensors updates Merge branch 'ship' into pizdec Merge pull request #10 from LordNest/pizdec Pizdec SNZ_fix Merge branch 'pizdec' of https://github.com/LordNest/Baystation12 into pizdec Minor_fixes Я_ЭТО_Починил Merge pull request #11 from LordNest/pizdec SNZ_teper'_rabotaet sexual perversions with smes Some emissive objects now have overlays that light over the lighting plane. da sexual perversions with smes Some emissive objects now have overlays that light over the lighting plane. da fix Merge pull request #6 from ImJustKisik/pizdec Pizdec-2 SNZ_fixes Merge pull request #12 from LordNest/pizdec SNZ_Incident TCOMS Merge pull request #7 from ImJustKisik/ship Ship clothing_fixes ICCGN faction Pulls terran stuff out of maps/torch, gives it a facelift and sets it up in the packs/faction_iccgn dir to help with multi map inclusion. Adds iccgn patches, badges, ranks, utility jacket Crew_and_hangar_fixes По причине того, что злоебучие шлюзы отказываются воспринимать шаттл, шаттл был убран в ангар, а над мостиком надстроена подстилка под ангар Merge pull request #13 from LordNest/pizdec SNZ_Hangar Update vending.dm * Overmap updates Update sierra_overmap.dm Update sierra_overmap.dm Update sierra_overmap.dm * New guns RPG for ICCG конфликты иконок обожаю cigs Update fancy.dm Brand new guns * icons fix * ofd droppod * t-coms fix * Admin stuff * Overmap radio * sensors update * Rig plus away site's fix RIG sprites fixed and vessel mass increased in order to lower it's speed RIG_Fixes Rig temporary icons+textes with lore of expedition Gagarin_class OFD_console_removal * update * cigs desc update * Map fix plus new terran drinks * Update farfleet-1.dmm * Update vending.dm * Small map fixes plus drinks Map fix plus new terran drinks map update * map update * doors opacity fix * Name and Icon update * Fixes * Speed and accees fixes * Был бы ты Южин человек * Update baystation12.dme * Combat turn and combat roll * fixes * Update farfleet.dm * fixes * fixes from testmerge * Update farfleet-1.dmm * map update * RPG refactor * Mapfixes * sensor range now bound w/ consoles * lordnest map fixes Co-authored-by: LordNest <mishsaf@mail.ru>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
#Описание
Я сломал ещё один ПР, удалил форк и все ПРы закрылись, заливаю по новой.
Добавляет уникальные модификаторы раунда, список - ниже:
#Текущие модификаторы
*Позитивные
Дешёвые грузы - Стоимость вещей в карго умножается на (от 0.9 до 0.7)
Грант на исследование - Карго будет начинать с 100 поинтов вместо 50
Быстрая доставка - Шатлл карго будет лететь меньше времени.
Премиальные ящики выживания - Survaival crew boxes будут иметь дополнительное оборудование. (autoinjector (deletrathol) и advanced trauma kit)
*Нейтральные
Неестественная атмосфера - На экзопланетах будет больше вероятности наличия опасных/неестественных газов.
*Негативные
Грузовые расходы - Стоимость вещей в карго умножается на (от 1.1 до 2.0)
Медленная доставка - Шатлл карго будет лететь больше времени.
Перегрузка освещения - Некоторые АПЦ на корабле будут запускаться с отключенным освещением.
Штраф за перевозку грузов - Карго будет начинать с 25 поинтов вместо 50
🆑
rscadd: Each new shift may have different station(ship) traits. Read command report at round-start to see what you got.
/🆑