Skip to content

Wirusologia: port systemu disease2 z Monkestation #508

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.

Sign up for GitHub

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

Open
Joker66613 wants to merge 12 commits into
base: master
Choose a base branch
from
+12,243 −3
Open

Wirusologia: port systemu disease2 z Monkestation #508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
686079f
Wirusologia disease2 z Monkestation (port modułu virology)
sh4dow321 Oct 27, 2026
cc2f032
Wirusologia: układ odpornościowy na mobach, poprawki po testach, zest…
sh4dow321 Oct 27, 2026
4094451
Wirusologia: poprawki po review i lincie TGUI
sh4dow321 Oct 27, 2026
f9dfd1f
Wirusologia: dreamchecker (19 argumentów nazwanych z nowszego tg) i u…
sh4dow321 Oct 27, 2026
1ade198
Wirusologia: fix runtime'ów po włączeniu objawów (max_stages) i dwie …
sh4dow321 Oct 27, 2026
69268f5
Wirusologia: drugie dzielenie przez max_stages zabezpieczone (get_info)
sh4dow321 Oct 27, 2026
d56f510
Wirusologia: cztery poprawki z review
sh4dow321 Oct 27, 2026
04a93c3
Wirusologia: izolator nie wywala się na strzykawce z krwią, podpowied…
sh4dow321 Oct 27, 2026
8ab6f6c
Wirusologia: patogeny disease2 nie mieszają się ze starymi chorobami
sh4dow321 Oct 27, 2026
f2b64b8
Wirusologia: test mieszanych chorób, izolator bez klienta
sh4dow321 Oct 28, 2026
c6eb3da
Merge branch 'master' of https://github.com/aq33/AquilaStation into w…
sh4dow321 Oct 29, 2026
3c53fb7
Wirusologia: wirówka, izolator i maszyna lecząca na TGUI
sh4dow321 Oct 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions aquila/LEGACY_OVERRIDES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ The other ~60 same-type redefinitions in `aquila/` call `..()`, so they are alre
| `if(GLOB.temperature_expose_typecache[item.type])` in the `temperature_expose()` loop | `code/modules/atmospherics/gasmixtures/reactions.dm` (`/proc/fire_expose()`) | Burning gas calls `temperature_expose()` only on movables that override it (`aquila/code/modules/atmospherics/environmental/hotspot_throttle.dm`); the loop called the empty base proc for every item on every burning tile each tick. New movable overrides go in the cache. Test: `temperature_expose_typecache` |
| Header without `air_turf_count`, `air_eg_count`, `air_superconductive_count`; SendMaps values in header order | `code/controllers/subsystem/time_track.dm` (`Initialize()`, `fire()`) | Perf CSV rows had fewer fields than the header and SendMaps columns changed between rows. Test: `perf_log_columns` |
| `METACOIN_CO_REWARD` 1000, `METACOIN_ESCAPE_REWARD` 2000, new `METACOIN_PATROL_REWARD` 3000 | `code/__DEFINES/metacoin.dm`, `code/modules/metacoin/metacoin.dm` (`process_endround_metacoin()`) | Aquila aquilos rewards: crew objective, surviving and escaping, won patrol. The per-objective antag reward (500 each) is in `aquila/code/modules/metacoin/metacoin.dm` |
| `SSdisease.list_symptoms` bez `typesof(/datum/symptom/acute)`, ten sam filtr w debugowej szafie wirusologii | `code/controllers/subsystem/disease.dm`, `code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm` | Objawy disease2 (`aquila/code/modules/virology`) nie mogą trafiać do losowania objawów advance |
| `#define ROLE_PLAGUERAT` + wpis na liście ról duchów | `code/__DEFINES/role_preferences.dm` | Rola szczura zarazy (event wirusologii) musi być znana rdzeniowi przed `aquila/` |
| `var/list/symptoms` przeniesione z `/datum/disease/advance` na `/datum/disease` | `code/datums/diseases/advance/advance.dm` (deklaracja w `aquila/.../_base.dm`) | Patogeny disease2 też trzymają objawy, a maszyny czytają je z bazowego typu |
| `icon = 'icons/obj/tools.dmi'`, `item_state`/`belt_icon_state` per colour | `code/game/objects/items/tools/wirecutters.dm` (`Initialize()`) | The Paradise `pcutters_*` states exist only in core `tools.dmi`, while `aquila/` points wirecutters at `aquila/icons/obj/tools.dmi`; inhand/belt states exist only for `cutters_red`/`cutters_yellow` (same pattern as the screwdriver) |
| `icon_exists()` check before the shield overlay | `code/datums/components/shielded.dm` (`on_update_overlays()`) | `icons/effects/effects.dmi` has no `broken` state; a depleted shield drew a missing state, which showed a random sprite with the walk animation on 516 |
| `initialized = INITIALIZATION_INNEW_REGULAR` before the round start `InitializeAtoms()` instead of `INITIALIZATION_INNEW_MAPLOAD` | `code/controllers/subsystem/atoms.dm` (`Initialize()`) | `InitializeAtoms()` switches to MAPLOAD itself and restores the previous state; starting from MAPLOAD made that the restored state, map loads during the late loaders (ship interiors) copied it and it stuck for the round, so `LateInitialize()` of runtime atoms (cables laid by players) never ran. Test: `atoms_init_state` |
Expand Down Expand Up @@ -785,3 +788,10 @@ Of the logic files, 182 contain an AQ/AQUILA marker or an `aquila/` resource; th
- `nsv13/code/modules/research/astrometrics.dm`

</details>

### Wirusologia disease2 (port Monkestation2.0, F)

- **Pełne nadpisania w `aquila/code/modules/virology/_core/hooks.dm`** (klasa C, bez `..()`): `/mob/living/carbon/handle_diseases()` — nasza wersja przewijała tylko stopnie chorób advance, patogeny mają własną pętlę `activate()`, a chmury i zakażone plamy działają w `handle_virus_updates()`. Zwykłe choroby dalej rozsiewa `spread()`, patogeny robią to chmurami `/obj/effect/pathogen_cloud`.
- **Nadpisania z `..()`**: `handle_breathing` (wdychanie chmur), `attack_hand` i `Bump` (zakażenie przez dotyk, liczone sterylnością ubioru i krwawieniem), `AttemptLateSpawn` (`DiseaseCarrierCheck`, 10% dołączających dostaje łagodny patogen), `/obj/effect/decal/cleanable/Initialize` (plama zapamiętuje patogeny; nasz rdzeń listy nie trzymał).
- **Warstwa zgodności** `aquila/code/modules/virology/_core/compat.dm` + `aquila/code/__DEFINES/virology.dm`: flagi `DISEASE_DORMANT/COPYSTAGE/ANALYZED`, strefy `BODY_ZONE_EVERYTHING/ARMS/LEGS`, `ROUND_TIME()`, probówka `/obj/item/reagent_containers/glass/tube`, `GLOB.inspectable_diseases`, `create_symptoms()`.
- **Objawy disease2 siedzą na `/datum/symptom/acute`**, nie na `/datum/symptom`, żeby nie mieszać się z naszymi 45 objawami advance (nazwy typów się pokrywały w 22 miejscach).
171 changes: 171 additions & 0 deletions aquila/aquila.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
#include "code\__DEFINES\tutorial.dm"
#include "code\__DEFINES\uplink.dm"
#include "code\__DEFINES\vampires.dm"
#include "code\__DEFINES\virology.dm"
#include "code\__DEFINES\wiremod_compat.dm"
#include "code\__DEFINES\wires.dm"
#include "code\__DEFINES\wounds.dm"
Expand Down Expand Up @@ -544,6 +545,174 @@
#include "code\modules\explorer_drone\research_cargo.dm"
#include "code\modules\explorer_drone\scanner_array.dm"
#include "code\modules\language\vampiric.dm"
// Wirusologia disease2 (port Monkestation2.0)
#include "code\modules\virology\_core\compat.dm"
#include "code\modules\virology\_core\helpers.dm"
#include "code\modules\virology\_core\hooks.dm"
#include "code\modules\virology\_core\observer.dm"
#include "code\modules\virology\_core\pathogen_clouds_subsystem.dm"
#include "code\modules\virology\_core\virus_viewer.dm"
#include "code\modules\virology\__base_procs.dm"
#include "code\modules\virology\__effects.dm"
#include "code\modules\virology\disease\base_disease_folder\_base.dm"
#include "code\modules\virology\disease\base_disease_folder\admin.dm"
#include "code\modules\virology\disease\base_disease_folder\base_types.dm"
#include "code\modules\virology\disease\base_disease_folder\disease_augmentation.dm"
#include "code\modules\virology\disease\base_disease_folder\disease_modification.dm"
#include "code\modules\virology\disease\base_disease_folder\disease_strings.dm"
#include "code\modules\virology\disease\base_disease_folder\general_procs.dm"
#include "code\modules\virology\disease\base_disease_folder\logging.dm"
#include "code\modules\virology\cargo\bounties.dm"
#include "code\modules\virology\cargo\pathology.dm"
#include "code\modules\virology\disease\plague_rat\antagonist.dm"
#include "code\modules\virology\disease\plague_rat\event.dm"
#include "code\modules\virology\disease\plague_rat\objective.dm"
#include "code\modules\virology\disease\plague_rat\plague_rat.dm"
#include "code\modules\virology\disease\plague_rat\team.dm"
#include "code\modules\virology\disease\premades\_base_premades.dm"
#include "code\modules\virology\disease\premades\adrenal_crisis.dm"
#include "code\modules\virology\disease\premades\anxiety.dm"
#include "code\modules\virology\disease\premades\death_sandwich.dm"
#include "code\modules\virology\disease\premades\debug_disease.dm"
#include "code\modules\virology\disease\premades\decloning.dm"
#include "code\modules\virology\disease\premades\flu.dm"
#include "code\modules\virology\disease\premades\fungal_tb.dm"
#include "code\modules\virology\disease\premades\heart_attack.dm"
#include "code\modules\virology\disease\premades\transformations.dm"
#include "code\modules\virology\disease\symptom_cracker\cracker_puzzle.dm"
#include "code\modules\virology\disease\symptom_cracker\symptom_component.dm"
#include "code\modules\virology\disease\symptom_varients\base.dm"
#include "code\modules\virology\disease\symptom_varients\bluespace.dm"
#include "code\modules\virology\disease\symptom_varients\recursive.dm"
#include "code\modules\virology\disease\symptom_varients\reflexive.dm"
#include "code\modules\virology\disease\symptom_varients\routine.dm"
#include "code\modules\virology\disease\symptom_varients\strengthen.dm"
#include "code\modules\virology\disease\symtoms\_symptom.dm"
#include "code\modules\virology\disease\symtoms\animation_procs.dm"
#include "code\modules\virology\disease\symtoms\annoying\bee_vomit.dm"
#include "code\modules\virology\disease\symtoms\annoying\bloodynose.dm"
#include "code\modules\virology\disease\symtoms\annoying\chicken_pox.dm"
#include "code\modules\virology\disease\symtoms\annoying\cough.dm"
#include "code\modules\virology\disease\symtoms\annoying\cult_syndrome.dm"
#include "code\modules\virology\disease\symtoms\annoying\cyborg_vomit.dm"
#include "code\modules\virology\disease\symtoms\annoying\dizzy.dm"
#include "code\modules\virology\disease\symtoms\annoying\eldritch_hallucinations.dm"
#include "code\modules\virology\disease\symtoms\annoying\fullness_syndrome.dm"
#include "code\modules\virology\disease\symtoms\annoying\headache.dm"
#include "code\modules\virology\disease\symtoms\annoying\itching.dm"
#include "code\modules\virology\disease\symtoms\annoying\sneeze.dm"
#include "code\modules\virology\disease\symtoms\annoying\vitreous.dm"
#include "code\modules\virology\disease\symtoms\deadly\alkali.dm"
#include "code\modules\virology\disease\symtoms\deadly\asphyxiation.dm"
#include "code\modules\virology\disease\symtoms\deadly\fire.dm"
#include "code\modules\virology\disease\symtoms\deadly\flesh_death.dm"
#include "code\modules\virology\disease\symtoms\deadly\flesh_eating.dm"
#include "code\modules\virology\disease\symtoms\deadly\killer_dna.dm"
#include "code\modules\virology\disease\symtoms\deadly\killer_toxins.dm"
#include "code\modules\virology\disease\symtoms\deadly\rhumba_beat.dm"
#include "code\modules\virology\disease\symtoms\flavor\beard.dm"
#include "code\modules\virology\disease\symtoms\flavor\disfigured.dm"
#include "code\modules\virology\disease\symtoms\flavor\drained.dm"
#include "code\modules\virology\disease\symtoms\flavor\drolling.dm"
#include "code\modules\virology\disease\symtoms\flavor\eyewater.dm"
#include "code\modules\virology\disease\symtoms\flavor\fizzle.dm"
#include "code\modules\virology\disease\symtoms\flavor\fridge.dm"
#include "code\modules\virology\disease\symtoms\flavor\giggle.dm"
#include "code\modules\virology\disease\symtoms\flavor\groan.dm"
#include "code\modules\virology\disease\symtoms\flavor\gunk.dm"
#include "code\modules\virology\disease\symtoms\flavor\hair_growth.dm"
#include "code\modules\virology\disease\symtoms\flavor\polyvitiligo.dm"
#include "code\modules\virology\disease\symtoms\flavor\soreness.dm"
#include "code\modules\virology\disease\symtoms\flavor\special_adaptation.dm"
#include "code\modules\virology\disease\symtoms\flavor\telepathy.dm"
#include "code\modules\virology\disease\symtoms\flavor\twitch.dm"
#include "code\modules\virology\disease\symtoms\flavor\wheeze.dm"
#include "code\modules\virology\disease\symtoms\harmful\blindness.dm"
#include "code\modules\virology\disease\symtoms\harmful\butterfly_skin.dm"
#include "code\modules\virology\disease\symtoms\harmful\dna_spread.dm"
#include "code\modules\virology\disease\symtoms\harmful\drunk.dm"
#include "code\modules\virology\disease\symtoms\harmful\lazy_mind.dm"
#include "code\modules\virology\disease\symtoms\harmful\mint_toxin.dm"
#include "code\modules\virology\disease\symtoms\harmful\mob_spawn_symptoms.dm"
#include "code\modules\virology\disease\symtoms\harmful\retro_virus.dm"
#include "code\modules\virology\disease\symtoms\harmful\species_modification.dm"
#include "code\modules\virology\disease\symtoms\harmful\teratoma.dm"
#include "code\modules\virology\disease\symtoms\harmful\toxins.dm"
#include "code\modules\virology\disease\symtoms\harmful\wizarditis.dm"
#include "code\modules\virology\disease\symtoms\helpful\antitoxin.dm"
#include "code\modules\virology\disease\symtoms\helpful\clockwork.dm"
#include "code\modules\virology\disease\symtoms\helpful\coma.dm"
#include "code\modules\virology\disease\symtoms\helpful\damge_to_toxin.dm"
#include "code\modules\virology\disease\symtoms\helpful\darkness.dm"
#include "code\modules\virology\disease\symtoms\helpful\delightful.dm"
#include "code\modules\virology\disease\symtoms\helpful\invisible.dm"
#include "code\modules\virology\disease\symtoms\helpful\lantern.dm"
#include "code\modules\virology\disease\symtoms\helpful\longevity.dm"
#include "code\modules\virology\disease\symtoms\helpful\metabolism_boost.dm"
#include "code\modules\virology\disease\symtoms\helpful\mind_restoration.dm"
#include "code\modules\virology\disease\symtoms\helpful\nanites.dm"
#include "code\modules\virology\disease\symtoms\helpful\plasma_heal.dm"
#include "code\modules\virology\disease\symtoms\helpful\self_respiration.dm"
#include "code\modules\virology\disease\symtoms\helpful\sensory_restoration.dm"
#include "code\modules\virology\disease\symtoms\helpful\space_adapt.dm"
#include "code\modules\virology\disease\symtoms\helpful\stimulant.dm"
#include "code\modules\virology\disease\symtoms\helpful\thick_blood.dm"
#include "code\modules\virology\disease\symtoms\helpful\water_heal.dm"
#include "code\modules\virology\disease\symtoms\hinderance\choking.dm"
#include "code\modules\virology\disease\symtoms\hinderance\confusion.dm"
#include "code\modules\virology\disease\symtoms\hinderance\cult_vomit.dm"
#include "code\modules\virology\disease\symtoms\hinderance\deafness.dm"
#include "code\modules\virology\disease\symtoms\hinderance\drowsness.dm"
#include "code\modules\virology\disease\symtoms\hinderance\elvis.dm"
#include "code\modules\virology\disease\symtoms\hinderance\famine.dm"
#include "code\modules\virology\disease\symtoms\hinderance\fragile_bones.dm"
#include "code\modules\virology\disease\symtoms\hinderance\gregarious.dm"
#include "code\modules\virology\disease\symtoms\hinderance\hallucination.dm"
#include "code\modules\virology\disease\symtoms\hinderance\horse_throat.dm"
#include "code\modules\virology\disease\symtoms\hinderance\pierotts_throat.dm"
#include "code\modules\virology\disease\symtoms\hinderance\shaking.dm"
#include "code\modules\virology\disease\symtoms\hinderance\spiky_skin.dm"
#include "code\modules\virology\disease\symtoms\hinderance\sweat.dm"
#include "code\modules\virology\disease\symtoms\hinderance\wendigo_vomit.dm"
#include "code\modules\virology\disease\symtoms\restricted\stage1.dm"
#include "code\modules\virology\disease\symtoms\restricted\stage2.dm"
#include "code\modules\virology\disease\symtoms\restricted\stage3.dm"
#include "code\modules\virology\disease\symtoms\restricted\stage4.dm"
#include "code\modules\virology\effects\cleanables.dm"
#include "code\modules\virology\effects\pathogen_cloud.dm"
#include "code\modules\virology\fullscreen.dm"
#include "code\modules\virology\immune_systems\_immune_system.dm"
#include "code\modules\virology\immune_systems\job_boosting.dm"
#include "code\modules\virology\items\_base_item_additions.dm"
#include "code\modules\virology\items\antibodyscanner.dm"
#include "code\modules\virology\items\bio_hazard_deployable.dm"
#include "code\modules\virology\items\clothing\mask.dm"
#include "code\modules\virology\items\clothing\shoes.dm"
#include "code\modules\virology\items\disease_disk.dm"
#include "code\modules\virology\items\extrapolator.dm"
#include "code\modules\virology\items\mousecubes.dm"
#include "code\modules\virology\items\pathology_glasses.dm"
#include "code\modules\virology\items\virusdish.dm"
#include "code\modules\virology\living\infection_procs.dm"
#include "code\modules\virology\living\mouse.dm"
#include "code\modules\virology\living\spread_disease.dm"
#include "code\modules\virology\living\sterile_procs.dm"
#include "code\modules\virology\machines\analyzer.dm"
#include "code\modules\virology\machines\centrifuge.dm"
#include "code\modules\virology\machines\curer.dm"
#include "code\modules\virology\machines\disease_records.dm"
#include "code\modules\virology\machines\floor_health_scanner.dm"
#include "code\modules\virology\machines\incubator.dm"
#include "code\modules\virology\machines\isolator.dm"
#include "code\modules\virology\machines\splicer.dm"
#include "code\modules\virology\reagents\_stage_mutations.dm"
#include "code\modules\virology\reagents\antipathenogenics.dm"
#include "code\modules\virology\reagents\immune_healers.dm"
#include "code\modules\virology\reagents\incubation.dm"
#include "code\modules\virology\reagents\symptom_reagents.dm"
#include "code\modules\virology\reagents\vaccine.dm"
#include "code\modules\virology\research\circuitboards.dm"
#include "code\modules\virology\research\research.dm"
#include "code\modules\roundend\roundend_ui.dm"
#include "code\modules\research\designs\bounty_market_designs.dm"
#include "code\modules\cargo\exports\large_objects.dm"
Expand Down Expand Up @@ -921,6 +1090,7 @@
#include "code\modules\test_chamber\kits\pr_420_traitor_cele.dm"
#include "code\modules\test_chamber\kits\test_subjects.dm"
// Komora testowa - zestawy PR-ów niżej (usuwać razem z plikiem zestawu po przetestowaniu)
#include "code\modules\test_chamber\kits\pr_508_wirusologia.dm"
#include "code\modules\test_chamber\kits\pr_495_ntsl.dm"
#include "code\modules\test_chamber\kits\pr_506_zapachy.dm"
#include "code\modules\test_chamber\kits\pr_492_serwery_ai.dm"
Expand Down Expand Up @@ -1665,6 +1835,7 @@
#include "code\modules\unit_tests\aquila_stationarybike.dm"
#include "code\modules\unit_tests\aquila_surgery_radial.dm"
#include "code\modules\unit_tests\aquila_tutorials.dm"
#include "code\modules\unit_tests\aquila_pathology.dm"
#include "code\modules\unit_tests\aquila_viruses.dm"
#include "code\modules\unit_tests\aquila_vitals_reader.dm"
#include "code\modules\unit_tests\aquila_wounds.dm"
Expand Down
Loading
Loading