Skip to content

Actions: PMC-Unga-Marines/Unga-Marines

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
652 workflow run results
652 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Crash tweaks (#727) Check for merge conflicts #652: Commit 46a24d5 pushed by Helg2
December 9, 2024 07:45 4m 12s master
master
December 9, 2024 07:45 4m 12s
Update specialist.dm (#785) Check for merge conflicts #651: Commit 4804ec9 pushed by Helg2
December 9, 2024 07:41 40s master
master
December 9, 2024 07:41 40s
Old alt+rightclick (take left object from storage) (#783) Check for merge conflicts #650: Commit 1125356 pushed by Helg2
December 8, 2024 11:33 47s master
master
December 8, 2024 11:33 47s
Reagent scanner icon fix (#784) Check for merge conflicts #649: Commit 6d35e84 pushed by Helg2
December 8, 2024 11:31 1m 58s master
master
December 8, 2024 11:31 1m 58s
Fix tank chair wrench (#780) Check for merge conflicts #648: Commit e67c4d9 pushed by Helg2
December 8, 2024 11:31 2m 23s master
master
December 8, 2024 11:31 2m 23s
Add to P-17 the underbarrel-flashlight (#772) Check for merge conflicts #647: Commit a993580 pushed by Tatarla
December 6, 2024 12:01 41s master
master
December 6, 2024 12:01 41s
Nerf MK88 (#765) Check for merge conflicts #646: Commit c3b395e pushed by Tatarla
December 6, 2024 11:34 4m 48s master
master
December 6, 2024 11:34 4m 48s
Фаллов Вектор 3 >> 1.75, убрал дубликаты кода allowed_ammo_types (#766) Check for merge conflicts #645: Commit 0bcb60c pushed by Tatarla
December 6, 2024 11:33 5m 29s master
master
December 6, 2024 11:33 5m 29s
PortFitViewport (#764) Check for merge conflicts #644: Commit cb29d15 pushed by Tatarla
December 6, 2024 11:29 29s master
master
December 6, 2024 11:29 29s
Убрал аим и прицелы у двушки, рельсы и всех лазганов кроме лазснайпы … Check for merge conflicts #643: Commit 5705d27 pushed by Tatarla
December 6, 2024 11:29 42s master
master
December 6, 2024 11:29 42s
Panther buff (#754) Check for merge conflicts #642: Commit 0fbaed9 pushed by Tatarla
December 6, 2024 06:46 6m 46s master
master
December 6, 2024 06:46 6m 46s
modified: code/modules/organs/organs.dm (#716) Check for merge conflicts #641: Commit 9169e23 pushed by Tatarla
December 6, 2024 06:37 1m 25s master
master
December 6, 2024 06:37 1m 25s
buff (#749) Check for merge conflicts #640: Commit dd804cd pushed by Tatarla
December 6, 2024 06:36 45s master
master
December 6, 2024 06:36 45s
Завод теперь может производить снаряды для ФК88 и танковые снаряды дл… Check for merge conflicts #639: Commit 6be5096 pushed by Tatarla
December 6, 2024 03:06 40s master
master
December 6, 2024 03:06 40s
Fixes join button runtime. (#757) Check for merge conflicts #638: Commit 29fb531 pushed by Helg2
December 5, 2024 19:57 37s master
master
December 5, 2024 19:57 37s
Update renderer.jsx (#742) Check for merge conflicts #637: Commit 0b755f9 pushed by Tatarla
December 5, 2024 18:01 4m 40s master
master
December 5, 2024 18:01 4m 40s
walance (#744) Check for merge conflicts #636: Commit af628b5 pushed by Tatarla
December 5, 2024 17:58 5m 59s master
master
December 5, 2024 17:58 5m 59s
acid blood (#761) Check for merge conflicts #635: Commit a151c5e pushed by Tatarla
December 5, 2024 17:50 5m 50s master
master
December 5, 2024 17:50 5m 50s
Нерф СР 127 (#740) Check for merge conflicts #634: Commit 8d06dc2 pushed by Tatarla
December 5, 2024 17:49 5m 58s master
master
December 5, 2024 17:49 5m 58s
Update abilities_hunter.dm (#746) Check for merge conflicts #633: Commit 002ed22 pushed by Tatarla
December 5, 2024 17:48 7m 12s master
master
December 5, 2024 17:48 7m 12s
Переозвучка B18 + мини-добавление (#738) Check for merge conflicts #632: Commit 4b8fb97 pushed by Helg2
December 5, 2024 09:30 1m 57s master
master
December 5, 2024 09:30 1m 57s
Decreseases fumbling time for shrapnel removal in 2 times. (#731) Check for merge conflicts #631: Commit 05c27a4 pushed by Helg2
December 5, 2024 09:30 2m 26s master
master
December 5, 2024 09:30 2m 26s
Кейбинды без конфликтов (ксено) (#700) Check for merge conflicts #630: Commit 1e42e6e pushed by Helg2
December 5, 2024 09:29 2m 48s master
master
December 5, 2024 09:29 2m 48s
Update armored_weapons.dm (#747) Check for merge conflicts #629: Commit 1ce9c8e pushed by Tatarla
December 4, 2024 11:57 50s master
master
December 4, 2024 11:57 50s
Update larva.dm (#748) Check for merge conflicts #628: Commit ddf2fcb pushed by Tatarla
December 4, 2024 11:56 38s master
master
December 4, 2024 11:56 38s