Skip to content

Actions: Monkestation/Monkestation2.0

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
2,000 workflow runs
2,000 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Fixes some duped code, RDS punishment, northwest blueshift, and BDM p… Check for merge conflicts #2291: Commit 783c8ba pushed by Shoddd
January 20, 2025 02:54 42s master
master
January 20, 2025 02:54 42s
Some minor bloodsucker fixes (#4886) Check for merge conflicts #2290: Commit 3466b59 pushed by Absolucy
January 19, 2025 10:11 41s master
master
January 19, 2025 10:11 41s
Improve admin logging for antag/event tokens (#4979) Check for merge conflicts #2289: Commit 8218e3d pushed by flleeppyy
January 19, 2025 08:54 42s master
master
January 19, 2025 08:54 42s
reagent (#4977) Check for merge conflicts #2288: Commit 423842b pushed by ThePooba
January 19, 2025 06:45 38s master
master
January 19, 2025 06:45 38s
All public gardens now have botany vendors and a composter (#4972) Check for merge conflicts #2287: Commit d60c2d0 pushed by Absolucy
January 19, 2025 05:18 53s master
master
January 19, 2025 05:18 53s
Fixes Knock path not getting Relentless Heartbeat (#4967) Check for merge conflicts #2286: Commit e9f80b7 pushed by F-e-r-n
January 19, 2025 04:59 48s master
master
January 19, 2025 04:59 48s
heheho (#4837) Check for merge conflicts #2285: Commit 1b64592 pushed by ThePooba
January 19, 2025 01:34 41s master
master
January 19, 2025 01:34 41s
Allow pAIs to withdraw their candidacy (#4940) Check for merge conflicts #2284: Commit 48ec5d0 pushed by ThePooba
January 18, 2025 22:02 38s master
master
January 18, 2025 22:02 38s
Removes miasma sickness (#4952) Check for merge conflicts #2283: Commit 90e56f6 pushed by ThePooba
January 18, 2025 22:01 53s master
master
January 18, 2025 22:01 53s
Update company_guns.dm (#4949) Check for merge conflicts #2282: Commit 4adf62d pushed by ThePooba
January 18, 2025 20:05 36s master
master
January 18, 2025 20:05 36s
nerfs 45 long ammo (#4826) Check for merge conflicts #2281: Commit 6ddff44 pushed by ThePooba
January 18, 2025 19:53 51s master
master
January 18, 2025 19:53 51s
CLWON (#4943) Check for merge conflicts #2280: Commit e4f20e8 pushed by ThePooba
January 18, 2025 18:10 39s master
master
January 18, 2025 18:10 39s
Fix Gary being able to steal items from borgs and such (#4920) Check for merge conflicts #2279: Commit ece39d9 pushed by Absolucy
January 18, 2025 09:18 50s master
master
January 18, 2025 09:18 50s
Spleens (#4796) Check for merge conflicts #2278: Commit a7b2f13 pushed by ThePooba
January 17, 2025 15:45 50s master
master
January 17, 2025 15:45 50s
Move fake virus event later into the round (#4895) Check for merge conflicts #2277: Commit 3237b0b pushed by ThePooba
January 17, 2025 15:25 44s master
master
January 17, 2025 15:25 44s
Security Vouchers + Security Balance/QoL Pass + Random Head Overlay B… Check for merge conflicts #2276: Commit f4d1a9d pushed by ThePooba
January 17, 2025 15:23 39s master
master
January 17, 2025 15:23 39s
Replay subsystem fixes + optimizations (#4771) Check for merge conflicts #2275: Commit 7860ff0 pushed by Absolucy
January 17, 2025 02:21 38s master
master
January 17, 2025 02:21 38s
Prevent drones from interacting with fireaxe cabinets. fixes #4901 (#… Check for merge conflicts #2274: Commit dad39c0 pushed by ThePooba
January 16, 2025 22:33 51s master
master
January 16, 2025 22:33 51s
Ensures the Tenacity trauma now properly negates all pain as intended… Check for merge conflicts #2273: Commit 6dda0e0 pushed by Absolucy
January 16, 2025 17:22 40s master
master
January 16, 2025 17:22 40s
Removes northstar from the code (#4775) Check for merge conflicts #2272: Commit 99c76fe pushed by Absolucy
January 16, 2025 17:22 1m 12s master
master
January 16, 2025 17:22 1m 12s
Removes empowering the spoon until it can actually be balanced (#4874) Check for merge conflicts #2271: Commit a06bc67 pushed by Absolucy
January 16, 2025 17:22 1m 18s master
master
January 16, 2025 17:22 1m 18s
Wizard mass mind/species/name swap now only affects the station (#4880) Check for merge conflicts #2270: Commit 8064e8f pushed by Absolucy
January 16, 2025 17:21 1m 16s master
master
January 16, 2025 17:21 1m 16s
Adds Curator news (#4723) Check for merge conflicts #2269: Commit d161fc6 pushed by Absolucy
January 16, 2025 14:48 44s master
master
January 16, 2025 14:48 44s
Fix being able to toss out infinite trash from a trash pile (#4905) Check for merge conflicts #2268: Commit 2a56d8b pushed by Absolucy
January 16, 2025 06:16 49s master
master
January 16, 2025 06:16 49s
Reduces the amount of banana peels from trash piles (#4888) Check for merge conflicts #2267: Commit 31ade5e pushed by Absolucy
January 16, 2025 06:10 42s master
master
January 16, 2025 06:10 42s