mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-06-05 14:17:12 +01:00
52325eda25
# Conflicts: # code/game/machinery/Sleeper.dm # code/game/machinery/doors/airlock.dm # code/game/objects/structures/beds_chairs/chair.dm # code/game/objects/structures/lavaland/geyser.dm # code/modules/antagonists/clockcult/clock_effects/clock_sigils.dm # code/modules/antagonists/clockcult/clock_mobs/_eminence.dm # code/modules/paperwork/contract.dm